You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2015/09/16 11:35:51 UTC
svn commit: r1703373 - in /sling/trunk/testing/mocks:
sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/
sling-mock-oak/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/
sling-mock/src/test/java/o...
Author: sseifert
Date: Wed Sep 16 09:35:50 2015
New Revision: 1703373
URL: http://svn.apache.org/r1703373
Log:
SLING-5007 use same unit tests for root node tests for all resource resolver types without counting the number of children.
Modified:
sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
sling/trunk/testing/mocks/sling-mock-oak/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/SlingCrudResourceResolverTest.java
sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
Modified: sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java?rev=1703373&r1=1703372&r2=1703373&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/SlingCrudResourceResolverTest.java Wed Sep 16 09:35:50 2015
@@ -18,23 +18,17 @@
*/
package org.apache.sling.testing.mock.sling.jackrabbit.resource;
-import static org.junit.Assert.assertFalse;
-
import java.io.IOException;
-import java.util.List;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.testing.jcr.RepositoryUtil;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.resource.AbstractSlingCrudResourceResolverTest;
-import com.google.common.collect.Lists;
-
public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceResolverTest {
@Override
@@ -57,17 +51,5 @@ public class SlingCrudResourceResolverTe
return resolver;
}
-
- @Override
- public void testListChildren_RootNode() throws IOException {
- Resource resource1 = resourceResolver.getResource("/");
-
- // relax test conditions to check only for none-empty because in real repository multiple test notes may be created in parallel
- List<Resource> children = Lists.newArrayList(resource1.listChildren());
- assertFalse(children.isEmpty());
-
- children = Lists.newArrayList(resource1.getChildren());
- assertFalse(children.isEmpty());
- }
}
Modified: sling/trunk/testing/mocks/sling-mock-oak/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/SlingCrudResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/SlingCrudResourceResolverTest.java?rev=1703373&r1=1703372&r2=1703373&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-oak/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/SlingCrudResourceResolverTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock-oak/src/test/java/org/apache/sling/testing/mock/sling/oak/resource/SlingCrudResourceResolverTest.java Wed Sep 16 09:35:50 2015
@@ -18,23 +18,17 @@
*/
package org.apache.sling.testing.mock.sling.oak.resource;
-import static org.junit.Assert.assertFalse;
-
import java.io.IOException;
-import java.util.List;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.commons.testing.jcr.RepositoryUtil;
import org.apache.sling.testing.mock.sling.MockSling;
import org.apache.sling.testing.mock.sling.ResourceResolverType;
import org.apache.sling.testing.mock.sling.resource.AbstractSlingCrudResourceResolverTest;
-import com.google.common.collect.Lists;
-
public class SlingCrudResourceResolverTest extends AbstractSlingCrudResourceResolverTest {
@Override
@@ -58,16 +52,4 @@ public class SlingCrudResourceResolverTe
return resolver;
}
- @Override
- public void testListChildren_RootNode() throws IOException {
- Resource resource1 = resourceResolver.getResource("/");
-
- // relax test conditions to check only for none-empty because in real repository multiple test notes may be created in parallel
- List<Resource> children = Lists.newArrayList(resource1.listChildren());
- assertFalse(children.isEmpty());
-
- children = Lists.newArrayList(resource1.getChildren());
- assertFalse(children.isEmpty());
- }
-
}
Modified: sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java?rev=1703373&r1=1703372&r2=1703373&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java (original)
+++ sling/trunk/testing/mocks/sling-mock/src/test/java/org/apache/sling/testing/mock/sling/resource/AbstractSlingCrudResourceResolverTest.java Wed Sep 16 09:35:50 2015
@@ -20,7 +20,9 @@ package org.apache.sling.testing.mock.sl
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -32,6 +34,7 @@ import java.util.List;
import java.util.Map;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
@@ -115,12 +118,12 @@ public abstract class AbstractSlingCrudR
Map<String, Object> props = new HashMap<String, Object>();
props.put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED);
final Resource root = this.resourceResolver.getResource("/");
- if (getResourceResolverType() == ResourceResolverType.JCR_JACKRABBIT) {
- final Resource classRoot = this.resourceResolver.create(root, getClass().getSimpleName(), props);
- this.testRoot = this.resourceResolver.create(classRoot, System.currentTimeMillis() + "_"
- + (rootNodeCounter++), props);
- } else {
+ if (getResourceResolverType() == ResourceResolverType.JCR_MOCK
+ || getResourceResolverType() == ResourceResolverType.RESOURCERESOLVER_MOCK) {
this.testRoot = this.resourceResolver.create(root, "test", props);
+ } else {
+ this.testRoot = this.resourceResolver.create(root, getClass().getSimpleName() + "_"
+ + System.currentTimeMillis() + "_" + (rootNodeCounter++), props);
}
}
return this.testRoot;
@@ -214,12 +217,21 @@ public abstract class AbstractSlingCrudR
Resource resource1 = resourceResolver.getResource("/");
List<Resource> children = Lists.newArrayList(resource1.listChildren());
- assertEquals(1, children.size());
- assertEquals(getTestRootResource().getName(), children.get(0).getName());
+ assertFalse(children.isEmpty());
+ assertTrue(containsResource(children, getTestRootResource()));
children = Lists.newArrayList(resource1.getChildren());
- assertEquals(1, children.size());
- assertEquals(getTestRootResource().getName(), children.get(0).getName());
+ assertFalse(children.isEmpty());
+ assertTrue(containsResource(children, getTestRootResource()));
+ }
+
+ private boolean containsResource(List<Resource> children, Resource resource) {
+ for (Resource child : children) {
+ if (StringUtils.equals(child.getPath(), resource.getPath())) {
+ return true;
+ }
+ }
+ return false;
}
@Test