Skip to content

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

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

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

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
11 changes: 5 additions & 6 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 @@ -23,7 +23,6 @@ public class JpaDefaultTest extends TestTemplate {
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");

private File gradlePropertiesFile;
private File gradleBuildFile;
private File databaseFile;

Expand Down Expand Up @@ -55,9 +54,9 @@ private void createGradleProject() throws Exception {
runner.withProjectDir(getProjectDir());
BuildResult buildResult = runner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
gradlePropertiesFile = new File(getProjectDir(), "gradle.properties");
assertTrue(gradlePropertiesFile.exists());
assertTrue(gradlePropertiesFile.isFile());
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
Expand All @@ -81,10 +80,10 @@ private void editGradlePropertiesFile() throws Exception {
// As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out
// in the gradle.properties file.
StringBuffer gradlePropertiesFileContents = new StringBuffer(
new String(Files.readAllBytes(gradlePropertiesFile.toPath())));
new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
gradlePropertiesFileContents.insert(pos, "#");
Files.writeString(gradlePropertiesFile.toPath(), gradlePropertiesFileContents.toString());
Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
}

private void createDatabase() throws Exception {
Expand Down
11 changes: 5 additions & 6 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 @@ -23,7 +23,6 @@ public class NoAnnotationsTest extends TestTemplate {
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");

private File gradlePropertiesFile;
private File gradleBuildFile;
private File databaseFile;

Expand Down Expand Up @@ -55,9 +54,9 @@ private void createGradleProject() throws Exception {
runner.withProjectDir(getProjectDir());
BuildResult buildResult = runner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
gradlePropertiesFile = new File(getProjectDir(), "gradle.properties");
assertTrue(gradlePropertiesFile.exists());
assertTrue(gradlePropertiesFile.isFile());
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
Expand All @@ -82,10 +81,10 @@ private void editGradlePropertiesFile() throws Exception {
// As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out
// in the gradle.properties file.
StringBuffer gradlePropertiesFileContents = new StringBuffer(
new String(Files.readAllBytes(gradlePropertiesFile.toPath())));
new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
gradlePropertiesFileContents.insert(pos, "#");
Files.writeString(gradlePropertiesFile.toPath(), gradlePropertiesFileContents.toString());
Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
}

private void createDatabase() throws Exception {
Expand Down
11 changes: 5 additions & 6 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 @@ -22,7 +22,6 @@ public class NoGenerics extends TestTemplate {
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");

private File gradlePropertiesFile;
private File gradleBuildFile;
private File databaseFile;

Expand All @@ -45,9 +44,9 @@ private void createGradleProject() throws Exception {
runner.withProjectDir(getProjectDir());
BuildResult buildResult = runner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
gradlePropertiesFile = new File(getProjectDir(), "gradle.properties");
assertTrue(gradlePropertiesFile.exists());
assertTrue(gradlePropertiesFile.isFile());
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
Expand All @@ -72,10 +71,10 @@ private void editGradlePropertiesFile() throws Exception {
// As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out
// in the gradle.properties file.
StringBuffer gradlePropertiesFileContents = new StringBuffer(
new String(Files.readAllBytes(gradlePropertiesFile.toPath())));
new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
gradlePropertiesFileContents.insert(pos, "#");
Files.writeString(gradlePropertiesFile.toPath(), gradlePropertiesFileContents.toString());
Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
}

private void createDatabase() throws Exception {
Expand Down
11 changes: 5 additions & 6 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 @@ -22,7 +22,6 @@ public class UseGenerics extends TestTemplate {
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");

private File gradlePropertiesFile;
private File gradleBuildFile;
private File databaseFile;

Expand All @@ -45,9 +44,9 @@ private void createGradleProject() throws Exception {
runner.withProjectDir(getProjectDir());
BuildResult buildResult = runner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
gradlePropertiesFile = new File(getProjectDir(), "gradle.properties");
assertTrue(gradlePropertiesFile.exists());
assertTrue(gradlePropertiesFile.isFile());
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
Expand All @@ -71,10 +70,10 @@ private void editGradlePropertiesFile() throws Exception {
// As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out
// in the gradle.properties file.
StringBuffer gradlePropertiesFileContents = new StringBuffer(
new String(Files.readAllBytes(gradlePropertiesFile.toPath())));
new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
gradlePropertiesFileContents.insert(pos, "#");
Files.writeString(gradlePropertiesFile.toPath(), gradlePropertiesFileContents.toString());
Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
}

private void createDatabase() throws Exception {
Expand Down
11 changes: 5 additions & 6 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 @@ -23,7 +23,6 @@ public class TutorialTest extends TestTemplate {
private static final List<String> GRADLE_INIT_PROJECT_ARGUMENTS = List.of(
"init", "--type", "java-application", "--dsl", "groovy", "--test-framework", "junit-jupiter", "--java-version", "17");

private File gradlePropertiesFile;
private File gradleBuildFile;
private File databaseFile;

Expand Down Expand Up @@ -55,9 +54,9 @@ private void createGradleProject() throws Exception {
runner.withProjectDir(getProjectDir());
BuildResult buildResult = runner.build();
assertTrue(buildResult.getOutput().contains("BUILD SUCCESSFUL"));
gradlePropertiesFile = new File(getProjectDir(), "gradle.properties");
assertTrue(gradlePropertiesFile.exists());
assertTrue(gradlePropertiesFile.isFile());
setGradlePropertiesFile(new File(getProjectDir(), "gradle.properties"));
assertTrue(getGradlePropertiesFile().exists());
assertTrue(getGradlePropertiesFile().isFile());
File appDir = new File(getProjectDir(), "app");
assertTrue(appDir.exists());
assertTrue(appDir.isDirectory());
Expand All @@ -81,10 +80,10 @@ private void editGradlePropertiesFile() throws Exception {
// As this is enabled by default when initializing a new Gradle project, the setting needs to be commented out
// in the gradle.properties file.
StringBuffer gradlePropertiesFileContents = new StringBuffer(
new String(Files.readAllBytes(gradlePropertiesFile.toPath())));
new String(Files.readAllBytes(getGradlePropertiesFile().toPath())));
int pos = gradlePropertiesFileContents.indexOf("org.gradle.configuration-cache=true");
gradlePropertiesFileContents.insert(pos, "#");
Files.writeString(gradlePropertiesFile.toPath(), gradlePropertiesFileContents.toString());
Files.writeString(getGradlePropertiesFile().toPath(), gradlePropertiesFileContents.toString());
}

private void createDatabase() throws Exception {
Expand Down
10 changes: 10 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
Expand Up @@ -9,8 +9,18 @@ public class TestTemplate {
@TempDir
private File projectDir;

private File gradlePropertiesFile;

protected File getProjectDir() {
return projectDir;
}

protected File getGradlePropertiesFile() {
return gradlePropertiesFile;
}

protected void setGradlePropertiesFile(File f) {
this.gradlePropertiesFile = f;
}

}