Skip to content

Commit c8f430e

Browse files
committed
Change package used to test path matching
The org.reactivestreams has 13 instead of 4 classes in 1.0.3 with the addition of Java 9 Flow adapters. This commit switches to using a different package reactor.util.annotation, also with a small number of classes, for this test.
1 parent 57d9b92 commit c8f430e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ class PathMatchingResourcePatternResolverTests {
5353
private static final String[] TEST_CLASSES_IN_CORE_IO_SUPPORT =
5454
new String[] {"PathMatchingResourcePatternResolverTests.class"};
5555

56-
private static final String[] CLASSES_IN_REACTIVESTREAMS =
57-
new String[] {"Processor.class", "Publisher.class", "Subscriber.class", "Subscription.class"};
56+
private static final String[] CLASSES_IN_REACTOR_UTIL_ANNOTATIONS =
57+
new String[] {"NonNull.class", "NonNullApi.class", "Nullable.class"};
5858

5959
private PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
6060

@@ -106,14 +106,14 @@ void getResourcesOnFileSystemContainingHashtagsInTheirFileNames() throws IOExcep
106106

107107
@Test
108108
void classpathWithPatternInJar() throws IOException {
109-
Resource[] resources = resolver.getResources("classpath:org/reactivestreams/*.class");
110-
assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTIVESTREAMS);
109+
Resource[] resources = resolver.getResources("classpath:reactor/util/annotation/*.class");
110+
assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTOR_UTIL_ANNOTATIONS);
111111
}
112112

113113
@Test
114114
void classpathStarWithPatternInJar() throws IOException {
115-
Resource[] resources = resolver.getResources("classpath*:org/reactivestreams/*.class");
116-
assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTIVESTREAMS);
115+
Resource[] resources = resolver.getResources("classpath*:reactor/util/annotation/*.class");
116+
assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTOR_UTIL_ANNOTATIONS);
117117
}
118118

119119
@Test

0 commit comments

Comments
 (0)