Skip to content

Commit 4d51626

Browse files
committed
HBX-3080: Refactor the Gradle integration tests to factor out common code
- Pull up method 'addHibernateToolsPluginLine(StringBuffer)' Signed-off-by: Koen Aers <[email protected]>
1 parent 3123edd commit 4d51626

File tree

6 files changed

+6
-30
lines changed

6 files changed

+6
-30
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,4 @@ private void verifyProject() throws Exception {
130130
assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
131131
}
132132

133-
private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
134-
int pos = gradleBuildFileContents.indexOf("plugins {");
135-
pos = gradleBuildFileContents.indexOf("}", pos);
136-
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
137-
}
138-
139133
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,6 @@ private void verifyProject() throws Exception {
131131
assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
132132
}
133133

134-
private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
135-
int pos = gradleBuildFileContents.indexOf("plugins {");
136-
pos = gradleBuildFileContents.indexOf("}", pos);
137-
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
138-
}
139-
140134
private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
141135
int pos = gradleBuildFileContents.indexOf("dependencies {");
142136
pos = gradleBuildFileContents.indexOf("}", pos);

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,6 @@ private void verifyProject() throws Exception {
131131
assertTrue(generatedItemJavaFileContents.contains("public class Item "));
132132
}
133133

134-
private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
135-
int pos = gradleBuildFileContents.indexOf("plugins {");
136-
pos = gradleBuildFileContents.indexOf("}", pos);
137-
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
138-
}
139-
140134
private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
141135
int pos = gradleBuildFileContents.indexOf("dependencies {");
142136
pos = gradleBuildFileContents.indexOf("}", pos);

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,4 @@ private void verifyProject() throws Exception {
130130
assertTrue(generatedItemJavaFileContents.contains("public class Item "));
131131
}
132132

133-
private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
134-
int pos = gradleBuildFileContents.indexOf("plugins {");
135-
pos = gradleBuildFileContents.indexOf("}", pos);
136-
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
137-
}
138-
139133
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,4 @@ private void verifyProject() {
126126
assertTrue(generatedPersonJavaFile.isFile());
127127
}
128128

129-
private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
130-
int pos = gradleBuildFileContents.indexOf("plugins {");
131-
pos = gradleBuildFileContents.indexOf("}", pos);
132-
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
133-
}
134-
135129
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,10 @@ protected void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents)
4444
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
4545
}
4646

47+
protected void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
48+
int pos = gradleBuildFileContents.indexOf("plugins {");
49+
pos = gradleBuildFileContents.indexOf("}", pos);
50+
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
51+
}
52+
4753
}

0 commit comments

Comments
 (0)