From 8a31ee0a85956d4a3cd4e1c462f553e5d7a89a20 Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Mon, 25 Aug 2025 16:51:53 +0200 Subject: [PATCH] HBX-3080: Refactor the Gradle integration tests to factor out common code - Create integration test template class 'org.hibernate.tool.it.gradle.TestTemplate' - Make the following classes extends the template from above: * org.hibernate.tool.gradle.java.JpaDefaultTest * org.hibernate.tool.gradle.java.NoAnnotationsTest * org.hibernate.tool.gradle.java.NoGenerics * org.hibernate.tool.gradle.java.UseGenerics 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/it/gradle/TestTemplate.java | 5 +++++ 5 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java 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 d3705519e2..558311b950 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 @@ -17,7 +17,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class JpaDefaultTest { +import org.hibernate.tool.it.gradle.TestTemplate; + +public class JpaDefaultTest extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); 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 3176e86039..ad773448a7 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 @@ -17,7 +17,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class NoAnnotationsTest { +import org.hibernate.tool.it.gradle.TestTemplate; + +public class NoAnnotationsTest extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); 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 19bba27bba..46f49f5de2 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 @@ -16,7 +16,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class NoGenerics { +import org.hibernate.tool.it.gradle.TestTemplate; + +public class NoGenerics extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); 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 991b2eabd7..d197b7a68b 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 @@ -16,7 +16,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; -public class UseGenerics { +import org.hibernate.tool.it.gradle.TestTemplate; + +public class UseGenerics extends TestTemplate { private static final List GRADLE_INIT_PROJECT_ARGUMENTS = List.of( "init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"); 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 new file mode 100644 index 0000000000..cbd9aef625 --- /dev/null +++ b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java @@ -0,0 +1,5 @@ +package org.hibernate.tool.it.gradle; + +public class TestTemplate { + +}