HBX-3241: Add an Ant integration test for a native configuration and a added hbm.xml file

koentsje · koentsje · commit 099fe2783c5f · 2025-11-27T16:43:56.000+01:00
- Move the existing example for native configuration in subfolder 'default'
  - Rename 'ExamplesTestIT#testConfiguration()' to 'ExamplesTestIT#testConfigurationDefault()'
  - Adapt 'ExamplesTestIT#testConfigurationDefault()' to the changes above
  - Add a new example showing hbm2java based on a hbm.xml file
  - Add an integration test for the above example

Signed-off-by: Koen Aers &lt;koen.aers@gmail.com&gt;
diff --git a/ant/docs/examples/configuration/default/README.md b/ant/docs/examples/configuration/default/README.md
diff --git a/ant/docs/examples/configuration/default/build.xml b/ant/docs/examples/configuration/default/build.xml
@@ -16,12 +16,12 @@
 <project name="configuration" default="reveng">
 
   <!-- Include the 'hibernatetool' task definition from the file '../common/included.xml' -->
-  <include file="../common/included.xml"/>
+  <include file="../../common/included.xml"/>
 
   <target name="reveng" depends="common.clean">
     <hibernatetool destdir="generated">
       <!-- Native configuration reading properties from '../common/hibernate.properties' -->
-      <configuration propertyfile="../common/hibernate.properties"/>
+      <configuration propertyfile="../../common/hibernate.properties"/>
       <!-- Transform the 'hibernate.properties' file in 'hibernate.cfg.xml' -->
       <hbm2cfgxml/>
     </hibernatetool>
diff --git a/ant/docs/examples/configuration/fileset/build.xml b/ant/docs/examples/configuration/fileset/build.xml
@@ -0,0 +1,32 @@
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project name="configuration" default="reveng">
+
+  <!-- Include the 'hibernatetool' task definition from the file '../common/included.xml' -->
+  <include file="../../common/included.xml"/>
+
+  <target name="reveng" depends="common.clean">
+    <hibernatetool destdir="generated">
+      <!-- Native configuration reading properties from '../common/hibernate.properties' -->
+      <configuration propertyfile="hibernate.properties">
+        <fileset file="simple.hbm.xml"/>
+      </configuration>
+      <hbm2java/>
+    </hibernatetool>
+  </target>
+
+</project>
+
diff --git a/ant/docs/examples/configuration/fileset/hibernate.properties b/ant/docs/examples/configuration/fileset/hibernate.properties
@@ -0,0 +1,19 @@
+############################################################################
+# Hibernate Tools, Tooling for your Hibernate Projects                     #
+#                                                                          #
+# Copyright 2004-2025 Red Hat, Inc.                                        #
+#                                                                          #
+# Licensed under the Apache License, Version 2.0 (the "License");          #
+# you may not use this file except in compliance with the License.         #
+# You may obtain a copy of the License at                                  #
+#                                                                          #
+#     http://www.apache.org/licenses/LICENSE-2.0                           #
+#                                                                          #
+# Unless required by applicable law or agreed to in writing, software      #
+# distributed under the License is distributed on an "AS IS" basis,        #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. #
+# See the License for the specific language governing permissions and      #
+# limitations under the License.                                           #
+############################################################################
+hibernate.connection.url=jdbc:h2:mem:test
+
diff --git a/ant/docs/examples/configuration/fileset/simple.hbm.xml b/ant/docs/examples/configuration/fileset/simple.hbm.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2004 - 2025 Red Hat, Inc.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" basis,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!DOCTYPE hibernate-mapping PUBLIC
+	"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+	"https://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+
+	<class name="Foo">
+		<id name="id" type="long">
+			<generator class="assigned"/>
+		</id>
+		<property name="name" type="string"/>
+	</class>
+
+</hibernate-mapping>
diff --git a/ant/src/it/java/org/hibernate/tool/ant/ExamplesTestIT.java b/ant/src/it/java/org/hibernate/tool/ant/ExamplesTestIT.java
@@ -14,6 +14,7 @@
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.Statement;
+import java.util.Objects;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -35,7 +36,7 @@ public static void beforeAll() throws Exception {
     }
 
     @Test
