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

Framework build compatible with JDK 9 (tests running against java.base module)

Browse Source 
Issue: SPR-13344
This commit is contained in:
Juergen Hoeller
2016-07-19 19:37:34 +02:00
parent d07381e862
commit 88fcd0a2ed
11 changed files with 233 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java
View File

@@ -74,9 +74,9 @@ public class PathMatchingResourcePatternResolverTests {
@Test
public void singleResourceInJar() throws IOException {
Resource[] resources = resolver.getResources("java/net/URL.class");
Resource[] resources = resolver.getResources("org/apache/commons/logging/Log.class");
assertEquals(1, resources.length);
assertProtocolAndFilenames(resources, "jar", "URL.class");
assertProtocolAndFilenames(resources, "jar", "Log.class");
}
@Ignore // passes under Eclipse, fails under Ant
@@ -145,8 +145,7 @@ public class PathMatchingResourcePatternResolverTests {
assertEquals("Correct number of files found", filenames.length, resources.length);
for (Resource resource : resources) {
String actualProtocol = resource.getURL().getProtocol();
// resources from rt.jar get retrieved as jrt images on JDK 9, so let's simply accept that as a match too
assertTrue(actualProtocol.equals(protocol) || ("jar".equals(protocol) && "jrt".equals(actualProtocol)));
assertEquals(protocol, actualProtocol);
assertFilenameIn(resource, filenames);
}
}
@@ -154,7 +153,7 @@ public class PathMatchingResourcePatternResolverTests {
private void assertFilenameIn(Resource resource, String... filenames) {
String filename = resource.getFilename();
assertTrue(resource + " does not have a filename that matches any of the specified names",
Arrays.stream(filenames).anyMatch(filename::endsWith));
Arrays.stream(filenames).anyMatch(filename::endsWith));
}
}

1
spring-core/src/test/java/org/springframework/util/Base64UtilsTests.java
View File

@@ -74,7 +74,6 @@ public class Base64UtilsTests {
assertEquals(Base64Utils.encodeToString(bytes), DatatypeConverter.printBase64Binary(bytes));
assertArrayEquals(bytes, Base64Utils.decodeFromString(Base64Utils.encodeToString(bytes)));
assertArrayEquals(bytes, DatatypeConverter.parseBase64Binary(DatatypeConverter.printBase64Binary(bytes)));
}
@Test