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

  - Pull up method 'editGradlePropertiesFile()'

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

Author: koentsje

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

@@ -41,17 +41,6 @@ private void verifyDatabase() throws Exception {
 		assertEquals("foo", resultSet.getString(2));
 	}
 
-	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
-		// in the gradle.properties file.
-		StringBuffer gradlePropertiesFileContents = new StringBuffer(
-				new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
-		int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
-		gradlePropertiesFileContents.insert(pos, "#");
-		Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
-	}
-	
 	private void createDatabase() throws Exception {
 		String CREATE_PERSON_TABLE = "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))";
 		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());

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

@@ -41,17 +41,6 @@ private void verifyDatabase() throws Exception {
 		assertEquals("foo", resultSet.getString(2));
 	}
 
-	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
-		// in the gradle.properties file.
-		StringBuffer gradlePropertiesFileContents = new StringBuffer(
-				new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
-		int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
-		gradlePropertiesFileContents.insert(pos, "#");
-		Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
-	}
-	
 	private void createDatabase() throws Exception {
 		String CREATE_PERSON_TABLE = "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))";
 		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());

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

@@ -31,17 +31,6 @@ public void testTutorial() throws Exception {
 		verifyProject();
 	}
 
-	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
-		// in the gradle.properties file.
-		StringBuffer gradlePropertiesFileContents = new StringBuffer(
-				new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
-		int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
-		gradlePropertiesFileContents.insert(pos, "#");
-		Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
-	}
-	
 	private void createDatabase() throws Exception {
 		String CREATE_PERSON_TABLE =
 			    "create table PERSON (ID int not null,  NAME varchar(20), primary key (ID))";

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

@@ -31,17 +31,6 @@ public void testTutorial() throws Exception {
 		verifyProject();
 	}
 
-	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
-		// in the gradle.properties file.
-		StringBuffer gradlePropertiesFileContents = new StringBuffer(
-				new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
-		int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
-		gradlePropertiesFileContents.insert(pos, "#");
-		Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
-	}
-	
 	private void createDatabase() throws Exception {
 		String CREATE_PERSON_TABLE =
 			    "create table PERSON (ID int not null,  NAME varchar(20), primary key (ID))";

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

@@ -41,17 +41,6 @@ private void verifyDatabase() throws Exception {
 		assertEquals("foo", resultSet.getString(2));
 	}
 
-	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
-		// in the gradle.properties file.
-		StringBuffer gradlePropertiesFileContents = new StringBuffer(
-				new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
-		int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
-		gradlePropertiesFileContents.insert(pos, "#");
-		Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
-	}
-	
 	private void createDatabase() throws Exception {
 		String CREATE_PERSON_TABLE = "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))";
 		Connection connection = DriverManager.getConnection(constructJdbcConnectionString());

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

@@ -61,6 +61,17 @@ protected void editGradleBuildFile() throws Exception {
         Files.writeString(getGradleBuildFile().toPath(), gradleBuildFileContents.toString());
     }
 
+    protected 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
+        // in the gradle.properties file.
+        StringBuffer gradlePropertiesFileContents = new StringBuffer(
+                new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
+        int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
+        gradlePropertiesFileContents.insert(pos, "#");
+        Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
+    }
+
     protected void createHibernatePropertiesFile() throws Exception {
         File hibernatePropertiesFile = new File(getProjectDir(), "app/src/main/resources/hibernate.properties");
         StringBuffer hibernatePropertiesFileContents = new StringBuffer();
@@ -100,8 +111,6 @@ protected void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents)
         gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
     }
 
-    protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
-
-    }
+    protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {}
 
 }