Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 31, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions ant/src/it/java/org/hibernate/tool/ant/hbm2java/JpaDefaultTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package org.hibernate.tool.ant.hbm2java;

import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.hibernate.tool.it.ant.TestTemplate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
import java.nio.file.Files;
import java.sql.Connection;
import java.sql.DriverManager;
Expand All @@ -21,13 +15,11 @@
public class JpaDefaultTestIT extends TestTemplate {

private File buildXmlFile;
private ByteArrayOutputStream output;
private File databaseFile;
private File personFile;

@BeforeEach
public void beforeEach() {
output = new ByteArrayOutputStream();
databaseFile = new File(getProjectDir(), "database/test.mv.db");
assertFalse(databaseFile.exists());
personFile = new File(getProjectDir(), "generated/Person.java");
Expand Down Expand Up @@ -78,14 +70,6 @@ private void createHibernatePropertiesFile() throws Exception {
assertTrue(hibernatePropertiesFile.exists());
}

private void runAntBuild() {
Project project = new Project();
project.setBaseDir(getProjectDir());
project.addBuildListener(getConsoleLogger());
ProjectHelper.getProjectHelper().parse(project, buildXmlFile);
project.executeTarget(project.getDefaultTarget());
}

private void verifyResult() throws Exception {
File generatedOutputFolder = new File(getProjectDir(), "generated");
assertTrue(generatedOutputFolder.exists());
Expand All @@ -100,14 +84,6 @@ private void verifyResult() throws Exception {
assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
}

private DefaultLogger getConsoleLogger() {
DefaultLogger consoleLogger = new DefaultLogger();
consoleLogger.setErrorPrintStream(System.err);
consoleLogger.setOutputPrintStream(new PrintStream(output, true));
consoleLogger.setMessageOutputLevel(Project.MSG_INFO);
return consoleLogger;
}

private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}
Expand Down
24 changes: 0 additions & 24 deletions ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoAnnotationsTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package org.hibernate.tool.ant.hbm2java;

import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.hibernate.tool.it.ant.TestTemplate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
import java.nio.file.Files;
import java.sql.Connection;
import java.sql.DriverManager;
Expand All @@ -21,13 +15,11 @@
public class NoAnnotationsTestIT extends TestTemplate {

private File buildXmlFile;
private ByteArrayOutputStream output;
private File databaseFile;
private File personFile;

@BeforeEach
public void beforeEach() {
output = new ByteArrayOutputStream();
databaseFile = new File(getProjectDir(), "database/test.mv.db");
assertFalse(databaseFile.exists());
personFile = new File(getProjectDir(), "generated/Person.java");
Expand Down Expand Up @@ -78,14 +70,6 @@ private void createHibernatePropertiesFile() throws Exception {
assertTrue(hibernatePropertiesFile.exists());
}

private void runAntBuild() {
Project project = new Project();
project.setBaseDir(getProjectDir());
project.addBuildListener(getConsoleLogger());
ProjectHelper.getProjectHelper().parse(project, buildXmlFile);
project.executeTarget(project.getDefaultTarget());
}

private void verifyResult() throws Exception {
File generatedOutputFolder = new File(getProjectDir(), "generated");
assertTrue(generatedOutputFolder.exists());
Expand All @@ -100,14 +84,6 @@ private void verifyResult() throws Exception {
assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
}

private DefaultLogger getConsoleLogger() {
DefaultLogger consoleLogger = new DefaultLogger();
consoleLogger.setErrorPrintStream(System.err);
consoleLogger.setOutputPrintStream(new PrintStream(output, true));
consoleLogger.setMessageOutputLevel(Project.MSG_INFO);
return consoleLogger;
}

private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}
Expand Down
24 changes: 0 additions & 24 deletions ant/src/it/java/org/hibernate/tool/ant/hbm2java/NoGenericsTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package org.hibernate.tool.ant.hbm2java;

import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.hibernate.tool.it.ant.TestTemplate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
import java.nio.file.Files;
import java.sql.Connection;
import java.sql.DriverManager;
Expand All @@ -21,13 +15,11 @@
public class NoGenericsTestIT extends TestTemplate {

private File buildXmlFile;
private ByteArrayOutputStream output;
private File databaseFile;
private File personFile;

@BeforeEach
public void beforeEach() {
output = new ByteArrayOutputStream();
databaseFile = new File(getProjectDir(), "database/test.mv.db");
assertFalse(databaseFile.exists());
personFile = new File(getProjectDir(), "generated/Person.java");
Expand Down Expand Up @@ -82,14 +74,6 @@ private void createHibernatePropertiesFile() throws Exception {
assertTrue(hibernatePropertiesFile.exists());
}

private void runAntBuild() {
Project project = new Project();
project.setBaseDir(getProjectDir());
project.addBuildListener(getConsoleLogger());
ProjectHelper.getProjectHelper().parse(project, buildXmlFile);
project.executeTarget(project.getDefaultTarget());
}

private void verifyResult() throws Exception {
File generatedOutputFolder = new File(getProjectDir(), "generated");
assertTrue(generatedOutputFolder.exists());
Expand All @@ -110,14 +94,6 @@ private void verifyResult() throws Exception {
assertTrue(generatedItemJavaFileContents.contains("public class Item "));
}

private DefaultLogger getConsoleLogger() {
DefaultLogger consoleLogger = new DefaultLogger();
consoleLogger.setErrorPrintStream(System.err);
consoleLogger.setOutputPrintStream(new PrintStream(output, true));
consoleLogger.setMessageOutputLevel(Project.MSG_INFO);
return consoleLogger;
}

private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}
Expand Down
24 changes: 0 additions & 24 deletions ant/src/it/java/org/hibernate/tool/ant/hbm2java/UseGenericsTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
package org.hibernate.tool.ant.hbm2java;

import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.hibernate.tool.it.ant.TestTemplate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
import java.nio.file.Files;
import java.sql.Connection;
import java.sql.DriverManager;
Expand All @@ -21,13 +15,11 @@
public class UseGenericsTestIT extends TestTemplate {

private File buildXmlFile;
private ByteArrayOutputStream output;
private File databaseFile;
private File personFile;

@BeforeEach
public void beforeEach() {
output = new ByteArrayOutputStream();
databaseFile = new File(getProjectDir(), "database/test.mv.db");
assertFalse(databaseFile.exists());
personFile = new File(getProjectDir(), "generated/Person.java");
Expand Down Expand Up @@ -82,14 +74,6 @@ private void createHibernatePropertiesFile() throws Exception {
assertTrue(hibernatePropertiesFile.exists());
}

private void runAntBuild() {
Project project = new Project();
project.setBaseDir(getProjectDir());
project.addBuildListener(getConsoleLogger());
ProjectHelper.getProjectHelper().parse(project, buildXmlFile);
project.executeTarget(project.getDefaultTarget());
}

private void verifyResult() throws Exception {
File generatedOutputFolder = new File(getProjectDir(), "generated");
assertTrue(generatedOutputFolder.exists());
Expand All @@ -110,14 +94,6 @@ private void verifyResult() throws Exception {
assertTrue(generatedItemJavaFileContents.contains("public class Item "));
}

private DefaultLogger getConsoleLogger() {
DefaultLogger consoleLogger = new DefaultLogger();
consoleLogger.setErrorPrintStream(System.err);
consoleLogger.setOutputPrintStream(new PrintStream(output, true));
consoleLogger.setMessageOutputLevel(Project.MSG_INFO);
return consoleLogger;
}

private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}
Expand Down
24 changes: 0 additions & 24 deletions ant/src/it/java/org/hibernate/tool/ant/tutorial/TutorialTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,24 @@
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.PrintStream;
import java.nio.file.Files;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.Statement;

import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.hibernate.tool.it.ant.TestTemplate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;

public class TutorialTestIT extends TestTemplate {

private File buildXmlFile;
private ByteArrayOutputStream output;
private File databaseFile;
private File personFile;

@BeforeEach
public void beforeEach() {
output = new ByteArrayOutputStream();
databaseFile = new File(getProjectDir(), "database/test.mv.db");
assertFalse(databaseFile.exists());
personFile = new File(getProjectDir(), "generated/Person.java");
Expand Down Expand Up @@ -80,14 +72,6 @@ private void createHibernatePropertiesFile() throws Exception {
assertTrue(hibernatePropertiesFile.exists());
}

private void runAntBuild() {
Project project = new Project();
project.setBaseDir(getProjectDir());
project.addBuildListener(getConsoleLogger());
ProjectHelper.getProjectHelper().parse(project, buildXmlFile);
project.executeTarget(project.getDefaultTarget());
}

private void verifyResult() {
File generatedOutputFolder = new File(getProjectDir(), "generated");
assertTrue(generatedOutputFolder.exists());
Expand All @@ -98,14 +82,6 @@ private void verifyResult() {
assertTrue(generatedPersonJavaFile.isFile());
}

private DefaultLogger getConsoleLogger() {
DefaultLogger consoleLogger = new DefaultLogger();
consoleLogger.setErrorPrintStream(System.err);
consoleLogger.setOutputPrintStream(new PrintStream(output, true));
consoleLogger.setMessageOutputLevel(Project.MSG_INFO);
return consoleLogger;
}

private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}
Expand Down
21 changes: 21 additions & 0 deletions ant/src/it/java/org/hibernate/tool/it/ant/TestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
package org.hibernate.tool.it.ant;

import org.apache.tools.ant.DefaultLogger;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.ProjectHelper;
import org.junit.jupiter.api.io.TempDir;

import java.io.File;
import java.io.PrintStream;

public abstract class TestTemplate {

Expand All @@ -19,6 +23,23 @@ protected String constructBuildXmlFileContents() {
return buildXmlFileContents.replace("@hibernateToolTaskXml@", hibernateToolTaskXml());
}

protected void runAntBuild() {
File buildXmlFile = new File(getProjectDir(), "build.xml");
Project project = new Project();
project.setBaseDir(getProjectDir());
project.addBuildListener(getConsoleLogger());
ProjectHelper.getProjectHelper().parse(project, buildXmlFile);
project.executeTarget(project.getDefaultTarget());
}

private DefaultLogger getConsoleLogger() {
DefaultLogger consoleLogger = new DefaultLogger();
consoleLogger.setErrorPrintStream(System.err);
consoleLogger.setOutputPrintStream(System.out);
consoleLogger.setMessageOutputLevel(Project.MSG_INFO);
return consoleLogger;
}

private static final String buildXmlFileContents =
"<project name='tutorial' default='reveng'> \n" +
" <taskdef \n" +
Expand Down