From 016578745eea2262d626e02971ecc1e04427606a Mon Sep 17 00:00:00 2001 From: George Gastaldi Date: Sat, 28 Dec 2019 22:34:39 -0300 Subject: [PATCH] Using constants in Gradle tests --- .../java/io/quarkus/gradle/QuarkusPlugin.java | 4 ++- .../io/quarkus/gradle/QuarkusPluginTest.java | 29 +++++++++++-------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index 29fce93e6..ff8245401 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -27,6 +27,8 @@ import io.quarkus.gradle.tasks.QuarkusTestNative; public class QuarkusPlugin implements Plugin { + public static final String ID = "io.quarkus"; + public static final String EXTENSION_NAME = "quarkus"; public static final String LIST_EXTENSIONS_TASK_NAME = "listExtensions"; public static final String ADD_EXTENSION_TASK_NAME = "addExtension"; @@ -75,7 +77,7 @@ public class QuarkusPlugin implements Plugin { buildNative.dependsOn(tasks.getByName(BasePlugin.ASSEMBLE_TASK_NAME)); - SourceSetContainer sourceSets = project.getConvention().findPlugin(JavaPluginConvention.class) + SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class) .getSourceSets(); SourceSet nativeTestSourceSet = sourceSets.create(NATIVE_TEST_SOURCE_SET_NAME); SourceSet mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME); diff --git a/devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java b/devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java index 450cf057f..337df0ded 100644 --- a/devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java +++ b/devtools/gradle/src/test/java/io/quarkus/gradle/QuarkusPluginTest.java @@ -5,6 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import org.gradle.api.Project; +import org.gradle.api.plugins.BasePlugin; +import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.tasks.TaskContainer; import org.gradle.testfixtures.ProjectBuilder; import org.junit.jupiter.api.Test; @@ -14,38 +16,41 @@ public class QuarkusPluginTest { @Test public void shouldCreateTasks() { Project project = ProjectBuilder.builder().build(); - project.getPluginManager().apply("io.quarkus"); + project.getPluginManager().apply(QuarkusPlugin.ID); - assertTrue(project.getPluginManager().hasPlugin("io.quarkus")); + assertTrue(project.getPluginManager().hasPlugin(QuarkusPlugin.ID)); TaskContainer tasks = project.getTasks(); - assertNotNull(tasks.getByName("quarkusBuild")); - assertNotNull(tasks.getByName("quarkusDev")); - assertNotNull(tasks.getByName("buildNative")); - assertNotNull(tasks.getByName("listExtensions")); - assertNotNull(tasks.getByName("addExtension")); + assertNotNull(tasks.getByName(QuarkusPlugin.QUARKUS_BUILD_TASK_NAME)); + assertNotNull(tasks.getByName(QuarkusPlugin.QUARKUS_DEV_TASK_NAME)); + assertNotNull(tasks.getByName(QuarkusPlugin.BUILD_NATIVE_TASK_NAME)); + assertNotNull(tasks.getByName(QuarkusPlugin.LIST_EXTENSIONS_TASK_NAME)); + assertNotNull(tasks.getByName(QuarkusPlugin.ADD_EXTENSION_TASK_NAME)); } @Test public void shouldMakeAssembleDependOnQuarkusBuild() { Project project = ProjectBuilder.builder().build(); - project.getPluginManager().apply("io.quarkus"); + project.getPluginManager().apply(QuarkusPlugin.ID); project.getPluginManager().apply("base"); TaskContainer tasks = project.getTasks(); - assertThat(tasks.getByName("assemble").getDependsOn()).contains(tasks.getByName("quarkusBuild")); + assertThat(tasks.getByName(BasePlugin.ASSEMBLE_TASK_NAME).getDependsOn()) + .contains(tasks.getByName(QuarkusPlugin.QUARKUS_BUILD_TASK_NAME)); } @Test public void shouldMakeQuarkusDevAndQuarkusBuildDependOnClassesTask() { Project project = ProjectBuilder.builder().build(); - project.getPluginManager().apply("io.quarkus"); + project.getPluginManager().apply(QuarkusPlugin.ID); project.getPluginManager().apply("java"); TaskContainer tasks = project.getTasks(); - assertThat(tasks.getByName("quarkusBuild").getDependsOn()).contains(tasks.getByName("classes")); - assertThat(tasks.getByName("quarkusDev").getDependsOn()).contains(tasks.getByName("classes")); + assertThat(tasks.getByName(QuarkusPlugin.QUARKUS_BUILD_TASK_NAME).getDependsOn()) + .contains(tasks.getByName(JavaPlugin.CLASSES_TASK_NAME)); + assertThat(tasks.getByName(QuarkusPlugin.QUARKUS_DEV_TASK_NAME).getDependsOn()) + .contains(tasks.getByName(JavaPlugin.CLASSES_TASK_NAME)); } }