From 4d516261780e47cf875c8e48fcd63fa9ca70c571 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 28 Aug 2025 16:57:08 +0200 Subject: [PATCH] HBX-3080: Refactor the Gradle integration tests to factor out common code - Pull up method 'addHibernateToolsPluginLine(StringBuffer)' Signed-off-by: Koen Aers --- .../java/org/hibernate/tool/gradle/java/JpaDefaultTest.java | 6 ------ .../org/hibernate/tool/gradle/java/NoAnnotationsTest.java | 6 ------ .../java/org/hibernate/tool/gradle/java/NoGenerics.java | 6 ------ .../java/org/hibernate/tool/gradle/java/UseGenerics.java | 6 ------ .../org/hibernate/tool/gradle/tutorial/TutorialTest.java | 6 ------ .../java/org/hibernate/tool/it/gradle/TestTemplate.java | 6 ++++++ 6 files changed, 6 insertions(+), 30 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 f882432417..afb3fe4b16 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 @@ -130,10 +130,4 @@ private void verifyProject() throws Exception { assertTrue(generatedPersonJavaFileContents.contains("public class Person ")); } - private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) { - int pos = gradleBuildFileContents.indexOf("plugins {"); - pos = gradleBuildFileContents.indexOf("}", pos); - gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n"); - } - } 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 6754f752ab..8138e0d840 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 @@ -131,12 +131,6 @@ private void verifyProject() throws Exception { assertTrue(generatedPersonJavaFileContents.contains("public class Person ")); } - private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) { - int pos = gradleBuildFileContents.indexOf("plugins {"); - pos = gradleBuildFileContents.indexOf("}", pos); - gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n"); - } - private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { int pos = gradleBuildFileContents.indexOf("dependencies {"); pos = gradleBuildFileContents.indexOf("}", pos); 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 0beba33578..4f72c9d3f3 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 @@ -131,12 +131,6 @@ private void verifyProject() throws Exception { assertTrue(generatedItemJavaFileContents.contains("public class Item ")); } - private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) { - int pos = gradleBuildFileContents.indexOf("plugins {"); - pos = gradleBuildFileContents.indexOf("}", pos); - gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n"); - } - private void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) { int pos = gradleBuildFileContents.indexOf("dependencies {"); pos = gradleBuildFileContents.indexOf("}", pos); 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 5806b8a01c..ffe130db23 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 @@ -130,10 +130,4 @@ private void verifyProject() throws Exception { assertTrue(generatedItemJavaFileContents.contains("public class Item ")); } - private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) { - int pos = gradleBuildFileContents.indexOf("plugins {"); - pos = gradleBuildFileContents.indexOf("}", pos); - gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n"); - } - } 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 f11aaf00d3..eaf22f3304 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 @@ -126,10 +126,4 @@ private void verifyProject() { assertTrue(generatedPersonJavaFile.isFile()); } - private void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) { - int pos = gradleBuildFileContents.indexOf("plugins {"); - pos = gradleBuildFileContents.indexOf("}", pos); - gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n"); - } - } 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 cd5a57ff14..7e8ea3c410 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 @@ -44,4 +44,10 @@ protected void addH2DatabaseDependencyLine(StringBuffer gradleBuildFileContents) gradleBuildFileContents.insert(pos, constructH2DatabaseDependencyLine() + "\n"); } + protected void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents) { + int pos = gradleBuildFileContents.indexOf("plugins {"); + pos = gradleBuildFileContents.indexOf("}", pos); + gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n"); + } + }