From 2f3bea0412fedead1e2fb613d381beca9d1da97c Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 1 Sep 2025 12:18:14 +0200 Subject: [PATCH] HBX-3080: Refactor the Gradle integration tests to factor out common code - Inline the 'verifyProject()' methods of the test classes into their respective test methods Signed-off-by: Koen Aers --- .../org/hibernate/tool/gradle/java/JpaDefaultTest.java | 6 +----- .../org/hibernate/tool/gradle/java/NoAnnotationsTest.java | 6 +----- .../java/org/hibernate/tool/gradle/java/NoGenerics.java | 8 ++------ .../java/org/hibernate/tool/gradle/java/UseGenerics.java | 8 ++------ .../org/hibernate/tool/gradle/tutorial/TutorialTest.java | 4 ---- .../java/org/hibernate/tool/it/gradle/TestTemplate.java | 1 + 6 files changed, 7 insertions(+), 26 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 2c73841557..6e18f44d17 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 @@ -21,17 +21,13 @@ public class JpaDefaultTest extends TestTemplate { @Test - public void testTutorial() throws Exception { + public void testJpaDefault() throws Exception { setDatabaseCreationScript(new String[] { "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))", "insert into PERSON values (1, 'foo')" }); createProject(); executeGradleCommand("generateJava"); - verifyProject(); - } - - private void verifyProject() throws Exception { File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); 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 fb91d3f6fb..de2f449e88 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 @@ -21,7 +21,7 @@ public class NoAnnotationsTest extends TestTemplate { @Test - public void testTutorial() throws Exception { + public void testNoAnnotations() throws Exception { setDatabaseCreationScript(new String[] { "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))", "insert into PERSON values (1, 'foo')" @@ -33,10 +33,6 @@ public void testTutorial() throws Exception { ); createProject(); executeGradleCommand("generateJava"); - verifyProject(); - } - - private void verifyProject() throws Exception { File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); 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 8c2ce4a619..e143e0ffcd 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 @@ -20,7 +20,7 @@ public class NoGenerics extends TestTemplate { @Test - public void testTutorial() throws Exception { + public void testNoGenerics() throws Exception { setDatabaseCreationScript(new String[] { "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))", "create table ITEM (ID int not null, NAME varchar(20), OWNER_ID int not null, " + @@ -33,10 +33,6 @@ public void testTutorial() throws Exception { ); createProject(); executeGradleCommand("generateJava"); - verifyProject(); - } - - private void verifyProject() throws Exception { File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); @@ -55,5 +51,5 @@ private void verifyProject() throws Exception { Files.readAllBytes(generatedItemJavaFile.toPath())); assertTrue(generatedItemJavaFileContents.contains("public class Item ")); } - + } 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 a28baf535d..6b88e92bff 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 @@ -20,7 +20,7 @@ public class UseGenerics extends TestTemplate { @Test - public void testTutorial() throws Exception { + public void testUseGenerics() throws Exception { setDatabaseCreationScript(new String[] { "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))", "create table ITEM (ID int not null, NAME varchar(20), OWNER_ID int not null, " + @@ -28,10 +28,6 @@ public void testTutorial() throws Exception { }); createProject(); executeGradleCommand("generateJava"); - verifyProject(); - } - - private void verifyProject() throws Exception { File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); @@ -50,5 +46,5 @@ private void verifyProject() throws Exception { Files.readAllBytes(generatedItemJavaFile.toPath())); assertTrue(generatedItemJavaFileContents.contains("public class Item ")); } - + } 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 05790e3cea..ebeb6e3201 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 @@ -28,10 +28,6 @@ public void testTutorial() throws Exception { }); createProject(); executeGradleCommand("generateJava"); - verifyProject(); - } - - private void verifyProject() { File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources"); assertTrue(generatedOutputFolder.exists()); assertTrue(generatedOutputFolder.isDirectory()); 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 02186492fd..e93ec7b7a4 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 @@ -154,6 +154,7 @@ protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) gradleBuildFileContents.insert(pos + 1, "\n\n" + extension); } } + }