-    public void test5MinuteTutorial() throws Exception {
+    public void test5MinuteTutorial() {
         File buildFile = new File(baseFolder, "5-minute-tutorial/build.xml");
         Project project = createProject(buildFile);
         assertNotNull(project);
@@ -63,7 +64,7 @@ public void testCfgXml() throws Exception {
     }
 
     @Test
-    public void testClasspath() throws Exception {
+    public void testClasspath() {
         PrintStream savedOut = System.out;
         try {
             File buildFile = new File(baseFolder, "classpath/build.xml");
@@ -80,18 +81,29 @@ public void testClasspath() throws Exception {
     }
 
     @Test
-    public void testConfiguration() throws Exception {
-        File buildFile = new File(baseFolder, "configuration/build.xml");
+    public void testConfigurationDefault() {
+        File buildFile = new File(baseFolder, "configuration/default/build.xml");
         Project project = createProject(buildFile);
         assertNotNull(project);
-        File cfgXmlFile = new File(baseFolder, "configuration/generated/hibernate.cfg.xml");
+        File cfgXmlFile = new File(baseFolder, "configuration/default/generated/hibernate.cfg.xml");
         assertFalse(cfgXmlFile.exists());
         project.executeTarget("reveng");
         assertTrue(cfgXmlFile.exists());
     }
 
     @Test
-    public void testJpa() throws Exception {
+    public void testConfigurationFileset() {
+        File buildFile = new File(baseFolder, "configuration/fileset/build.xml");
+        Project project = createProject(buildFile);
+        assertNotNull(project);
+        File cfgXmlFile = new File(baseFolder, "configuration/fileset/generated/Foo.java");
+        assertFalse(cfgXmlFile.exists());
+        project.executeTarget("reveng");
+        assertTrue(cfgXmlFile.exists());
+    }
+
+    @Test
+    public void testJpa() {
         File buildFile = new File(baseFolder, "jpa/build.xml");
         Project project = createProject(buildFile);
         assertNotNull(project);
@@ -102,7 +114,7 @@ public void testJpa() throws Exception {
     }
 
     @Test
-    public void testNative() throws Exception {
+    public void testNative() {
         File buildFile = new File(baseFolder, "native/build.xml");
         Project project = createProject(buildFile);
         assertNotNull(project);
@@ -113,7 +125,7 @@ public void testNative() throws Exception {
     }
 
     @Test
-    public void testProperties() throws Exception {
+    public void testProperties() {
         PrintStream savedOut = System.out;
         try {
             File buildFile = new File(baseFolder, "properties/build.xml");
@@ -146,7 +158,7 @@ public void testTemplatePath() throws Exception {
         assertTrue(personFileContents.contains("// This is just an example of a custom template"));
     }
 
-    private Project createProject(File buildXmlFile) throws Exception {
+    private Project createProject(File buildXmlFile) {
         Project result = new Project();
         ProjectHelper projectHelper = ProjectHelper.getProjectHelper();
         result.addReference(MagicNames.REFID_PROJECT_HELPER, projectHelper);
@@ -166,7 +178,7 @@ private DefaultLogger createConsoleLogger() {
 
     private static void editIncludedXml() throws Exception {
         File xmlFile = new File(baseFolder, "common/included.xml");
-        StringBuffer xmlFileContents = new StringBuffer(
+        StringBuilder xmlFileContents = new StringBuilder(
                 new String(Files.readAllBytes(xmlFile.toPath())));
         int start = xmlFileContents.indexOf("<ivy:cachepath");
         int end = xmlFileContents.indexOf("<ivy:cachepath", start + 1);
@@ -207,7 +219,10 @@ private static String constructJdbcConnectionString() {
     }
 
     private static File determineBaseFolder() throws Exception {
-        return new File(ExamplesTestIT.class.getClassLoader().getResource("common/included.xml").toURI())
+        return new File(
+                Objects.requireNonNull(
+                    ExamplesTestIT.class.getClassLoader().getResource(
+                        "common/included.xml")).toURI())
                 .getParentFile().getParentFile();
     }
 
