From ff51ca221973bbc75e9146f947905517857f1c25 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Wed, 27 Aug 2025 14:56:31 +0200 Subject: [PATCH] HBX-3080: Refactor the Gradle integration tests to factor out common code - Pull up method 'constructJdbcConnectionString()' Signed-off-by: Koen Aers --- .../java/org/hibernate/tool/gradle/java/JpaDefaultTest.java | 4 ---- .../org/hibernate/tool/gradle/java/NoAnnotationsTest.java | 4 ---- .../java/org/hibernate/tool/gradle/java/NoGenerics.java | 4 ---- .../java/org/hibernate/tool/gradle/java/UseGenerics.java | 4 ---- .../java/org/hibernate/tool/gradle/tutorial/TutorialTest.java | 4 ---- .../java/org/hibernate/tool/it/gradle/TestTemplate.java | 4 ++++ 6 files changed, 4 insertions(+), 20 deletions(-) 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 0009199154..11104e48ec 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 @@ -145,8 +145,4 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) { gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n"); } - private String constructJdbcConnectionString() { - return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; - } - } 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 9edef30f22..30cebb88e9 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 @@ -159,8 +159,4 @@ private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { gradleBuildFileContents.insert(pos + 1, hibernateToolsExtension.toString()); } - private String constructJdbcConnectionString() { - return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; - } - } 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 f635dcc9a6..edbe7408a9 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 @@ -159,8 +159,4 @@ private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { gradleBuildFileContents.insert(pos + 1, hibernateToolsExtension.toString()); } - private String constructJdbcConnectionString() { - return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; - } - } 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 5f1f42a515..9ddd8e1fa0 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 @@ -145,8 +145,4 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) { gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n"); } - private String constructJdbcConnectionString() { - return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; - } - } 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 ab0d8efb0f..44c0912eb8 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 @@ -141,8 +141,4 @@ private void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) { gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n"); } - private String constructJdbcConnectionString() { - return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; - } - } 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 103b2057a4..0a7b7ad735 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 @@ -30,4 +30,8 @@ protected String constructHibernateToolsPluginLine() { + System.getenv("HIBERNATE_TOOLS_VERSION") + "'"; } + protected String constructJdbcConnectionString() { + return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE"; + } + }