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 079d45c81d..fc3e8867a1 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 @@ -64,20 +64,6 @@ private void createDatabase() throws Exception { assertTrue(getDatabaseFile().isFile()); } - private void createHibernatePropertiesFile() throws Exception { - 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") - .append("hibernate.connection.url=" + constructJdbcConnectionString() + "\n") - .append("hibernate.connection.username=\n") - .append("hibernate.connection.password=\n") - .append("hibernate.default_catalog=TEST\n") - .append("hibernate.default_schema=PUBLIC\n"); - Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents.toString()); - assertTrue(hibernatePropertiesFile.exists()); - } - private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); 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 263f115011..35c4c0213f 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 @@ -64,20 +64,6 @@ private void createDatabase() throws Exception { assertTrue(getDatabaseFile().isFile()); } - private void createHibernatePropertiesFile() throws Exception { - 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") - .append("hibernate.connection.url=" + constructJdbcConnectionString() + "\n") - .append("hibernate.connection.username=\n") - .append("hibernate.connection.password=\n") - .append("hibernate.default_catalog=TEST\n") - .append("hibernate.default_schema=PUBLIC\n"); - Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents.toString()); - assertTrue(hibernatePropertiesFile.exists()); - } - private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); 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 3fc395381c..e92f1b866d 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 @@ -58,20 +58,6 @@ private void createDatabase() throws Exception { assertTrue(getDatabaseFile().isFile()); } - private void createHibernatePropertiesFile() throws Exception { - 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") - .append("hibernate.connection.url=" + constructJdbcConnectionString() + "\n") - .append("hibernate.connection.username=\n") - .append("hibernate.connection.password=\n") - .append("hibernate.default_catalog=TEST\n") - .append("hibernate.default_schema=PUBLIC\n"); - Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents.toString()); - assertTrue(hibernatePropertiesFile.exists()); - } - private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); 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 ef9c56ee6f..da38b3bbdd 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 @@ -58,20 +58,6 @@ private void createDatabase() throws Exception { assertTrue(getDatabaseFile().isFile()); } - private void createHibernatePropertiesFile() throws Exception { - 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") - .append("hibernate.connection.url=" + constructJdbcConnectionString() + "\n") - .append("hibernate.connection.username=\n") - .append("hibernate.connection.password=\n") - .append("hibernate.default_catalog=TEST\n") - .append("hibernate.default_schema=PUBLIC\n"); - Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents.toString()); - assertTrue(hibernatePropertiesFile.exists()); - } - private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); 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 8a135c3a6f..7355d9b9cd 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 @@ -64,20 +64,6 @@ private void createDatabase() throws Exception { assertTrue(getDatabaseFile().isFile()); } - private void createHibernatePropertiesFile() throws Exception { - 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") - .append("hibernate.connection.url=" + constructJdbcConnectionString() + "\n") - .append("hibernate.connection.username=\n") - .append("hibernate.connection.password=\n") - .append("hibernate.default_catalog=TEST\n") - .append("hibernate.default_schema=PUBLIC\n"); - Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents.toString()); - assertTrue(hibernatePropertiesFile.exists()); - } - private void executeGenerateJavaTask() throws Exception { GradleRunner gradleRunner = GradleRunner.create(); gradleRunner.forwardOutput(); 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 97dffac312..6ed5146078 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 @@ -61,6 +61,20 @@ protected void editGradleBuildFile() throws Exception { Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString()); } + protected void createHibernatePropertiesFile() throws Exception { + 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") + .append("hibernate.connection.url=" + constructJdbcConnectionString() + "\n") + .append("hibernate.connection.username=\n") + .append("hibernate.connection.password=\n") + .append("hibernate.default_catalog=TEST\n") + .append("hibernate.default_schema=PUBLIC\n"); + Files.writeString(hibernatePropertiesFile.toPath(), hibernatePropertiesFileContents.toString()); + assertTrue(hibernatePropertiesFile.exists()); + } + protected String constructH2DatabaseDependencyLine() { return " implementation 'com.h2database:h2:" + System.getenv("H2_VERSION") + "'"; }