Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix system tests following repository updates

Browse Source 
See gh-42333
This commit is contained in:
Phillip Webb
2024-09-27 12:17:29 -07:00
parent 9836011ffd
commit c347ccaa76
3 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-boot-project/spring-boot-tools/spring-boot-gradle-test-support/src/main/java/org/springframework/boot/testsupport/gradle/testkit/GradleBuildExtension.java
View File

@@ -16,6 +16,7 @@
package org.springframework.boot.testsupport.gradle.testkit;
import java.io.File;
import java.lang.reflect.Field;
import java.net.URL;
import java.util.regex.Pattern;
@@ -25,6 +26,7 @@ import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.Extension;
import org.junit.jupiter.api.extension.ExtensionContext;
import org.springframework.util.Assert;
import org.springframework.util.ReflectionUtils;
/**
@@ -43,6 +45,7 @@ public class GradleBuildExtension implements BeforeEachCallback, AfterEachCallba
@Override
public void beforeEach(ExtensionContext context) throws Exception {
GradleBuild gradleBuild = extractGradleBuild(context);
gradleBuild.scriptProperty("parentRootDir", findParentRootDir().getAbsolutePath());
URL scriptUrl = findDefaultScript(context);
if (scriptUrl != null) {
gradleBuild.script(scriptUrl.getFile());
@@ -54,6 +57,22 @@ public class GradleBuildExtension implements BeforeEachCallback, AfterEachCallba
gradleBuild.before();
}
private File findParentRootDir() {
File dir = new File("").getAbsoluteFile();
int depth = 0;
while (dir != null && !hasGradleBuildFiles(dir)) {
Assert.state(depth++ < 5, "Unable to find parent root");
dir = dir.getParentFile();
}
Assert.state(dir != null, "Unable to find parent root");
return dir;
}
private boolean hasGradleBuildFiles(File dir) {
return new File(dir, "settings.gradle").exists() && new File(dir, "build.gradle").exists()
&& new File(dir, "gradle.properties").exists();
}
private GradleBuild extractGradleBuild(ExtensionContext context) throws Exception {
Object testInstance = context.getRequiredTestInstance();
Field gradleBuildField = ReflectionUtils.findField(testInstance.getClass(), "gradleBuild");