Skip to content

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

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
Aug 29, 2025
Merged

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

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
7 changes: 1 addition & 6 deletions gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
"insert into PERSON values (1, 'foo')"
});
assertTrue(getProjectDir().exists());
createGradleProject();
editGradleBuildFile();
editGradlePropertiesFile();
createDatabase();
createHibernatePropertiesFile();
createProject();
executeGenerateJavaTask();
verifyProject();
}
Expand Down
7 changes: 1 addition & 6 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,12 +26,7 @@ public void testTutorial() throws Exception {
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
"insert into PERSON values (1, 'foo')"
});
assertTrue(getProjectDir().exists());
createGradleProject();
editGradleBuildFile();
editGradlePropertiesFile();
createDatabase();
createHibernatePropertiesFile();
createProject();
executeGenerateJavaTask();
verifyProject();
}
Expand Down
7 changes: 1 addition & 6 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,12 +26,7 @@ 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))"
});
assertTrue(getProjectDir().exists());
createGradleProject();
editGradleBuildFile();
editGradlePropertiesFile();
createDatabase();
createHibernatePropertiesFile();
createProject();
executeGenerateJavaTask();
verifyProject();
}
Expand Down
7 changes: 1 addition & 6 deletions gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@ 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))"
});
assertTrue(getProjectDir().exists());
createGradleProject();
editGradleBuildFile();
editGradlePropertiesFile();
createDatabase();
createHibernatePropertiesFile();
createProject();
executeGenerateJavaTask();
verifyProject();
}
Expand Down
7 changes: 1 addition & 6 deletions gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
"insert into PERSON values (1, 'foo')"
});
assertTrue(getProjectDir().exists());
createGradleProject();
editGradleBuildFile();
editGradlePropertiesFile();
createDatabase();
createHibernatePropertiesFile();
createProject();
executeGenerateJavaTask();
verifyProject();
}
Expand Down
10 changes: 9 additions & 1 deletion 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 @@ -39,7 +39,15 @@ public class TestTemplate {
protected String[] getDatabaseCreationScript() { return databaseCreationScript; }
protected void setDatabaseCreationScript(String[] script) { databaseCreationScript = script; }

protected void createGradleProject() throws Exception {
protected void createProject() throws Exception {
initGradleProject();
editGradleBuildFile();
editGradlePropertiesFile();
createDatabase();
createHibernatePropertiesFile();
}

protected void initGradleProject() throws Exception {
GradleRunner runner = GradleRunner.create();
runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS);
runner.forwardOutput();
Expand Down