From c8f430ee9188ad082bf76e5b05877d00bafe1a82 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 4 Sep 2019 10:37:57 +0100 Subject: [PATCH] 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. --- .../PathMatchingResourcePatternResolverTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java index e5821acebb..41db4dcff5 100644 --- a/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java @@ -53,8 +53,8 @@ class PathMatchingResourcePatternResolverTests { private static final String[] TEST_CLASSES_IN_CORE_IO_SUPPORT = new String[] {"PathMatchingResourcePatternResolverTests.class"}; - private static final String[] CLASSES_IN_REACTIVESTREAMS = - new String[] {"Processor.class", "Publisher.class", "Subscriber.class", "Subscription.class"}; + private static final String[] CLASSES_IN_REACTOR_UTIL_ANNOTATIONS = + new String[] {"NonNull.class", "NonNullApi.class", "Nullable.class"}; private PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); @@ -106,14 +106,14 @@ class PathMatchingResourcePatternResolverTests { @Test void classpathWithPatternInJar() throws IOException { - Resource[] resources = resolver.getResources("classpath:org/reactivestreams/*.class"); - assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTIVESTREAMS); + Resource[] resources = resolver.getResources("classpath:reactor/util/annotation/*.class"); + assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTOR_UTIL_ANNOTATIONS); } @Test void classpathStarWithPatternInJar() throws IOException { - Resource[] resources = resolver.getResources("classpath*:org/reactivestreams/*.class"); - assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTIVESTREAMS); + Resource[] resources = resolver.getResources("classpath*:reactor/util/annotation/*.class"); + assertProtocolAndFilenames(resources, "jar", CLASSES_IN_REACTOR_UTIL_ANNOTATIONS); } @Test