Skip to content

Commit 2ad517f

Browse files
committed
HBX-3080: Refactor the Gradle integration tests to factor out common code
- Factor out the project and database creation and initialization in a 'createProject()' method - Rename the TestTemplate#createGradleProject() to TestTemplate#initGradleProject() Signed-off-by: Koen Aers <[email protected]>
1 parent 992ec9b commit 2ad517f

File tree

6 files changed

+14
-31
lines changed

6 files changed

+14
-31
lines changed

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/JpaDefaultTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
2626
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
2727
"insert into PERSON values (1, 'foo')"
2828
});
29-
assertTrue(getProjectDir().exists());
30-
createGradleProject();
31-
editGradleBuildFile();
32-
editGradlePropertiesFile();
33-
createDatabase();
34-
createHibernatePropertiesFile();
29+
createProject();
3530
executeGenerateJavaTask();
3631
verifyProject();
3732
}

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoAnnotationsTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
2626
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
2727
"insert into PERSON values (1, 'foo')"
2828
});
29-
assertTrue(getProjectDir().exists());
30-
createGradleProject();
31-
editGradleBuildFile();
32-
editGradlePropertiesFile();
33-
createDatabase();
34-
createHibernatePropertiesFile();
29+
createProject();
3530
executeGenerateJavaTask();
3631
verifyProject();
3732
}

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/NoGenerics.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
2626
"create table ITEM (ID int not null, NAME varchar(20), OWNER_ID int not null, " +
2727
" primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
2828
});
29-
assertTrue(getProjectDir().exists());
30-
createGradleProject();
31-
editGradleBuildFile();
32-
editGradlePropertiesFile();
33-
createDatabase();
34-
createHibernatePropertiesFile();
29+
createProject();
3530
executeGenerateJavaTask();
3631
verifyProject();
3732
}

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/java/UseGenerics.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
2626
"create table ITEM (ID int not null, NAME varchar(20), OWNER_ID int not null, " +
2727
" primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
2828
});
29-
assertTrue(getProjectDir().exists());
30-
createGradleProject();
31-
editGradleBuildFile();
32-
editGradlePropertiesFile();
33-
createDatabase();
34-
createHibernatePropertiesFile();
29+
createProject();
3530
executeGenerateJavaTask();
3631
verifyProject();
3732
}

gradle/plugin/src/functionalTest/java/org/hibernate/tool/gradle/tutorial/TutorialTest.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ public void testTutorial() throws Exception {
2626
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
2727
"insert into PERSON values (1, 'foo')"
2828
});
29-
assertTrue(getProjectDir().exists());
30-
createGradleProject();
31-
editGradleBuildFile();
32-
editGradlePropertiesFile();
33-
createDatabase();
34-
createHibernatePropertiesFile();
29+
createProject();
3530
executeGenerateJavaTask();
3631
verifyProject();
3732
}

gradle/plugin/src/functionalTest/java/org/hibernate/tool/it/gradle/TestTemplate.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,15 @@ public class TestTemplate {
3939
protected String[] getDatabaseCreationScript() { return databaseCreationScript; }
4040
protected void setDatabaseCreationScript(String[] script) { databaseCreationScript = script; }
4141

42-
protected void createGradleProject() throws Exception {
42+
protected void createProject() throws Exception {
43+
initGradleProject();
44+
editGradleBuildFile();
45+
editGradlePropertiesFile();
46+
createDatabase();
47+
createHibernatePropertiesFile();
48+
}
49+
50+
protected void initGradleProject() throws Exception {
4351
GradleRunner runner = GradleRunner.create();
4452
runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS);
4553
runner.forwardOutput();

0 commit comments

Comments
 (0)