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/16 12:35:46 UTC
svn commit: r1787170 - /sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java

Author: kwin
Date: Thu Mar 16 12:35:46 2017
New Revision: 1787170

URL: http://svn.apache.org/viewvc?rev=1787170&view=rev
Log:
fix tests

Modified:
    sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java

Modified: sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java?rev=1787170&r1=1787169&r2=1787170&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java (original)
+++ sling/trunk/bundles/extensions/validation/core/src/test/java/org/apache/sling/validation/impl/model/MergedValidationModelTest.java Thu Mar 16 12:35:46 2017
@@ -18,15 +18,11 @@
  */
 package org.apache.sling.validation.impl.model;
 
-import java.util.ArrayList;
-import java.util.Collection;
+import java.util.Arrays;
 
 import org.apache.sling.validation.impl.util.ChildResourceNameRegexMatcher;
 import org.apache.sling.validation.impl.util.ResourcePropertyNameRegexMatcher;
-import org.apache.sling.validation.model.ChildResource;
-import org.apache.sling.validation.model.ResourceProperty;
 import org.apache.sling.validation.model.ValidationModel;
-import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.junit.Assert;
 import org.junit.Before;
@@ -79,14 +75,12 @@ public class MergedValidationModelTest {
         modelBuilder.childResource(childResourceBuilder.nameRegex("originalNameNotOverwritten").build(
                 "nameNotOverwritten"));
         ValidationModel mergedModel = new MergedValidationModel(baseValidationModel, modelBuilder.build("superType", "some source"));
-        Collection<Matcher<ResourceProperty>> resourcePropertyMatchers = new ArrayList<>();
-        resourcePropertyMatchers.add(new ResourcePropertyNameRegexMatcher("overwrittenNameToOverwrite"));
-        resourcePropertyMatchers.add(new ResourcePropertyNameRegexMatcher("originalNameNotOverwritten"));
-        Assert.assertThat(mergedModel.getResourceProperties(), Matchers.containsInAnyOrder(resourcePropertyMatchers));
-        Collection<Matcher<ChildResource>> childMatchers = new ArrayList<>();
-        childMatchers.add(new ChildResourceNameRegexMatcher("overwrittenNameToOverwrite"));
-        childMatchers.add(new ChildResourceNameRegexMatcher("originalNameNotOverwritten"));
-        Assert.assertThat(mergedModel.getChildren(), Matchers.containsInAnyOrder(childMatchers));
+        Assert.assertThat(mergedModel.getResourceProperties(), Matchers.containsInAnyOrder(Arrays.asList(
+                new ResourcePropertyNameRegexMatcher("overwrittenNameToOverwrite"), 
+                new ResourcePropertyNameRegexMatcher("originalNameNotOverwritten"))));
+        Assert.assertThat(mergedModel.getChildren(), Matchers.containsInAnyOrder(Arrays.asList(
+                new ChildResourceNameRegexMatcher("overwrittenNameToOverwrite"), 
+                new ChildResourceNameRegexMatcher("originalNameNotOverwritten"))));
     }
 
     @Test