Skip to content

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

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

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

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
20 changes: 0 additions & 20 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 @@ -41,26 +41,6 @@ private void verifyDatabase() throws Exception {
assertEquals("foo", resultSet.getString(2));
}

private void createGradleProject() 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"));
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
setGradleBuildFile(new File(appDir, "build.gradle"));
assertTrue(getGradleBuildFile().exists());
assertTrue(getGradleBuildFile().isFile());
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
assertFalse(getDatabaseFile().exists());
}

private void editGradleBuildFile() throws Exception {
StringBuffer gradleBuildFileContents = new StringBuffer(
new String(Files.readAllBytes(getGradleBuildFile().toPath())));
Expand Down
20 changes: 0 additions & 20 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 @@ -41,26 +41,6 @@ private void verifyDatabase() throws Exception {
assertEquals("foo", resultSet.getString(2));
}

private void createGradleProject() 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"));
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
setGradleBuildFile(new File(appDir, "build.gradle"));
assertTrue(getGradleBuildFile().exists());
assertTrue(getGradleBuildFile().isFile());
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
assertFalse(getDatabaseFile().exists());
}

private void editGradleBuildFile() throws Exception {
StringBuffer gradleBuildFileContents = new StringBuffer(
new String(Files.readAllBytes(getGradleBuildFile().toPath())));
Expand Down
20 changes: 0 additions & 20 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 @@ -31,26 +31,6 @@ public void testTutorial() throws Exception {
verifyProject();
}

private void createGradleProject() 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"));
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
setGradleBuildFile(new File(appDir, "build.gradle"));
assertTrue(getGradleBuildFile().exists());
assertTrue(getGradleBuildFile().isFile());
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
assertFalse(getDatabaseFile().exists());
}

private void editGradleBuildFile() throws Exception {
StringBuffer gradleBuildFileContents = new StringBuffer(
new String(Files.readAllBytes(getGradleBuildFile().toPath())));
Expand Down
20 changes: 0 additions & 20 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 @@ -31,26 +31,6 @@ public void testTutorial() throws Exception {
verifyProject();
}

private void createGradleProject() 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"));
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
setGradleBuildFile(new File(appDir, "build.gradle"));
assertTrue(getGradleBuildFile().exists());
assertTrue(getGradleBuildFile().isFile());
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
assertFalse(getDatabaseFile().exists());
}

private void editGradleBuildFile() throws Exception {
StringBuffer gradleBuildFileContents = new StringBuffer(
new String(Files.readAllBytes(getGradleBuildFile().toPath())));
Expand Down
20 changes: 0 additions & 20 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 @@ -41,26 +41,6 @@ private void verifyDatabase() throws Exception {
assertEquals("foo", resultSet.getString(2));
}

private void createGradleProject() 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"));
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
setGradleBuildFile(new File(appDir, "build.gradle"));
assertTrue(getGradleBuildFile().exists());
assertTrue(getGradleBuildFile().isFile());
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
assertFalse(getDatabaseFile().exists());
}

private void editGradleBuildFile() throws Exception {
StringBuffer gradleBuildFileContents = new StringBuffer(
new String(Files.readAllBytes(getGradleBuildFile().toPath())));
Expand Down
26 changes: 26 additions & 0 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
@@ -1,10 +1,16 @@
package org.hibernate.tool.it.gradle;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.io.File;
import java.util.List;

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

import org.gradle.testkit.runner.BuildResult;
import org.gradle.testkit.runner.GradleRunner;

public class TestTemplate {

protected static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
Expand All @@ -25,6 +31,26 @@ public class TestTemplate {
protected File getDatabaseFile() { return databaseFile; }
protected void setDatabaseFile(File f) { databaseFile = f; }

protected void createGradleProject() 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"));
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
setGradleBuildFile(new File(appDir, "build.gradle"));
assertTrue(getGradleBuildFile().exists());
assertTrue(getGradleBuildFile().isFile());
setDatabaseFile(new File(getProjectDir(), "database/test.mv.db"));
assertFalse(getDatabaseFile().exists());
}

protected String constructH2DatabaseDependencyLine() {
return " implementation 'com.h2database:h2:" + System.getenv("H2_VERSION") + "'";
}
Expand Down