Skip to content

Commit 3123edd

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

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
@@ -136,10 +136,4 @@ private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
136136
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
137137
}
138138

139-
private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
140-
int pos = gradleBuildFileContents.indexOf("dependencies {");
141-
pos = gradleBuildFileContents.indexOf("}", pos);
142-
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
143-
}
144-
145139
}

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
@@ -137,12 +137,6 @@ private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
137137
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
138138
}
139139

140-
private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
141-
int pos = gradleBuildFileContents.indexOf("dependencies {");
142-
pos = gradleBuildFileContents.indexOf("}", pos);
143-
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
144-
}
145-
146140
private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
147141
int pos = gradleBuildFileContents.indexOf("dependencies {");
148142
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
@@ -137,12 +137,6 @@ private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
137137
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
138138
}
139139

140-
private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
141-
int pos = gradleBuildFileContents.indexOf("dependencies {");
142-
pos = gradleBuildFileContents.indexOf("}", pos);
143-
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
144-
}
145-
146140
private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
147141
int pos = gradleBuildFileContents.indexOf("dependencies {");
148142
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
@@ -136,10 +136,4 @@ private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
136136
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
137137
}
138138

139-
private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
140-
int pos = gradleBuildFileContents.indexOf("dependencies {");
141-
pos = gradleBuildFileContents.indexOf("}", pos);
142-
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
143-
}
144-
145139
}

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
@@ -132,10 +132,4 @@ private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) {
132132
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
133133
}
134134

135-
private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
136-
int pos = gradleBuildFileContents.indexOf("dependencies {");
137-
pos = gradleBuildFileContents.indexOf("}", pos);
138-
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
139-
}
140-
141135
}

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
@@ -38,4 +38,10 @@ protected String constructJdbcConnectionString() {
3838
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
3939
}
4040

41+
protected void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
42+
int pos = gradleBuildFileContents.indexOf("dependencies {");
43+
pos = gradleBuildFileContents.indexOf("}", pos);
44+
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
45+
}
46+
4147
}

0 commit comments

Comments
 (0)