Skip to content

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

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 #5321

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
26 changes: 11 additions & 15 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
Expand Up @@ -42,11 +42,15 @@ public void testJpaDefault() throws Exception {
runAntBuild();
verifyResult();
}


protected String hibernateToolTaskXml() {
return hibernateToolTaskXml;
}

private void createBuildXmlFile() throws Exception {
buildXmlFile = new File(getProjectDir(), "build.xml");
assertFalse(buildXmlFile.exists());
Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
}

private void createDatabase() throws Exception {
Expand Down Expand Up @@ -108,18 +112,10 @@ private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}

private static final String buildXmlFileContents =

"<project name='tutorial' default='reveng'> \n" +
" <taskdef \n" +
" name='hibernatetool' \n" +
" classname='org.hibernate.tool.ant.HibernateToolTask'/> \n" +
" <target name='reveng'> \n" +
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java/> \n" +
" </hibernatetool> \n" +
" </target> \n" +
"</project> \n" ;
private static final String hibernateToolTaskXml =
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java/> \n" +
" </hibernatetool> \n" ;

}
29 changes: 12 additions & 17 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
Expand Up @@ -42,11 +42,15 @@ public void testNoAnnotations() throws Exception {
runAntBuild();
verifyResult();
}

private void createBuildXmlFile() throws Exception {

protected String hibernateToolTaskXml() {
return hibernateToolTaskXml;
}

private void createBuildXmlFile() throws Exception {
buildXmlFile = new File(getProjectDir(), "build.xml");
assertFalse(buildXmlFile.exists());
Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
}

private void createDatabase() throws Exception {
Expand Down Expand Up @@ -108,18 +112,9 @@ private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}

private static final String buildXmlFileContents =

"<project name='tutorial' default='reveng'> \n" +
" <taskdef \n" +
" name='hibernatetool' \n" +
" classname='org.hibernate.tool.ant.HibernateToolTask'/> \n" +
" <target name='reveng'> \n" +
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java ejb3='false'/> \n" +
" </hibernatetool> \n" +
" </target> \n" +
"</project> \n" ;

private static final String hibernateToolTaskXml =
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java ejb3='false'/> \n" +
" </hibernatetool> \n" ;
}
28 changes: 12 additions & 16 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
Expand Up @@ -42,11 +42,15 @@ public void testUseGenerics() throws Exception {
runAntBuild();
verifyResult();
}

private void createBuildXmlFile() throws Exception {

protected String hibernateToolTaskXml() {
return hibernateToolTaskXml;
}

private void createBuildXmlFile() throws Exception {
buildXmlFile = new File(getProjectDir(), "build.xml");
assertFalse(buildXmlFile.exists());
Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
}

private void createDatabase() throws Exception {
Expand Down Expand Up @@ -118,18 +122,10 @@ private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}

private static final String buildXmlFileContents =

"<project name='tutorial' default='reveng'> \n" +
" <taskdef \n" +
" name='hibernatetool' \n" +
" classname='org.hibernate.tool.ant.HibernateToolTask'/> \n" +
" <target name='reveng'> \n" +
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java jdk5='false'/> \n" +
" </hibernatetool> \n" +
" </target> \n" +
"</project> \n" ;
private static final String hibernateToolTaskXml =
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java jdk5='false'/> \n" +
" </hibernatetool> \n" ;

}
29 changes: 12 additions & 17 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
Expand Up @@ -42,11 +42,15 @@ public void testUseGenerics() throws Exception {
runAntBuild();
verifyResult();
}

private void createBuildXmlFile() throws Exception {

protected String hibernateToolTaskXml() {
return hibernateToolTaskXml;
}

private void createBuildXmlFile() throws Exception {
buildXmlFile = new File(getProjectDir(), "build.xml");
assertFalse(buildXmlFile.exists());
Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
}

private void createDatabase() throws Exception {
Expand Down Expand Up @@ -118,18 +122,9 @@ private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}

private static final String buildXmlFileContents =

"<project name='tutorial' default='reveng'> \n" +
" <taskdef \n" +
" name='hibernatetool' \n" +
" classname='org.hibernate.tool.ant.HibernateToolTask'/> \n" +
" <target name='reveng'> \n" +
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java/> \n" +
" </hibernatetool> \n" +
" </target> \n" +
"</project> \n" ;

private static final String hibernateToolTaskXml =
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java/> \n" +
" </hibernatetool> \n" ;
}
29 changes: 12 additions & 17 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 @@ -44,11 +44,15 @@ public void testTutorial() throws Exception {
runAntBuild();
verifyResult();
}

private void createBuildXmlFile() throws Exception {

protected String hibernateToolTaskXml() {
return hibernateToolTaskXml;
}

private void createBuildXmlFile() throws Exception {
buildXmlFile = new File(getProjectDir(), "build.xml");
assertFalse(buildXmlFile.exists());
Files.writeString(buildXmlFile.toPath(), buildXmlFileContents);
Files.writeString(buildXmlFile.toPath(), constructBuildXmlFileContents());
}

private void createDatabase() throws Exception {
Expand Down Expand Up @@ -106,18 +110,9 @@ private String constructJdbcConnectionString() {
return "jdbc:h2:" + getProjectDir().getAbsolutePath() + "/database/test;AUTO_SERVER=TRUE";
}

private static final String buildXmlFileContents =

"<project name='tutorial' default='reveng'> \n" +
" <taskdef \n" +
" name='hibernatetool' \n" +
" classname='org.hibernate.tool.ant.HibernateToolTask'/> \n" +
" <target name='reveng'> \n" +
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java/> \n" +
" </hibernatetool> \n" +
" </target> \n" +
"</project> \n" ;

private static final String hibernateToolTaskXml =
" <hibernatetool destdir='generated'> \n" +
" <jdbcconfiguration propertyfile='hibernate.properties'/> \n" +
" <hbm2java/> \n" +
" </hibernatetool> \n" ;
}
18 changes: 17 additions & 1 deletion 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
Expand Up @@ -4,7 +4,7 @@

import java.io.File;

public class TestTemplate {
public abstract class TestTemplate {

@TempDir
private File projectDir;
Expand All @@ -13,4 +13,20 @@ protected File getProjectDir() {
return projectDir;
}

protected abstract String hibernateToolTaskXml();

protected String constructBuildXmlFileContents() {
return buildXmlFileContents.replace("@hibernateToolTaskXml@", hibernateToolTaskXml());
}

private static final String buildXmlFileContents =
"<project name='tutorial' default='reveng'> \n" +
" <taskdef \n" +
" name='hibernatetool' \n" +
" classname='org.hibernate.tool.ant.HibernateToolTask'/> \n" +
" <target name='reveng'> \n" +
"@hibernateToolTaskXml@" +
" </target> \n" +
"</project> \n" ;

}