HBX-3080: Refactor the Gradle integration tests to factor out common code

  - Create method 'executeGradleCommand(String...)' in class TestTemplate to execute Gradle command lines
  - Use above method in the 'TestTemplate#initGradleProject()' method
  - Replace the 'executeGenerateJavaTask()' methods in the different test classes using the above method

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java

@@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
 				"insert into PERSON values (1, 'foo')"
 		});
 		createProject();
-		executeGenerateJavaTask();
+		executeGradleCommand("generateJava");
 		verifyProject();
 	}
 
-	private void executeGenerateJavaTask() throws Exception {
-		GradleRunner gradleRunner = GradleRunner.create();
-		gradleRunner.forwardOutput();
-		gradleRunner.withProjectDir(getProjectDir());
-		gradleRunner.withPluginClasspath();
-		gradleRunner.withArguments("generateJava");
-		BuildResult buildResult = gradleRunner.build();
-		assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
-	}
-	
 	private void verifyProject() throws Exception {
 		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
 		assertTrue(generatedOutputFolder.exists());

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java

@@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
 				"insert into PERSON values (1, 'foo')"
 		});
 		createProject();
-		executeGenerateJavaTask();
+		executeGradleCommand("generateJava");
 		verifyProject();
 	}
 
-	private void executeGenerateJavaTask() throws Exception {
-		GradleRunner gradleRunner = GradleRunner.create();
-		gradleRunner.forwardOutput();
-		gradleRunner.withProjectDir(getProjectDir());
-		gradleRunner.withPluginClasspath();
-		gradleRunner.withArguments("generateJava");
-		BuildResult buildResult = gradleRunner.build();
-		assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
-	}
-	
 	private void verifyProject() throws Exception {
 		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
 		assertTrue(generatedOutputFolder.exists());

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java

@@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
 						"   primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
 		});
 		createProject();
-		executeGenerateJavaTask();
+		executeGradleCommand("generateJava");
 		verifyProject();
 	}
 
-	private void executeGenerateJavaTask() throws Exception {
-		GradleRunner gradleRunner = GradleRunner.create();
-		gradleRunner.forwardOutput();
-		gradleRunner.withProjectDir(getProjectDir());
-		gradleRunner.withPluginClasspath();
-		gradleRunner.withArguments("generateJava");
-		BuildResult buildResult = gradleRunner.build();
-		assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
-	}
-	
 	private void verifyProject() throws Exception {
 		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
 		assertTrue(generatedOutputFolder.exists());

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java

@@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
 						"   primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
 		});
 		createProject();
-		executeGenerateJavaTask();
+		executeGradleCommand("generateJava");
 		verifyProject();
 	}
 
-	private void executeGenerateJavaTask() throws Exception {
-		GradleRunner gradleRunner = GradleRunner.create();
-		gradleRunner.forwardOutput();
-		gradleRunner.withProjectDir(getProjectDir());
-		gradleRunner.withPluginClasspath();
-		gradleRunner.withArguments("generateJava");
-		BuildResult buildResult = gradleRunner.build();
-		assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
-	}
-	
 	private void verifyProject() throws Exception {
 		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
 		assertTrue(generatedOutputFolder.exists());

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java

@@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
 				"insert into PERSON values (1, 'foo')"
 		});
 		createProject();
-		executeGenerateJavaTask();
+		executeGradleCommand("generateJava");
 		verifyProject();
 	}
 
-	private void executeGenerateJavaTask() throws Exception {
-		GradleRunner gradleRunner = GradleRunner.create();
-		gradleRunner.forwardOutput();
-		gradleRunner.withProjectDir(getProjectDir());
-		gradleRunner.withPluginClasspath();
-		gradleRunner.withArguments("generateJava");
-		BuildResult buildResult = gradleRunner.build();
-		assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
-	}
-	
 	private void verifyProject() {
 		File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
 		assertTrue(generatedOutputFolder.exists());

gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java

@@ -17,8 +17,8 @@
 
 public class TestTemplate {
 
-    protected static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
-            "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
+    protected static final String[] GRADLE_INIT_PROJECT_ARGUMENTS = new String[] {
+            "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"};
 
     @TempDir
     private File projectDir;
@@ -39,6 +39,16 @@ public class TestTemplate {
     protected String[] getDatabaseCreationScript() { return databaseCreationScript; }
     protected void setDatabaseCreationScript(String[] script) { databaseCreationScript = script; }
 
+    protected void executeGradleCommand(String ... gradleCommandLine) {
+        GradleRunner runner = GradleRunner.create();
+        runner.withArguments(gradleCommandLine);
+        runner.forwardOutput();
+        runner.withPluginClasspath();
+        runner.withProjectDir(getProjectDir());
+        BuildResult buildResult = runner.build();
+        assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
+    }
+
     protected void createProject() throws Exception {
         initGradleProject();
         editGradleBuildFile();
@@ -48,12 +58,7 @@ protected void createProject() throws Exception {
     }
 
     protected void initGradleProject() throws Exception {
-        GradleRunner runner = GradleRunner.create();
-        runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS);
-        runner.forwardOutput();
-        runner.withProjectDir(getProjectDir());
-        BuildResult buildResult = runner.build();
-        assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
+        executeGradleCommand(GRADLE_INIT_PROJECT_ARGUMENTS);
         setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
         assertTrue(getGradlePropertiesFile().exists());
         assertTrue(getGradlePropertiesFile().isFile());