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

spring-core provides custom variant of Commons Logging

Browse Source 
Includes dependency updates (JavaMail 1.6 RC1, RxJava 2.0.8, Tomcat 8.5.13, Undertow 1.4.12, XNIO 3.4.5)

Issue: SPR-14512
This commit is contained in:
Juergen Hoeller
2017-04-05 21:22:44 +02:00
parent e83fdaa2dd
commit 47277f43da
5 changed files with 804 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2016 the original author or authors.
* Copyright 2002-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -51,10 +51,8 @@ public class PathMatchingResourcePatternResolverTests {
private static final String[] TEST_CLASSES_IN_CORE_IO_SUPPORT =
new String[] {"PathMatchingResourcePatternResolverTests.class"};
private static final String[] CLASSES_IN_COMMONSLOGGING =
new String[] {"Log.class", "LogConfigurationException.class", "LogFactory.class",
"LogFactory$1.class", "LogFactory$2.class", "LogFactory$3.class", "LogFactory$4.class",
"LogFactory$5.class", "LogFactory$6.class", "LogSource.class"};
private static final String[] CLASSES_IN_REACTIVESTREAMS =
new String[] {"Processor.class", "Publisher.class", "Subscriber.class", "Subscription.class"};
private PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
@@ -74,9 +72,9 @@ public class PathMatchingResourcePatternResolverTests {
@Test
public void singleResourceInJar() throws IOException {
Resource[] resources = resolver.getResources("org/apache/commons/logging/Log.class");
Resource[] resources = resolver.getResources("org/reactivestreams/Publisher.class");
assertEquals(1, resources.length);
assertProtocolAndFilenames(resources, "jar", "Log.class");
assertProtocolAndFilenames(resources, "jar", "Publisher.class");
}
@Ignore // passes under Eclipse, fails under Ant
@@ -98,14 +96,14 @@ public class PathMatchingResourcePatternResolverTests {
@Test
public void classpathWithPatternInJar() throws IOException {
Resource[] resources = resolver.getResources("classpath:org/apache/commons/logging/*.class");
assertProtocolAndFilenames(resources, "jar", CLASSES_IN_COMMONSLOGGING);
Resource[] resources = resolver.getResources("classpath:org/reactivestreams/*.class");
assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTIVESTREAMS);
}
@Test
public void classpathStartWithPatternInJar() throws IOException {
Resource[] resources = resolver.getResources("classpath*:org/apache/commons/logging/*.class");
assertProtocolAndFilenames(resources, "jar", CLASSES_IN_COMMONSLOGGING);
public void classpathStarWithPatternInJar() throws IOException {
Resource[] resources = resolver.getResources("classpath*:org/reactivestreams/*.class");
assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTIVESTREAMS);
}
@Test