From 1a3f57bab0f35ebf1d83f4206f7ca92562327fcd Mon Sep 17 00:00:00 2001 From: Koen Aers Date: Thu, 4 Sep 2025 15:00:03 +0200 Subject: [PATCH] HBX-3080: Refactor the Gradle integration tests to factor out common code - Remove the unused 'FuncTestTemplate' class - Remove the unused 'FuncTestConstants' interface - Remove the unneeded database 'bardb.mv.db' Signed-off-by: Koen Aers --- .../test/func/utils/FuncTestConstants.java | 65 ------------- .../test/func/utils/FuncTestTemplate.java | 86 ------------------ .../src/functionalTest/resources/bardb.mv.db | Bin 16384 -> 0 bytes 3 files changed, 151 deletions(-) delete mode 100644 gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/test/func/utils/FuncTestConstants.java delete mode 100644 gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/test/func/utils/FuncTestTemplate.java delete mode 100644 gradle/plugin/src/functionalTest/resources/bardb.mv.db diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/test/func/utils/FuncTestConstants.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/test/func/utils/FuncTestConstants.java deleted file mode 100644 index d1620d2e45..0000000000 --- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/test/func/utils/FuncTestConstants.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.hibernate.tool.gradle.test.func.utils; - -public interface FuncTestConstants { - - public static final String DATABASE_NAME = "bardb"; - public static final String DATABASE_FILE_NAME = DATABASE_NAME + ".mv.db"; - public static final String DATABASE_FOLDER_NAME = "database"; - public static final String DATABASE_PATH = DATABASE_FOLDER_NAME + "/" + DATABASE_NAME; - public static final String HIBERNATE_PROPERTIES_FILE_NAME = "hibernate.properties"; - public static final String RESOURCES_FOLDER_PATH = "src/main/resources"; - public static final String GRADLE_BUILD_FILE_NAME = "build.gradle"; - public static final String GRADLE_SETTINGS_FILE_NAME = "settions.gradle"; - public static final String PROJECT_DIR_PLACEHOLDER = "${projectDir}"; - - public static final String HIBERNATE_PROPERTIES_CONTENTS = - "hibernate.connection.driver_class=org.h2.Driver\n" + - "hibernate.connection.url=jdbc:h2:" + PROJECT_DIR_PLACEHOLDER + "/" + DATABASE_PATH + "\n" + - "hibernate.connection.username=sa\n" + - "hibernate.connection.password=\n" - ; - - public static final String BUILD_FILE_PLUGINS_SECTION = - "plugins {\n" + - " id('application')\n" + - " id('org.hibernate.tool.hibernate-tools-gradle')\n" + - "}\n"; - - public static final String BUILD_FILE_REPOSITORIES_SECTION = - "repositories {\n" + - " mavenCentral()\n" + - "}\n"; - - public static final String BUILD_FILE_DEPENDENCIES_SECTION = - "dependencies {\n" + - " implementation('com.h2database:h2:2.1.214')\n" + - "}\n"; - - default String getBuildFilePluginsSection() { - return BUILD_FILE_PLUGINS_SECTION; - } - - default String getBuildFileRepositoriesSection() { - return BUILD_FILE_REPOSITORIES_SECTION; - } - - default String getBuildFileDependenciesSection() { - return BUILD_FILE_DEPENDENCIES_SECTION; - } - - default String getBuildFileHibernateToolsSection() { - return ""; - } - - default String getBuildFileContents() { - return getBuildFilePluginsSection() + - getBuildFileRepositoriesSection() + - getBuildFileDependenciesSection() + - getBuildFileHibernateToolsSection(); - } - - default String getHibernatePropertiesFileName() { - return HIBERNATE_PROPERTIES_FILE_NAME; - } - -} diff --git a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/test/func/utils/FuncTestTemplate.java b/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/test/func/utils/FuncTestTemplate.java deleted file mode 100644 index e274eb8d18..0000000000 --- a/gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/test/func/utils/FuncTestTemplate.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.hibernate.tool.gradle.test.func.utils; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; -import java.net.URISyntaxException; -import java.nio.file.Files; - -import org.gradle.testkit.runner.BuildResult; -import org.gradle.testkit.runner.GradleRunner; -import org.junit.jupiter.api.io.TempDir; - -public class FuncTestTemplate implements FuncTestConstants { - - @TempDir - protected File projectDir; - - protected File getBuildFile() { - return new File(projectDir, GRADLE_BUILD_FILE_NAME); - } - - protected File getSettingsFile() { - return new File(projectDir, GRADLE_SETTINGS_FILE_NAME); - } - - protected File getDatabaseFile() { - File databaseDir = new File(projectDir, DATABASE_FOLDER_NAME); - databaseDir.mkdirs(); - return new File(databaseDir, DATABASE_FILE_NAME); - } - - protected File getHibernatePropertiesFile() { - File resourcesDir = new File(projectDir, RESOURCES_FOLDER_PATH); - resourcesDir.mkdirs(); - return new File(resourcesDir, getHibernatePropertiesFileName()); - } - - protected String getHibernatePropertiesContents() { - return HIBERNATE_PROPERTIES_CONTENTS.replace("${projectDir}", projectDir.getAbsolutePath()); - } - - protected void copyDatabase() { - try { - Files.copy( - new File(getClass().getClassLoader().getResource(DATABASE_FILE_NAME).toURI()).toPath(), - getDatabaseFile().toPath()); - } catch (URISyntaxException | IOException e) { - throw new RuntimeException(e); - } - } - - protected void writeString(File file, String string) { - try (Writer writer = new FileWriter(file)) { - writer.write(string); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - - protected void performTask(String taskName, boolean needDatabase) { - prepareBuild(needDatabase); - verifyBuild(runBuild(taskName)); - } - - protected void prepareBuild(boolean needDatabase) { - writeString(getSettingsFile(), ""); - writeString(getBuildFile(),getBuildFileContents()); - writeString(getHibernatePropertiesFile(), getHibernatePropertiesContents()); - if (needDatabase) { - copyDatabase(); - } - } - - protected BuildResult runBuild(String taskName) { - GradleRunner runner = GradleRunner.create(); - runner.forwardOutput(); - runner.withPluginClasspath(); - runner.withArguments(taskName); - runner.withProjectDir(projectDir); - return runner.build(); - } - - protected void verifyBuild(BuildResult buildResult) {} - -} diff --git a/gradle/plugin/src/functionalTest/resources/bardb.mv.db b/gradle/plugin/src/functionalTest/resources/bardb.mv.db deleted file mode 100644 index fbe5bee5da3695c7b7d808a005c24a20176cabf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI3&u`l{6vrjINrSA}hGDx7teZ4Vp$U{kSwBvdf28r|IDzd1=`H~!QE5=yG8{Qe zcIu(m4Z{uthIQ9r|H^<7|yL+JxaQBRMLAJG=x*VLA)D}FBy z9=S$VcaA@2u7)vIf`{Y5BRC!O7#+Bp5{wv4Sm0ZbBTtP0Xs`z zd%%z$u@jdlqc~1n0y_jSjx17ElH)#e4Rg8$KvR-9aEWfAtNg$&0{KY(St=|_OFGkh z66kEnw6WnEk+x(yv`n$3E!h#(O&yaZMtz2Li!4QiSg>Kiz7>y-)Q7s-KRrp}5mQ57 zZH;@qecBtd8ck^Te8`kJo8(O0&o(x&kQ=5(tD7_c59e!h#^A6Wf0nz-t*$L(w{hM& z0Z(e>JYn8wM9=f9(40?h)r<#6xq&`s0E0GTzXS2W-PxwY)k-h++bm)uHVD{i8t+Gc z<&tfdP;L#;t`>;AAWO1z6Wu=O)VrwKu6y13VP&t;tRY<^a4UW+J}t=aN(-=3RGpUw zF9|PAUY2=j@zUm{vpArArXJql6-1g&>#h6%!k@Nb3Lo(Pc*q9b5gnWWbl6~Wl3kim zzsFSk4mU|ye+UrZ^0)c%co4?T_(;|GXzn3*KbSDL%GWI)HDBmia1&lHcP8tyBbQ}cHe^$_ zWVlb#$Hi}o(lzONAMUSu94@9`UI4=@J*!MvTh6}Dc4*>BQ>Qk|dkN9O(_=}x`z74@ zdy@2|0>@B)u?sbPe&5V$Q3?WrfFK|U2m*qDARq_`0)oJ$1m^Sad>_5`Y#+T%LL8b= z`6{#N+}Cox$v=Mw;936f^Zeh27Xf(wPcG*F(2ud^ggD6Ze~V7@f1T(5R@ul0xsp1~ z|9_IHRJeX={%IaQZw}VO@uY@{Yvy0X#v7*4Yu%WY%MYgq$w!F?3S|_-y88A-c`VWFQ1hu1vVf7$v5C(DVuw*=Ic3WrBnmW*2EK^{%L$0Fj=b7-qjd|R6*>u| z>Q%SuHPrPg%{nUW?p2zNYDq0^?(CHAET=2I)TotEqt&h7hltZ~TYJr>lAWq}pO#Q{ z%WHepE}Y%>+7BA7`*(D+ys^Boif*n{C!_4P8{2RaeNulgGsvX(5PA=_6546aoZ|tc zV{fdXwUrTIfdO6=B}}P?synStx9vfgGcKNWrru{lxWoOzq-ynp8T*UjNK)bMqF<2T z|J$Mvmxd@W{VNuTX4N9&Pt>A|;*tKQiANuD%_`T!;I%LQy4OVhbhYw~K4#3He1Rl2 z`5nF>N%^TL1;62v^xNXMMQK60&L2OjcBwq|ojm`L%pOv`<5N&P&s?metzE88<9{Yy zj|bxuc(V;2Vp+>ert_XY)~2$y5(mL}NC&~WizCp^vPYq&J9^f{I(6`*=>#E$={^SS z?5j*Wd-@9;-;?C`zJ?mQzQ4h1Q3wKpfFK|U2m*q@n?qne|IYLOnfK@&6Y_ui73Keb E0Q9iliU0rr