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 index 558311b950..ea1a270e8e 100644 --- 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 @@ -15,7 +15,6 @@ import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; import org.hibernate.tool.it.gradle.TestTemplate; @@ -24,16 +23,13 @@ public class JpaDefaultTest extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); - @TempDir - private File projectDir; - private File gradlePropertiesFile; private File gradleBuildFile; private File databaseFile; @Test public void testTutorial() throws Exception { - assertTrue(projectDir.exists()); + assertTrue(getProjectDir().exists()); createGradleProject(); editGradleBuildFile(); editGradlePropertiesFile(); @@ -56,19 +52,19 @@ private void createGradleProject() throws Exception { GradleRunner runner = GradleRunner.create(); runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS); runner.forwardOutput(); - runner.withProjectDir(projectDir); + runner.withProjectDir(getProjectDir()); BuildResult buildResult = runner.build(); assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL")); - gradlePropertiesFile = new File(projectDir, "gradle.properties"); + gradlePropertiesFile = new File(getProjectDir(), "gradle.properties"); assertTrue(gradlePropertiesFile.exists()); assertTrue(gradlePropertiesFile.isFile()); - File appDir = new File(projectDir, "app"); + File appDir = new File(getProjectDir(), "app"); assertTrue(appDir.exists()); assertTrue(appDir.isDirectory()); gradleBuildFile = new File(appDir, "build.gradle"); assertTrue(gradleBuildFile.exists()); assertTrue(gradleBuildFile.isFile()); - databaseFile = new File(projectDir, "database/test.mv.db"); + databaseFile = new File(getProjectDir(), "database/test.mv.db"); assertFalse(databaseFile.exists()); } @@ -104,7 +100,7 @@ private void createDatabase() throws Exception { } private void createHibernatePropertiesFile() throws Exception { - File hibernatePropertiesFile = new File(projectDir, "app/src/main/resources/hibernate.properties"); + File hibernatePropertiesFile = new File(getProjectDir(), "app/src/main/resources/hibernate.properties"); StringBuffer hibernatePropertiesFileContents = new StringBuffer(); hibernatePropertiesFileContents .append("hibernate.connection.driver_class=org.h2.Driver\n") @@ -120,7 +116,7 @@ private void createHibernatePropertiesFile() throws Exception { private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); - gradleRunner.withProjectDir(projectDir); + gradleRunner.withProjectDir(getProjectDir()); gradleRunner.withPluginClasspath(); gradleRunner.withArguments("generateJava"); BuildResult buildResult = gradleRunner.build(); @@ -128,7 +124,7 @@ private void executeGenerateJavaTask() throws Exception { } private void verifyProject() throws Exception { - File generatedOutputFolder = new File(projectDir, "app/generated-sources"); + File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); assertEquals(1, generatedOutputFolder.list().length); @@ -154,7 +150,7 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) { } private String constructJdbcConnectionString() { - return "jdbc:h2:" + projectDir.getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; + return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; } private String constructHibernateToolsPluginLine() { 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 index ad773448a7..e63dff25b0 100644 --- 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 @@ -15,7 +15,6 @@ import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; import org.hibernate.tool.it.gradle.TestTemplate; @@ -24,16 +23,13 @@ public class NoAnnotationsTest extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); - @TempDir - private File projectDir; - private File gradlePropertiesFile; private File gradleBuildFile; private File databaseFile; @Test public void testTutorial() throws Exception { - assertTrue(projectDir.exists()); + assertTrue(getProjectDir().exists()); createGradleProject(); editGradleBuildFile(); editGradlePropertiesFile(); @@ -56,19 +52,19 @@ private void createGradleProject() throws Exception { GradleRunner runner = GradleRunner.create(); runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS); runner.forwardOutput(); - runner.withProjectDir(projectDir); + runner.withProjectDir(getProjectDir()); BuildResult buildResult = runner.build(); assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL")); - gradlePropertiesFile = new File(projectDir, "gradle.properties"); + gradlePropertiesFile = new File(getProjectDir(), "gradle.properties"); assertTrue(gradlePropertiesFile.exists()); assertTrue(gradlePropertiesFile.isFile()); - File appDir = new File(projectDir, "app"); + File appDir = new File(getProjectDir(), "app"); assertTrue(appDir.exists()); assertTrue(appDir.isDirectory()); gradleBuildFile = new File(appDir, "build.gradle"); assertTrue(gradleBuildFile.exists()); assertTrue(gradleBuildFile.isFile()); - databaseFile = new File(projectDir, "database/test.mv.db"); + databaseFile = new File(getProjectDir(), "database/test.mv.db"); assertFalse(databaseFile.exists()); } @@ -105,7 +101,7 @@ private void createDatabase() throws Exception { } private void createHibernatePropertiesFile() throws Exception { - File hibernatePropertiesFile = new File(projectDir, "app/src/main/resources/hibernate.properties"); + File hibernatePropertiesFile = new File(getProjectDir(), "app/src/main/resources/hibernate.properties"); StringBuffer hibernatePropertiesFileContents = new StringBuffer(); hibernatePropertiesFileContents .append("hibernate.connection.driver_class=org.h2.Driver\n") @@ -121,7 +117,7 @@ private void createHibernatePropertiesFile() throws Exception { private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); - gradleRunner.withProjectDir(projectDir); + gradleRunner.withProjectDir(getProjectDir()); gradleRunner.withPluginClasspath(); gradleRunner.withArguments("generateJava"); BuildResult buildResult = gradleRunner.build(); @@ -129,7 +125,7 @@ private void executeGenerateJavaTask() throws Exception { } private void verifyProject() throws Exception { - File generatedOutputFolder = new File(projectDir, "app/generated-sources"); + File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); assertEquals(1, generatedOutputFolder.list().length); @@ -168,7 +164,7 @@ private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { } private String constructJdbcConnectionString() { - return "jdbc:h2:" + projectDir.getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; + return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; } private String constructHibernateToolsPluginLine() { 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 index 46f49f5de2..215779bd0b 100644 --- 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 @@ -14,7 +14,6 @@ import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; import org.hibernate.tool.it.gradle.TestTemplate; @@ -23,16 +22,13 @@ public class NoGenerics extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); - @TempDir - private File projectDir; - private File gradlePropertiesFile; private File gradleBuildFile; private File databaseFile; @Test public void testTutorial() throws Exception { - assertTrue(projectDir.exists()); + assertTrue(getProjectDir().exists()); createGradleProject(); editGradleBuildFile(); editGradlePropertiesFile(); @@ -46,19 +42,19 @@ private void createGradleProject() throws Exception { GradleRunner runner = GradleRunner.create(); runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS); runner.forwardOutput(); - runner.withProjectDir(projectDir); + runner.withProjectDir(getProjectDir()); BuildResult buildResult = runner.build(); assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL")); - gradlePropertiesFile = new File(projectDir, "gradle.properties"); + gradlePropertiesFile = new File(getProjectDir(), "gradle.properties"); assertTrue(gradlePropertiesFile.exists()); assertTrue(gradlePropertiesFile.isFile()); - File appDir = new File(projectDir, "app"); + File appDir = new File(getProjectDir(), "app"); assertTrue(appDir.exists()); assertTrue(appDir.isDirectory()); gradleBuildFile = new File(appDir, "build.gradle"); assertTrue(gradleBuildFile.exists()); assertTrue(gradleBuildFile.isFile()); - databaseFile = new File(projectDir, "database/test.mv.db"); + databaseFile = new File(getProjectDir(), "database/test.mv.db"); assertFalse(databaseFile.exists()); } @@ -99,7 +95,7 @@ private void createDatabase() throws Exception { } private void createHibernatePropertiesFile() throws Exception { - File hibernatePropertiesFile = new File(projectDir, "app/src/main/resources/hibernate.properties"); + File hibernatePropertiesFile = new File(getProjectDir(), "app/src/main/resources/hibernate.properties"); StringBuffer hibernatePropertiesFileContents = new StringBuffer(); hibernatePropertiesFileContents .append("hibernate.connection.driver_class=org.h2.Driver\n") @@ -115,7 +111,7 @@ private void createHibernatePropertiesFile() throws Exception { private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); - gradleRunner.withProjectDir(projectDir); + gradleRunner.withProjectDir(getProjectDir()); gradleRunner.withPluginClasspath(); gradleRunner.withArguments("generateJava"); BuildResult buildResult = gradleRunner.build(); @@ -123,7 +119,7 @@ private void executeGenerateJavaTask() throws Exception { } private void verifyProject() throws Exception { - File generatedOutputFolder = new File(projectDir, "app/generated-sources"); + File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); assertEquals(2, generatedOutputFolder.list().length); @@ -168,7 +164,7 @@ private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { } private String constructJdbcConnectionString() { - return "jdbc:h2:" + projectDir.getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; + return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; } private String constructHibernateToolsPluginLine() { 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 index d197b7a68b..d5c0c1a5c3 100644 --- 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 @@ -14,7 +14,6 @@ import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; import org.hibernate.tool.it.gradle.TestTemplate; @@ -23,16 +22,13 @@ public class UseGenerics extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); - @TempDir - private File projectDir; - private File gradlePropertiesFile; private File gradleBuildFile; private File databaseFile; @Test public void testTutorial() throws Exception { - assertTrue(projectDir.exists()); + assertTrue(getProjectDir().exists()); createGradleProject(); editGradleBuildFile(); editGradlePropertiesFile(); @@ -46,19 +42,19 @@ private void createGradleProject() throws Exception { GradleRunner runner = GradleRunner.create(); runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS); runner.forwardOutput(); - runner.withProjectDir(projectDir); + runner.withProjectDir(getProjectDir()); BuildResult buildResult = runner.build(); assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL")); - gradlePropertiesFile = new File(projectDir, "gradle.properties"); + gradlePropertiesFile = new File(getProjectDir(), "gradle.properties"); assertTrue(gradlePropertiesFile.exists()); assertTrue(gradlePropertiesFile.isFile()); - File appDir = new File(projectDir, "app"); + File appDir = new File(getProjectDir(), "app"); assertTrue(appDir.exists()); assertTrue(appDir.isDirectory()); gradleBuildFile = new File(appDir, "build.gradle"); assertTrue(gradleBuildFile.exists()); assertTrue(gradleBuildFile.isFile()); - databaseFile = new File(projectDir, "database/test.mv.db"); + databaseFile = new File(getProjectDir(), "database/test.mv.db"); assertFalse(databaseFile.exists()); } @@ -98,7 +94,7 @@ private void createDatabase() throws Exception { } private void createHibernatePropertiesFile() throws Exception { - File hibernatePropertiesFile = new File(projectDir, "app/src/main/resources/hibernate.properties"); + File hibernatePropertiesFile = new File(getProjectDir(), "app/src/main/resources/hibernate.properties"); StringBuffer hibernatePropertiesFileContents = new StringBuffer(); hibernatePropertiesFileContents .append("hibernate.connection.driver_class=org.h2.Driver\n") @@ -114,7 +110,7 @@ private void createHibernatePropertiesFile() throws Exception { private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); - gradleRunner.withProjectDir(projectDir); + gradleRunner.withProjectDir(getProjectDir()); gradleRunner.withPluginClasspath(); gradleRunner.withArguments("generateJava"); BuildResult buildResult = gradleRunner.build(); @@ -122,7 +118,7 @@ private void executeGenerateJavaTask() throws Exception { } private void verifyProject() throws Exception { - File generatedOutputFolder = new File(projectDir, "app/generated-sources"); + File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); assertEquals(2, generatedOutputFolder.list().length); @@ -154,7 +150,7 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) { } private String constructJdbcConnectionString() { - return "jdbc:h2:" + projectDir.getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; + return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; } private String constructHibernateToolsPluginLine() { 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 index 39bd2d7ba7..e8e75c089e 100644 --- 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 @@ -15,7 +15,6 @@ import org.gradle.testkit.runner.BuildResult; import org.gradle.testkit.runner.GradleRunner; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; import org.hibernate.tool.it.gradle.TestTemplate; @@ -24,16 +23,13 @@ public class TutorialTest extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); - @TempDir - private File projectDir; - private File gradlePropertiesFile; private File gradleBuildFile; private File databaseFile; @Test public void testTutorial() throws Exception { - assertTrue(projectDir.exists()); + assertTrue(getProjectDir().exists()); createGradleProject(); editGradleBuildFile(); editGradlePropertiesFile(); @@ -56,19 +52,19 @@ private void createGradleProject() throws Exception { GradleRunner runner = GradleRunner.create(); runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS); runner.forwardOutput(); - runner.withProjectDir(projectDir); + runner.withProjectDir(getProjectDir()); BuildResult buildResult = runner.build(); assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL")); - gradlePropertiesFile = new File(projectDir, "gradle.properties"); + gradlePropertiesFile = new File(getProjectDir(), "gradle.properties"); assertTrue(gradlePropertiesFile.exists()); assertTrue(gradlePropertiesFile.isFile()); - File appDir = new File(projectDir, "app"); + File appDir = new File(getProjectDir(), "app"); assertTrue(appDir.exists()); assertTrue(appDir.isDirectory()); gradleBuildFile = new File(appDir, "build.gradle"); assertTrue(gradleBuildFile.exists()); assertTrue(gradleBuildFile.isFile()); - databaseFile = new File(projectDir, "database/test.mv.db"); + databaseFile = new File(getProjectDir(), "database/test.mv.db"); assertFalse(databaseFile.exists()); } @@ -104,7 +100,7 @@ private void createDatabase() throws Exception { } private void createHibernatePropertiesFile() throws Exception { - File hibernatePropertiesFile = new File(projectDir, "app/src/main/resources/hibernate.properties"); + File hibernatePropertiesFile = new File(getProjectDir(), "app/src/main/resources/hibernate.properties"); StringBuffer hibernatePropertiesFileContents = new StringBuffer(); hibernatePropertiesFileContents .append("hibernate.connection.driver_class=org.h2.Driver\n") @@ -120,7 +116,7 @@ private void createHibernatePropertiesFile() throws Exception { private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); - gradleRunner.withProjectDir(projectDir); + gradleRunner.withProjectDir(getProjectDir()); gradleRunner.withPluginClasspath(); gradleRunner.withArguments("generateJava"); BuildResult buildResult = gradleRunner.build(); @@ -128,7 +124,7 @@ private void executeGenerateJavaTask() throws Exception { } private void verifyProject() { - File generatedOutputFolder = new File(projectDir, "app/generated-sources"); + File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); assertEquals(1, generatedOutputFolder.list().length); @@ -150,7 +146,7 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) { } private String constructJdbcConnectionString() { - return "jdbc:h2:" + projectDir.getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; + return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; } private String constructHibernateToolsPluginLine() { 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 index cbd9aef625..5c15910c9a 100644 --- 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,5 +1,16 @@ package org.hibernate.tool.it.gradle; +import java.io.File; + +import org.junit.jupiter.api.io.TempDir; + public class TestTemplate { + @TempDir + private File projectDir; + + protected File getProjectDir() { + return projectDir; + } + }