You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2017/03/01 10:29:31 UTC
svn commit: r1784908 - in /sling/trunk/bundles/extensions/validation/core:
pom.xml
src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java
Author: kwin
Date: Wed Mar 1 10:29:30 2017
New Revision: 1784908
URL: http://svn.apache.org/viewvc?rev=1784908&view=rev
Log:
SLING-6579 leverage commons collections4 (only in tests)
Modified:
sling/trunk/bundles/extensions/validation/core/pom.xml
sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java
Modified: sling/trunk/bundles/extensions/validation/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/pom.xml?rev=1784908&r1=1784907&r2=1784908&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/pom.xml (original)
+++ sling/trunk/bundles/extensions/validation/core/pom.xml Wed Mar 1 10:29:30 2017
@@ -222,6 +222,12 @@
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.1</version>
+ <scope>test</scope>
+ </dependency>
<!-- Apache Felix -->
<dependency>
Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java?rev=1784908&r1=1784907&r2=1784908&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/ValidationModelRetrieverImplTest.java Wed Mar 1 10:29:30 2017
@@ -27,8 +27,8 @@ import java.util.Map;
import javax.annotation.Nonnull;
-import org.apache.commons.collections.MultiMap;
-import org.apache.commons.collections.map.MultiValueMap;
+import org.apache.commons.collections4.MultiValuedMap;
+import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.resource.ResourceResolverFactory;
@@ -57,7 +57,7 @@ public class ValidationModelRetrieverImp
private ValidationModelRetrieverImpl validationModelRetriever;
private Validator<?> dateValidator;
- private MultiMap applicablePathPerResourceType;
+ private MultiValuedMap<String, String> applicablePathPerResourceType;
private TestModelProvider modelProvider;
@Mock
@@ -123,7 +123,7 @@ public class ValidationModelRetrieverImp
@Before
public void setup() throws LoginException {
dateValidator = new DateValidator();
- applicablePathPerResourceType = new MultiValueMap();
+ applicablePathPerResourceType = new ArrayListValuedHashMap<>();
validationModelRetriever = new ValidationModelRetrieverImpl();
modelProvider = new TestModelProvider();
// service id must be set (even if service ranking is not set)
@@ -200,7 +200,10 @@ public class ValidationModelRetrieverImp
applicablePathPerResourceType.put("test/supertype", "/content/site1");
model = validationModelRetriever.getModel("test/type", "/content/site1", true);
Assert.assertNotNull(model);
- Assert.assertThat(model.getResourceProperties(), Matchers.containsInAnyOrder(new ResourcePropertyNameMatcher("test/type"), new ResourcePropertyNameMatcher("test/supertype")));
+ Collection<ResourcePropertyNameMatcher> matchers = new ArrayList<>();
+ matchers.add(new ResourcePropertyNameMatcher("test/type"));
+ matchers.add(new ResourcePropertyNameMatcher("test/supertype"));
+ Assert.assertThat(model.getResourceProperties(), Matchers.containsInAnyOrder(matchers));
}
@Test