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

koentsje · koentsje · commit bb16d5af6917 · 2025-08-29T11:22:22.000+02:00
- Pull up method 'createGradleProject()'

Signed-off-by: Koen Aers &lt;koen.aers@gmail.com&gt;
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java
@@ -41,26 +41,6 @@ private void verifyDatabase() throws Exception {
 		assertEquals("foo", resultSet.getString(2));
 	}
 	
-	private void createGradleProject() 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"));
-		setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
-		assertTrue(getGradlePropertiesFile().exists());
-		assertTrue(getGradlePropertiesFile().isFile());
-		File appDir = new File(getProjectDir(), "app");
-		assertTrue(appDir.exists());
-		assertTrue(appDir.isDirectory());
-		setGradleBuildFile(new File(appDir, "build.gradle"));
-		assertTrue(getGradleBuildFile().exists());
-		assertTrue(getGradleBuildFile().isFile());
-		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
-		assertFalse(getDatabaseFile().exists());
-	}
-	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
 				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java
@@ -41,26 +41,6 @@ private void verifyDatabase() throws Exception {
 		assertEquals("foo", resultSet.getString(2));
 	}
 	
-	private void createGradleProject() 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"));
-		setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
-		assertTrue(getGradlePropertiesFile().exists());
-		assertTrue(getGradlePropertiesFile().isFile());
-		File appDir = new File(getProjectDir(), "app");
-		assertTrue(appDir.exists());
-		assertTrue(appDir.isDirectory());
-		setGradleBuildFile(new File(appDir, "build.gradle"));
-		assertTrue(getGradleBuildFile().exists());
-		assertTrue(getGradleBuildFile().isFile());
-		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
-		assertFalse(getDatabaseFile().exists());
-	}
-	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
 				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java
@@ -31,26 +31,6 @@ public void testTutorial() throws Exception {
 		verifyProject();
 	}
 	
-	private void createGradleProject() 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"));
-		setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
-		assertTrue(getGradlePropertiesFile().exists());
-		assertTrue(getGradlePropertiesFile().isFile());
-		File appDir = new File(getProjectDir(), "app");
-		assertTrue(appDir.exists());
-		assertTrue(appDir.isDirectory());
-		setGradleBuildFile(new File(appDir, "build.gradle"));
-		assertTrue(getGradleBuildFile().exists());
-		assertTrue(getGradleBuildFile().isFile());
-		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
-		assertFalse(getDatabaseFile().exists());
-	}
-	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
 				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java
@@ -31,26 +31,6 @@ public void testTutorial() throws Exception {
 		verifyProject();
 	}
 	
-	private void createGradleProject() 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"));
-		setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
-		assertTrue(getGradlePropertiesFile().exists());
-		assertTrue(getGradlePropertiesFile().isFile());
-		File appDir = new File(getProjectDir(), "app");
-		assertTrue(appDir.exists());
-		assertTrue(appDir.isDirectory());
-		setGradleBuildFile(new File(appDir, "build.gradle"));
-		assertTrue(getGradleBuildFile().exists());
-		assertTrue(getGradleBuildFile().isFile());
-		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
-		assertFalse(getDatabaseFile().exists());
-	}
-	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
 				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java
@@ -41,26 +41,6 @@ private void verifyDatabase() throws Exception {
 		assertEquals("foo", resultSet.getString(2));
 	}
 	
-	private void createGradleProject() 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"));
-		setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
-		assertTrue(getGradlePropertiesFile().exists());
-		assertTrue(getGradlePropertiesFile().isFile());
-		File appDir = new File(getProjectDir(), "app");
-		assertTrue(appDir.exists());
-		assertTrue(appDir.isDirectory());
-		setGradleBuildFile(new File(appDir, "build.gradle"));
-		assertTrue(getGradleBuildFile().exists());
-		assertTrue(getGradleBuildFile().isFile());
-		setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
-		assertFalse(getDatabaseFile().exists());
-	}
-	
 	private void editGradleBuildFile() throws Exception {
 		StringBuffer gradleBuildFileContents = new StringBuffer(
 				new String(Files.readAllBytes(getGradleBuildFile().toPath())));
diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java
@@ -1,10 +1,16 @@
 package org.hibernate.tool.it.gradle;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import java.io.File;
 import java.util.List;
 
 import org.junit.jupiter.api.io.TempDir;
 
+import org.gradle.testkit.runner.BuildResult;
+import org.gradle.testkit.runner.GradleRunner;
+
 public class TestTemplate {
 
     protected static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
@@ -25,6 +31,26 @@ public class TestTemplate {
     protected File getDatabaseFile() { return databaseFile; }
     protected void setDatabaseFile(File f) { databaseFile = f; }
 
+    protected void createGradleProject() 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"));
+        setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
+        assertTrue(getGradlePropertiesFile().exists());
+        assertTrue(getGradlePropertiesFile().isFile());
+        File appDir = new File(getProjectDir(), "app");
+        assertTrue(appDir.exists());
+        assertTrue(appDir.isDirectory());
+        setGradleBuildFile(new File(appDir, "build.gradle"));
+        assertTrue(getGradleBuildFile().exists());
+        assertTrue(getGradleBuildFile().isFile());
+        setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
+        assertFalse(getDatabaseFile().exists());
+    }
+
     protected String constructH2DatabaseDependencyLine() {
         return "    implementation 'com.h2database:h2:" + System.getenv("H2_VERSION") + "'";
     }
