Skip to content

Commit 2476fe8

Browse files
committed
HBX-3080: Refactor the Gradle integration tests to factor out common code
- Adapt test 'TutorialTest' to be aligned with the tests from 'GenerateJavaTest' - Remove unused imports Signed-off-by: Koen Aers <[email protected]>
1 parent 35869d5 commit 2476fe8

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
package org.hibernate.tool.gradle;
22

33
import static org.junit.jupiter.api.Assertions.assertEquals;
4-
import static org.junit.jupiter.api.Assertions.assertFalse;
54
import static org.junit.jupiter.api.Assertions.assertTrue;
65

76
import java.io.File;
87

9-
import org.gradle.testkit.runner.BuildResult;
10-
import org.gradle.testkit.runner.GradleRunner;
8+
import org.junit.jupiter.api.BeforeEach;
119
import org.junit.jupiter.api.Test;
1210

1311
import org.hibernate.tool.it.gradle.TestTemplate;
1412

1513
public class TutorialTest extends TestTemplate {
14+
15+
@BeforeEach
16+
public void beforeEach() {
17+
setGradleCommandToExecute("generateJava");
18+
setDatabaseCreationScript(new String[] {
19+
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"
20+
});
21+
}
1622

1723
@Test
1824
public void testTutorial() throws Exception {
19-
setDatabaseCreationScript(new String[] {
20-
"create table PERSON (ID int not null, NAME varchar(20), primary key (ID))",
21-
"insert into PERSON values (1, 'foo')"
22-
});
23-
createProject();
24-
executeGradleCommand("generateJava");
25+
createProjectAndExecuteGradleCommand();
2526
File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
2627
assertTrue(generatedOutputFolder.exists());
2728
assertTrue(generatedOutputFolder.isDirectory());

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.sql.Connection;
99
import java.sql.DriverManager;
1010
import java.sql.Statement;
11-
import java.util.List;
1211

1312
import org.junit.jupiter.api.io.TempDir;
1413

0 commit comments

Comments
 (0)