SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates test for boot 2.5

Browse Source
This commit is contained in:
spencergibb
2021-03-25 16:51:32 -04:00
parent 457959f2a1
commit 89711993d0
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-cloud-commons/src/test/java/org/springframework/cloud/configuration/SpringBootDependencyTests.java
View File

@@ -173,11 +173,22 @@ public class SpringBootDependencyTests {
then(verificationResult.action).isEmpty();
}
// @Ignore // FIXME: https://github.com/spring-cloud/spring-cloud-commons/issues/717
@Test
public void should_match_against_current_manifest() {
verifyCurrentVersionFromManifest("2.4");
verifyCurrentVersionFromManifest("2.4.x");
try {
verifyCurrentVersionFromManifest("2.4");
verifyCurrentVersionFromManifest("2.4.x");
}
catch (AssertionError e) {
if (e.getMessage() != null && e.getMessage().contains("2.5.")) {
// we're likely running a boot 2.5 compatibility test, try 2.5
verifyCurrentVersionFromManifest("2.5");
verifyCurrentVersionFromManifest("2.5.x");
}
else {
throw e;
}
}
}
private void verifyCurrentVersionFromManifest(String version) {