Skip to content

Commit 91b4aca

Browse files
koentsjekoentsje
committed
HBX-3080: Refactor the Gradle integration tests to factor out common code
 - Pull up instance variable 'databaseFile' to class TestTemplate Signed-off-by: Koen Aers <[email protected]>
1 parent d431db0 commit 91b4aca

File tree

6 files changed

+24
-31
lines changed

6 files changed

+24
-31
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ public class JpaDefaultTest extends TestTemplate {
2323
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
2424
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
2525

26-
private File databaseFile;
27-
2826
@Test
2927
public void testTutorial() throws Exception {
3028
assertTrue(getProjectDir().exists());
@@ -62,8 +60,8 @@ private void createGradleProject() throws Exception {
6260
setGradleBuildFile(new File(appDir, "build.gradle"));
6361
assertTrue(getGradleBuildFile().exists());
6462
assertTrue(getGradleBuildFile().isFile());
65-
databaseFile = new File(getProjectDir(), "database/test.mv.db");
66-
assertFalse(databaseFile.exists());
63+
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
64+
assertFalse(getDatabaseFile().exists());
6765
}
6866

6967
private void editGradleBuildFile() throws Exception {
@@ -93,8 +91,8 @@ private void createDatabase() throws Exception {
9391
statement.execute("insert into PERSON values (1, 'foo')");
9492
statement.close();
9593
connection.close();
96-
assertTrue(databaseFile.exists());
97-
assertTrue(databaseFile.isFile());
94+
assertTrue(getDatabaseFile().exists());
95+
assertTrue(getDatabaseFile().isFile());
9896
}
9997

10098
private void createHibernatePropertiesFile() throws Exception {

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ public class NoAnnotationsTest extends TestTemplate {
2323
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
2424
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
2525

26-
private File databaseFile;
27-
2826
@Test
2927
public void testTutorial() throws Exception {
3028
assertTrue(getProjectDir().exists());
@@ -62,8 +60,8 @@ private void createGradleProject() throws Exception {
6260
setGradleBuildFile(new File(appDir, "build.gradle"));
6361
assertTrue(getGradleBuildFile().exists());
6462
assertTrue(getGradleBuildFile().isFile());
65-
databaseFile = new File(getProjectDir(), "database/test.mv.db");
66-
assertFalse(databaseFile.exists());
63+
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
64+
assertFalse(getDatabaseFile().exists());
6765
}
6866

6967
private void editGradleBuildFile() throws Exception {
@@ -94,8 +92,8 @@ private void createDatabase() throws Exception {
9492
statement.execute("insert into PERSON values (1, 'foo')");
9593
statement.close();
9694
connection.close();
97-
assertTrue(databaseFile.exists());
98-
assertTrue(databaseFile.isFile());
95+
assertTrue(getDatabaseFile().exists());
96+
assertTrue(getDatabaseFile().isFile());
9997
}
10098

10199
private void createHibernatePropertiesFile() throws Exception {

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ public class NoGenerics extends TestTemplate {
2222
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
2323
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
2424

25-
private File databaseFile;
26-
2725
@Test
2826
public void testTutorial() throws Exception {
2927
assertTrue(getProjectDir().exists());
@@ -52,8 +50,8 @@ private void createGradleProject() throws Exception {
5250
setGradleBuildFile(new File(appDir, "build.gradle"));
5351
assertTrue(getGradleBuildFile().exists());
5452
assertTrue(getGradleBuildFile().isFile());
55-
databaseFile = new File(getProjectDir(), "database/test.mv.db");
56-
assertFalse(databaseFile.exists());
53+
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
54+
assertFalse(getDatabaseFile().exists());
5755
}
5856

5957
private void editGradleBuildFile() throws Exception {
@@ -88,8 +86,8 @@ private void createDatabase() throws Exception {
8886
statement.execute(CREATE_ITEM_TABLE);
8987
statement.close();
9088
connection.close();
91-
assertTrue(databaseFile.exists());
92-
assertTrue(databaseFile.isFile());
89+
assertTrue(getDatabaseFile().exists());
90+
assertTrue(getDatabaseFile().isFile());
9391
}
9492

9593
private void createHibernatePropertiesFile() throws Exception {

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ public class UseGenerics extends TestTemplate {
2222
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
2323
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
2424

25-
private File databaseFile;
26-
2725
@Test
2826
public void testTutorial() throws Exception {
2927
assertTrue(getProjectDir().exists());
@@ -52,8 +50,8 @@ private void createGradleProject() throws Exception {
5250
setGradleBuildFile(new File(appDir, "build.gradle"));
5351
assertTrue(getGradleBuildFile().exists());
5452
assertTrue(getGradleBuildFile().isFile());
55-
databaseFile = new File(getProjectDir(), "database/test.mv.db");
56-
assertFalse(databaseFile.exists());
53+
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
54+
assertFalse(getDatabaseFile().exists());
5755
}
5856

5957
private void editGradleBuildFile() throws Exception {
@@ -87,8 +85,8 @@ private void createDatabase() throws Exception {
8785
statement.execute(CREATE_ITEM_TABLE);
8886
statement.close();
8987
connection.close();
90-
assertTrue(databaseFile.exists());
91-
assertTrue(databaseFile.isFile());
88+
assertTrue(getDatabaseFile().exists());
89+
assertTrue(getDatabaseFile().isFile());
9290
}
9391

9492
private void createHibernatePropertiesFile() throws Exception {

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ public class TutorialTest extends TestTemplate {
2222

2323
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
2424
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
25-
26-
private File databaseFile;
27-
25+
2826
@Test
2927
public void testTutorial() throws Exception {
3028
assertTrue(getProjectDir().exists());
@@ -62,8 +60,8 @@ private void createGradleProject() throws Exception {
6260
setGradleBuildFile(new File(appDir, "build.gradle"));
6361
assertTrue(getGradleBuildFile().exists());
6462
assertTrue(getGradleBuildFile().isFile());
65-
databaseFile = new File(getProjectDir(), "database/test.mv.db");
66-
assertFalse(databaseFile.exists());
63+
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
64+
assertFalse(getDatabaseFile().exists());
6765
}
6866

6967
private void editGradleBuildFile() throws Exception {
@@ -93,8 +91,8 @@ private void createDatabase() throws Exception {
9391
statement.execute("insert into PERSON values (1, 'foo')");
9492
statement.close();
9593
connection.close();
96-
assertTrue(databaseFile.exists());
97-
assertTrue(databaseFile.isFile());
94+
assertTrue(getDatabaseFile().exists());
95+
assertTrue(getDatabaseFile().isFile());
9896
}
9997

10098
private void createHibernatePropertiesFile() throws Exception {

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ public class TestTemplate {
1111

1212
private File gradlePropertiesFile;
1313
private File gradleBuildFile;
14+
private File databaseFile;
1415

1516
protected File getProjectDir() { return projectDir; }
1617
protected File getGradlePropertiesFile() { return gradlePropertiesFile; }
1718
protected void setGradlePropertiesFile(File f) { this.gradlePropertiesFile = f; }
1819
protected File getGradleBuildFile() { return gradleBuildFile; }
1920
protected void setGradleBuildFile(File f) { gradleBuildFile = f; }
21+
protected File getDatabaseFile() { return databaseFile; }
22+
protected void setDatabaseFile(File f) { databaseFile = f; }
2023

2124
}

0 commit comments

Comments
 (0)