Skip to content

HBX-3080: Refactor the Gradle integration tests to factor out common code #5417

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
Sep 1, 2025
Merged

HBX-3080: Refactor the Gradle integration tests to factor out common code #5417

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
18 changes: 5 additions & 13 deletions gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ public void testTutorial() throws Exception {
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
"insert into PERSON values (1, 'foo')"
});
setHibernateToolsExtensionSection(
"hibernateTools { \n" +
" generateAnnotations=false \n" +
"}"
);
createProject();
executeGradleCommand("generateJava");
verifyProject();
Expand All @@ -45,17 +50,4 @@ private void verifyProject() throws Exception {
assertTrue(generatedPersonJavaFileContents.contains("public class Person "));
}

protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
int pos = gradleBuildFileContents.indexOf("dependencies {");
pos = gradleBuildFileContents.indexOf("}", pos);
StringBuffer hibernateToolsExtension = new StringBuffer();
hibernateToolsExtension
.append("\n")
.append("\n")
.append("hibernateTools { \n")
.append(" generateAnnotations=false \n")
.append("}");
gradleBuildFileContents.insert(pos + 1, hibernateToolsExtension.toString());
}

}
18 changes: 5 additions & 13 deletions gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ public void testTutorial() throws Exception {
"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))"
});
setHibernateToolsExtensionSection(
"hibernateTools { \n" +
" useGenerics=false \n" +
"}"
);
createProject();
executeGradleCommand("generateJava");
verifyProject();
Expand All @@ -51,17 +56,4 @@ private void verifyProject() throws Exception {
assertTrue(generatedItemJavaFileContents.contains("public class Item "));
}

protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
int pos = gradleBuildFileContents.indexOf("dependencies {");
pos = gradleBuildFileContents.indexOf("}", pos);
StringBuffer hibernateToolsExtension = new StringBuffer();
hibernateToolsExtension
.append("\n")
.append("\n")
.append("hibernateTools { \n")
.append(" useGenerics=false \n")
.append("}");
gradleBuildFileContents.insert(pos + 1, hibernateToolsExtension.toString());
}

}
15 changes: 13 additions & 2 deletions gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class TestTemplate {
private File databaseFile;

private String[] databaseCreationScript;
private String hibernateToolsExtensionSection;

protected File getProjectDir() { return projectDir; }
protected File getGradlePropertiesFile() { return gradlePropertiesFile; }
Expand All @@ -38,6 +39,8 @@ public class TestTemplate {
protected void setDatabaseFile(File f) { databaseFile = f; }
protected String[] getDatabaseCreationScript() { return databaseCreationScript; }
protected void setDatabaseCreationScript(String[] script) { databaseCreationScript = script; }
protected String getHibernateToolsExtensionSection() { return hibernateToolsExtensionSection; }
protected void setHibernateToolsExtensionSection(String s) { hibernateToolsExtensionSection = s; }

protected void executeGradleCommand(String ... gradleCommandLine) {
GradleRunner runner = GradleRunner.create();
Expand Down Expand Up @@ -143,6 +146,14 @@ protected void addHibernateToolsPluginLine(StringBuffer gradleBuildFileContents)
gradleBuildFileContents.insert(pos, constructHibernateToolsPluginLine() + "\n");
}

protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {}

protected void addHibernateToolsExtension(StringBuffer gradleBuildFileContents) {
String extension = getHibernateToolsExtensionSection();
if (extension != null) {
int pos = gradleBuildFileContents.indexOf("dependencies {");
pos = gradleBuildFileContents.indexOf("}", pos);
gradleBuildFileContents.insert(pos + 1, "\n\n" + extension);
}
}
}