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 83aa3cf042..079d45c81d 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 @@ -41,14 +41,6 @@ private void verifyDatabase() throws Exception { assertEquals("foo", resultSet.getString(2)); } - private void editGradleBuildFile() throws Exception { - StringBuffer gradleBuildFileContents = new StringBuffer( - new String(Files.readAllBytes(getGradleBuildFile().toPath()))); - addHibernateToolsPluginLine(gradleBuildFileContents); - addH2DatabaseDependencyLine(gradleBuildFileContents); - Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString()); - } - private void editGradlePropertiesFile() throws Exception { // The Hibernate Tools Gradle plugin does not support the configuration cache. // As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out 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 906c465994..263f115011 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 @@ -41,15 +41,6 @@ private void verifyDatabase() throws Exception { assertEquals("foo", resultSet.getString(2)); } - private void editGradleBuildFile() throws Exception { - StringBuffer gradleBuildFileContents = new StringBuffer( - new String(Files.readAllBytes(getGradleBuildFile().toPath()))); - addHibernateToolsPluginLine(gradleBuildFileContents); - addH2DatabaseDependencyLine(gradleBuildFileContents); - addHibernateToolsExtension(gradleBuildFileContents); - Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString()); - } - private void editGradlePropertiesFile() throws Exception { // The Hibernate Tools Gradle plugin does not support the configuration cache. // As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out @@ -111,7 +102,7 @@ private void verifyProject() throws Exception { assertTrue(generatedPersonJavaFileContents.contains("public class Person ")); } - private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { + protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { int pos = gradleBuildFileContents.indexOf("dependencies {"); pos = gradleBuildFileContents.indexOf("}", pos); StringBuffer hibernateToolsExtension = new StringBuffer(); 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 e02f5226f3..3fc395381c 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 @@ -31,15 +31,6 @@ public void testTutorial() throws Exception { verifyProject(); } - private void editGradleBuildFile() throws Exception { - StringBuffer gradleBuildFileContents = new StringBuffer( - new String(Files.readAllBytes(getGradleBuildFile().toPath()))); - addHibernateToolsPluginLine(gradleBuildFileContents); - addH2DatabaseDependencyLine(gradleBuildFileContents); - addHibernateToolsExtension(gradleBuildFileContents); - Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString()); - } - private void editGradlePropertiesFile() throws Exception { // The Hibernate Tools Gradle plugin does not support the configuration cache. // As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out @@ -111,7 +102,7 @@ private void verifyProject() throws Exception { assertTrue(generatedItemJavaFileContents.contains("public class Item ")); } - private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { + protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { int pos = gradleBuildFileContents.indexOf("dependencies {"); pos = gradleBuildFileContents.indexOf("}", pos); StringBuffer hibernateToolsExtension = new StringBuffer(); 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 1f0e1b7b8e..ef9c56ee6f 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 @@ -31,14 +31,6 @@ public void testTutorial() throws Exception { verifyProject(); } - private void editGradleBuildFile() throws Exception { - StringBuffer gradleBuildFileContents = new StringBuffer( - new String(Files.readAllBytes(getGradleBuildFile().toPath()))); - addHibernateToolsPluginLine(gradleBuildFileContents); - addH2DatabaseDependencyLine(gradleBuildFileContents); - Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString()); - } - private void editGradlePropertiesFile() throws Exception { // The Hibernate Tools Gradle plugin does not support the configuration cache. // As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out 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 e6d9b932db..8a135c3a6f 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 @@ -41,14 +41,6 @@ private void verifyDatabase() throws Exception { assertEquals("foo", resultSet.getString(2)); } - private void editGradleBuildFile() throws Exception { - StringBuffer gradleBuildFileContents = new StringBuffer( - new String(Files.readAllBytes(getGradleBuildFile().toPath()))); - addHibernateToolsPluginLine(gradleBuildFileContents); - addH2DatabaseDependencyLine(gradleBuildFileContents); - Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString()); - } - private void editGradlePropertiesFile() throws Exception { // The Hibernate Tools Gradle plugin does not support the configuration cache. // As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out 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 450d8bb458..97dffac312 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 @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; +import java.nio.file.Files; import java.util.List; import org.junit.jupiter.api.io.TempDir; @@ -51,6 +52,15 @@ protected void createGradleProject() throws Exception { assertFalse(getDatabaseFile().exists()); } + protected void editGradleBuildFile() throws Exception { + StringBuffer gradleBuildFileContents = new StringBuffer( + new String(Files.readAllBytes(getGradleBuildFile().toPath()))); + addHibernateToolsPluginLine(gradleBuildFileContents); + addH2DatabaseDependencyLine(gradleBuildFileContents); + addHibernateToolsExtension(gradleBuildFileContents); + Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString()); + } + protected String constructH2DatabaseDependencyLine() { return " implementation 'com.h2database:h2:" + System.getenv("H2_VERSION") + "'"; } @@ -76,4 +86,8 @@ protected void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n"); } + protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { + + } + }