mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Remove tests that rely on an unpredictable order of repackaged libs
See gh-27436
This commit is contained in:
parent
40a9c4d90f
commit
f386ebe61d
@ -396,19 +396,6 @@ class JarIntegrationTests extends AbstractArchiveIntegrationTests {
|
||||
return jarHash.get();
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void whenJarIsRepackagedWithDefaultsThenLibrariesAreNotSorted(MavenBuild mavenBuild) throws InterruptedException {
|
||||
mavenBuild.project("jar").execute((project) -> {
|
||||
File repackaged = new File(project, "target/jar-0.0.1.BUILD-SNAPSHOT.jar");
|
||||
List<String> unsortedLibs = Arrays.asList("BOOT-INF/lib/spring-context", "BOOT-INF/lib/spring-aop",
|
||||
"BOOT-INF/lib/spring-beans", "BOOT-INF/lib/spring-core", "BOOT-INF/lib/spring-jcl",
|
||||
"BOOT-INF/lib/spring-expression", "BOOT-INF/lib/jakarta.servlet-api",
|
||||
"BOOT-INF/lib/spring-boot-jarmode-layertools");
|
||||
assertThat(jar(repackaged)).entryNamesInPath("BOOT-INF/lib/").zipSatisfy(unsortedLibs,
|
||||
(String jarLib, String expectedLib) -> assertThat(jarLib).startsWith(expectedLib));
|
||||
});
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void whenJarIsRepackagedWithOutputTimestampConfiguredThenLibrariesAreSorted(MavenBuild mavenBuild)
|
||||
throws InterruptedException {
|
||||
|
@ -112,18 +112,6 @@ class WarIntegrationTests extends AbstractArchiveIntegrationTests {
|
||||
return warHash.get();
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void whenWarIsRepackagedWithDefaultsThenLibrariesAreNotSorted(MavenBuild mavenBuild) throws InterruptedException {
|
||||
mavenBuild.project("war").execute((project) -> {
|
||||
File repackaged = new File(project, "target/war-0.0.1.BUILD-SNAPSHOT.war");
|
||||
List<String> unsortedLibs = Arrays.asList("WEB-INF/lib/spring-aop", "WEB-INF/lib/spring-beans",
|
||||
"WEB-INF/lib/spring-expression", "WEB-INF/lib/spring-context", "WEB-INF/lib/spring-core",
|
||||
"WEB-INF/lib/spring-jcl", "WEB-INF/lib/spring-boot-jarmode-layertools");
|
||||
assertThat(jar(repackaged)).entryNamesInPath("WEB-INF/lib/").zipSatisfy(unsortedLibs,
|
||||
(String jarLib, String expectedLib) -> assertThat(jarLib).startsWith(expectedLib));
|
||||
});
|
||||
}
|
||||
|
||||
@TestTemplate
|
||||
void whenWarIsRepackagedWithOutputTimestampConfiguredThenLibrariesAreSorted(MavenBuild mavenBuild)
|
||||
throws InterruptedException {
|
||||
|
Loading…
Reference in New Issue
Block a user