Skip to content

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

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 30, 2025
Merged

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

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
12 changes: 1 addition & 11 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 @@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
"insert into PERSON values (1, 'foo')"
});
createProject();
executeGenerateJavaTask();
executeGradleCommand("generateJava");
verifyProject();
}

private void executeGenerateJavaTask() throws Exception {
GradleRunner gradleRunner = GradleRunner.create();
gradleRunner.forwardOutput();
gradleRunner.withProjectDir(getProjectDir());
gradleRunner.withPluginClasspath();
gradleRunner.withArguments("generateJava");
BuildResult buildResult = gradleRunner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
}

private void verifyProject() throws Exception {
File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
assertTrue(generatedOutputFolder.exists());
Expand Down
12 changes: 1 addition & 11 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 @@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
"insert into PERSON values (1, 'foo')"
});
createProject();
executeGenerateJavaTask();
executeGradleCommand("generateJava");
verifyProject();
}

private void executeGenerateJavaTask() throws Exception {
GradleRunner gradleRunner = GradleRunner.create();
gradleRunner.forwardOutput();
gradleRunner.withProjectDir(getProjectDir());
gradleRunner.withPluginClasspath();
gradleRunner.withArguments("generateJava");
BuildResult buildResult = gradleRunner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
}

private void verifyProject() throws Exception {
File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
assertTrue(generatedOutputFolder.exists());
Expand Down
12 changes: 1 addition & 11 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 @@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
" primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
});
createProject();
executeGenerateJavaTask();
executeGradleCommand("generateJava");
verifyProject();
}

private void executeGenerateJavaTask() throws Exception {
GradleRunner gradleRunner = GradleRunner.create();
gradleRunner.forwardOutput();
gradleRunner.withProjectDir(getProjectDir());
gradleRunner.withPluginClasspath();
gradleRunner.withArguments("generateJava");
BuildResult buildResult = gradleRunner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
}

private void verifyProject() throws Exception {
File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
assertTrue(generatedOutputFolder.exists());
Expand Down
12 changes: 1 addition & 11 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 @@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
" primary key (ID), foreign key (OWNER_ID) references PERSON(ID))"
});
createProject();
executeGenerateJavaTask();
executeGradleCommand("generateJava");
verifyProject();
}

private void executeGenerateJavaTask() throws Exception {
GradleRunner gradleRunner = GradleRunner.create();
gradleRunner.forwardOutput();
gradleRunner.withProjectDir(getProjectDir());
gradleRunner.withPluginClasspath();
gradleRunner.withArguments("generateJava");
BuildResult buildResult = gradleRunner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
}

private void verifyProject() throws Exception {
File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
assertTrue(generatedOutputFolder.exists());
Expand Down
12 changes: 1 addition & 11 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 @@ -27,20 +27,10 @@ public void testTutorial() throws Exception {
"insert into PERSON values (1, 'foo')"
});
createProject();
executeGenerateJavaTask();
executeGradleCommand("generateJava");
verifyProject();
}

private void executeGenerateJavaTask() throws Exception {
GradleRunner gradleRunner = GradleRunner.create();
gradleRunner.forwardOutput();
gradleRunner.withProjectDir(getProjectDir());
gradleRunner.withPluginClasspath();
gradleRunner.withArguments("generateJava");
BuildResult buildResult = gradleRunner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
}

private void verifyProject() {
File generatedOutputFolder = new File(getProjectDir(), "app/generated-sources");
assertTrue(generatedOutputFolder.exists());
Expand Down
21 changes: 13 additions & 8 deletions 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 @@ -17,8 +17,8 @@

public class TestTemplate {

protected static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");
protected static final String[] GRADLE_INIT_PROJECT_ARGUMENTS = new String[] {
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17"};

@TempDir
private File projectDir;
Expand All @@ -39,6 +39,16 @@ public class TestTemplate {
protected String[] getDatabaseCreationScript() { return databaseCreationScript; }
protected void setDatabaseCreationScript(String[] script) { databaseCreationScript = script; }

protected void executeGradleCommand(String ... gradleCommandLine) {
GradleRunner runner = GradleRunner.create();
runner.withArguments(gradleCommandLine);
runner.forwardOutput();
runner.withPluginClasspath();
runner.withProjectDir(getProjectDir());
BuildResult buildResult = runner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
}

protected void createProject() throws Exception {
initGradleProject();
editGradleBuildFile();
Expand All @@ -48,12 +58,7 @@ protected void createProject() throws Exception {
}

protected void initGradleProject() throws Exception {
GradleRunner runner = GradleRunner.create();
runner.withArguments(GRADLE_INIT_PROJECT_ARGUMENTS);
runner.forwardOutput();
runner.withProjectDir(getProjectDir());
BuildResult buildResult = runner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
executeGradleCommand(GRADLE_INIT_PROJECT_ARGUMENTS);
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
Expand Down