Skip to content

Commit 48657e7

Browse files
committed
HBX-3080: Refactor the Gradle integration tests to factor out common code
- Make 'GenerateCfgTest' extend 'TestTemplate' - Rewrite 'GenerateCfgTest#testGenerateCfg()' to account for new superclass Signed-off-by: Koen Aers <[email protected]>
1 parent 7daae9d commit 48657e7

File tree

1 file changed

+23
-27
lines changed

1 file changed

+23
-27
lines changed

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

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,32 @@
2020
import static org.junit.jupiter.api.Assertions.assertTrue;
2121

2222
import java.io.File;
23-
import java.io.IOException;
2423
import java.nio.file.Files;
2524

26-
import org.gradle.testkit.runner.BuildResult;
27-
import org.hibernate.tool.gradle.test.func.utils.FuncTestConstants;
28-
import org.hibernate.tool.gradle.test.func.utils.FuncTestTemplate;
25+
import org.hibernate.tool.it.gradle.TestTemplate;
26+
import org.junit.jupiter.api.BeforeEach;
2927
import org.junit.jupiter.api.Test;
3028

31-
class GenerateCfgTest extends FuncTestTemplate implements FuncTestConstants {
29+
class GenerateCfgTest extends TestTemplate {
3230

33-
@Test
34-
void testGenerateCfg() throws IOException {
35-
performTask("generateCfg", true);
36-
}
37-
38-
@Override
39-
public void verifyBuild(BuildResult buildResult) {
40-
try {
41-
File generatedSourcesFolder = new File(projectDir, "generated-sources");
42-
assertTrue(buildResult.getOutput().contains("Starting CFG export to directory: " + generatedSourcesFolder.getCanonicalPath()));
43-
assertTrue(generatedSourcesFolder.exists());
44-
assertTrue(generatedSourcesFolder.isDirectory());
45-
File cfgFile = new File(generatedSourcesFolder, "hibernate.cfg.xml");
46-
assertTrue(cfgFile.exists());
47-
assertTrue(cfgFile.isFile());
48-
String cfgContents = Files.readString(cfgFile.toPath());
49-
assertTrue(cfgContents.contains("<mapping resource=\"Foo.hbm.xml\"/>"));
50-
} catch (Exception e) {
51-
throw new RuntimeException(e);
52-
}
53-
}
31+
@BeforeEach
32+
public void beforeEach() {
33+
setGradleTaskToPerform("generateCfg");
34+
setDatabaseCreationScript(new String[] {
35+
"create table FOO (ID int not null, BAR varchar(20), primary key (ID))"
36+
});
37+
}
5438

55-
}
39+
@Test
40+
void testGenerateCfg() throws Exception {
41+
createProjectAndExecuteGradleCommand();
42+
File generatedSourcesFolder = new File(getProjectDir(), "app/generated-sources");
43+
assertTrue(getBuildResult().getOutput().contains("Starting CFG export to directory: "));
44+
File cfgFile = new File(generatedSourcesFolder, "hibernate.cfg.xml");
45+
assertTrue(cfgFile.exists());
46+
assertTrue(cfgFile.isFile());
47+
String cfgContents = Files.readString(cfgFile.toPath());
48+
assertTrue(cfgContents.contains("<mapping resource=\"Foo.hbm.xml\"/>"));
49+
}
50+
51+
}

0 commit comments

Comments
 (0)