HBX-3068: Refactor the Ant integration tests to factor out common code

  - Create new integration test class 'Hbm2JavaTestIT'
  - Move all the tests under 'hbm2java' into this new test class
  - Move TutorialTestIt one level up

Signed-off-by: Koen Aers <[email protected]>

Author: koentsje

ant/src/it/java/org/hibernate/tool/ant/Hbm2JavaTestIT.java

@@ -0,0 +1,99 @@
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.it.ant.TestTemplate;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class Hbm2JavaTestIT extends TestTemplate {
+
+    @Test
+    public void testJpaDefault() throws Exception {
+        setHibernateToolTaskXml(
+                "        <hibernatetool destdir='generated'>                          \n" +
+                "            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+                "            <hbm2java/>                                              \n" +
+                "        </hibernatetool>                                             \n"
+        );
+        setDatabaseCreationScript(new String[] {
+                "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+        });
+        createProjectAndBuild();
+        assertFolderExists("generated", 1);
+        assertFileExists("generated/Person.java");
+        String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+        assertTrue(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
+        assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+    }
+
+    @Test
+    public void testNoAnnotations() throws Exception {
+        setHibernateToolTaskXml(
+                "        <hibernatetool destdir='generated'>                          \n" +
+                "            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+                "            <hbm2java ejb3='false'/>                                 \n" +
+                "        </hibernatetool>                                             \n"
+        );
+        setDatabaseCreationScript(new String[] {
+                "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+        });
+        createProjectAndBuild();
+        assertFolderExists("generated", 1);
+        assertFileExists("generated/Person.java");
+        String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+        assertFalse(generatedPersonJavaFileContents.contains("import jakarta.persistence.Entity;"));
+        assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+    }
+
+    @Test
+    public void testNoGenerics() throws Exception {
+        setHibernateToolTaskXml(
+                "        <hibernatetool destdir='generated'>                          \n" +
+                "            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+                "            <hbm2java jdk5='false'/>                                 \n" +
+                "        </hibernatetool>                                             \n"
+        );
+        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, " +
+                        "primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+        });
+        createProjectAndBuild();
+        assertFolderExists("generated", 2);
+        assertFileExists("generated/Person.java");
+        String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+        assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+        assertFalse(generatedPersonJavaFileContents.contains("Set<Item>"));
+        assertFileExists("generated/Item.java");
+        String generatedItemJavaFileContents = getFileContents("generated/Item.java");
+        assertTrue(generatedItemJavaFileContents.contains("public class Item "));
+    }
+
+    @Test
+    public void testUseGenerics() throws Exception {
+        setHibernateToolTaskXml(
+                "        <hibernatetool destdir='generated'>                          \n" +
+                "            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+                "            <hbm2java/>                                              \n" +
+                "        </hibernatetool>                                             \n"
+        );
+        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, " +
+                        "primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
+        });
+        createProjectAndBuild();
+        assertFolderExists("generated", 2);
+        assertFileExists("generated/Person.java");
+        String generatedPersonJavaFileContents = getFileContents("generated/Person.java");
+        assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
+        assertTrue(generatedPersonJavaFileContents.contains("Set<Item>"));
+        assertFileExists("generated/Item.java");
+        String generatedItemJavaFileContents = getFileContents("generated/Item.java");
+        assertTrue(generatedItemJavaFileContents.contains("public class Item "));
+    }
+
+}

ant/src/it/java/org/hibernate/tool/ant/TutorialTestIT.java

@@ -0,0 +1,26 @@
+package org.hibernate.tool.ant;
+
+import org.hibernate.tool.it.ant.TestTemplate;
+import org.junit.jupiter.api.Test;
+
+public class TutorialTestIT extends TestTemplate {
+	
+    @Test
+    public void testTutorial() throws Exception {
+		setHibernateToolTaskXml(
+				"        <hibernatetool destdir='generated-sources'>                  \n" +
+				"            <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
+				"            <hbm2java/>                                              \n" +
+				"        </hibernatetool>                                             \n"
+		);
+		setDatabaseCreationScript(new String[] {
+				"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
+		});
+		createProjectAndBuild();
+		assertFolderExists("generated-sources", 1);
+		assertFileExists("generated-sources/Person.java");
+
+
+    }
+
+}