Skip to content

Commit ff51ca2

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

File tree

6 files changed

+4
-20
lines changed

6 files changed

+4
-20
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,4 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
145145
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
146146
}
147147

148-
private String constructJdbcConnectionString() {
149-
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
150-
}
151-
152148
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,4 @@ private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
159159
gradleBuildFileContents.insert(pos + 1, hibernateToolsExtension.toString());
160160
}
161161

162-
private String constructJdbcConnectionString() {
163-
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
164-
}
165-
166162
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,4 @@ private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
159159
gradleBuildFileContents.insert(pos + 1, hibernateToolsExtension.toString());
160160
}
161161

162-
private String constructJdbcConnectionString() {
163-
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
164-
}
165-
166162
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,4 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
145145
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
146146
}
147147

148-
private String constructJdbcConnectionString() {
149-
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
150-
}
151-
152148
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,4 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) {
141141
gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n");
142142
}
143143

144-
private String constructJdbcConnectionString() {
145-
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
146-
}
147-
148144
}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,8 @@ protected String constructHibernateToolsPluginLine() {
3030
+ System.getenv("HIBERNATE_TOOLS_VERSION") + "'";
3131
}
3232

33+
protected String constructJdbcConnectionString() {
34+
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
35+
}
36+
3337
}

0 commit comments

Comments
 (0)