You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2016/05/18 09:38:59 UTC
svn commit: r1744370 -
/sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/sling/ResourceTraversorTest.java
Author: bdelacretaz
Date: Wed May 18 09:38:59 2016
New Revision: 1744370
URL: http://svn.apache.org/viewvc?rev=1744370&view=rev
Log:
SLING-5578 - verify traversal result
Modified:
sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/sling/ResourceTraversorTest.java
Modified: sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/sling/ResourceTraversorTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/sling/ResourceTraversorTest.java?rev=1744370&r1=1744369&r2=1744370&view=diff
==============================================================================
--- sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/sling/ResourceTraversorTest.java (original)
+++ sling/trunk/bundles/commons/json/src/test/java/org/apache/sling/commons/json/sling/ResourceTraversorTest.java Wed May 18 09:38:59 2016
@@ -17,16 +17,18 @@
package org.apache.sling.commons.json.sling;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.CopyOnWriteArrayList;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
@@ -34,56 +36,117 @@ import org.apache.sling.api.resource.Val
import org.apache.sling.api.wrappers.ValueMapDecorator;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
+import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
public class ResourceTraversorTest {
- private static final String RESOURCE_NAME = "testResource";
+ private static final String RESOURCE_NAME = "R";
private static final String PATH = "/" + RESOURCE_NAME;
private static final String ID = "id";
- @Test
- public void testCollectResources() throws JSONException {
- // Currently this fails with -Dsling.test.ResourceTraversor.N = 20000
- final int N = Integer.getInteger("sling.test.ResourceTraversor.N", 1000);
- final int LEVELS = 10;
- Resource r = createResource(N);
- ResourceTraversor traversor = new ResourceTraversor(LEVELS, N * 10, r, true);
- traversor.collectResources();
- assertTraversalResult(traversor.getJSONObject(), N);
- }
+ // Several tests currently fail with stack overflow with -Dsling.test.ResourceTraversor.count=20000
+ private final int MANY = Integer.getInteger("sling.test.ResourceTraversor.count", 10);
+ private final int FEW = 5;
+ private final int LEVELS = 3;
+ private Resource root;
- void assertTraversalResult(JSONObject jso, int nChildren) throws JSONException {
- for(int i=0; i < nChildren; i++) {
- final String key = "child" + i;
- assertTrue("Expecting " + key, jso.has(key));
- final JSONObject child = jso.getJSONObject(key);
- assertTrue("Expecting property " + ID, child.has(ID));
- assertEquals("Expecting value " + key, key, child.get(ID));
- }
- }
-
- Resource createResource(int numberOfChildren) {
- Resource resource = mock(Resource.class);
- ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ResourceResolver childResourceResolver = mock(ResourceResolver.class);
-
+ private void addChildren(Resource parent, int resourcesPerLevel, int nLevels) {
final List<Resource> empty = new ArrayList<Resource>();
- when(childResourceResolver.listChildren(any(Resource.class))).thenReturn(empty.iterator());
- when(resource.getResourceResolver()).thenReturn(resourceResolver);
- when(resource.getPath()).thenReturn(PATH);
-
- final List<Resource> children = new ArrayList<Resource>();
- for(int i=0; i < numberOfChildren; i++) {
+ final List<Resource> children = new CopyOnWriteArrayList<Resource>();
+ ResourceResolver childResourceResolver = mock(ResourceResolver.class);
+ for(int i=0; i < resourcesPerLevel; i++) {
final Map<String, Object> childProps = new HashMap<String, Object>();
- final String id = "child" + i;
+ final String id = makePath(parent.getPath(), i);
childProps.put(ID, id);
final Resource r = mock(Resource.class);
when(r.adaptTo(ValueMap.class)).thenReturn(new ValueMapDecorator(childProps));
when(r.getResourceResolver()).thenReturn(childResourceResolver);
when(r.getPath()).thenReturn(PATH + "/" + id);
children.add(r);
+ when(r.getResourceResolver().listChildren(any(Resource.class))).thenReturn(empty.iterator());
+ }
+ when(parent.getResourceResolver().listChildren(any(Resource.class))).thenReturn(children.iterator());
+ }
+
+ private static String makePath(String parentPath, int index) {
+ return parentPath.replaceAll("/", "_") + "_" + index;
+ }
+
+ private String describe(JSONObject o) {
+ int maxKeys = 5;
+ final StringBuilder b = new StringBuilder();
+ b.append("JSONOBject having ");
+ final Iterator<String> k = o.keys();
+ int count = 0;
+ if(!k.hasNext()) {
+ b.append("no properties");
+ }
+ while(k.hasNext()) {
+ b.append(k.next()).append(",");
+ if(++count >= maxKeys) {
+ b.append("...");
+ break;
+ }
+ }
+ return b.toString();
+ }
+
+ @Before
+ public void setup() {
+ root = null;
+ }
+
+ public void createTree(int resourcesPerLevel, int depth) {
+ root = mock(Resource.class);
+ ResourceResolver resourceResolver = mock(ResourceResolver.class);
+ when(root.getResourceResolver()).thenReturn(resourceResolver);
+ when(root.getPath()).thenReturn(PATH);
+ addChildren(root, resourcesPerLevel, depth);
+ }
+
+ @Test
+ @Ignore("Need to generate a tree of resources")
+ public void collectNLevelsNoLimit() throws JSONException {
+ createTree(FEW, LEVELS);
+ ResourceTraversor traversor = new ResourceTraversor(-1, Integer.MAX_VALUE, root, true);
+ traversor.collectResources();
+ assertTraversalResult(root.getPath(), traversor.getJSONObject(), FEW, LEVELS);
+ }
+
+ @Test
+ public void collectOneLevelNoLimit() throws JSONException {
+ createTree(MANY, 1);
+ ResourceTraversor traversor = new ResourceTraversor(1, MANY * 10, root, true);
+ traversor.collectResources();
+ assertTraversalResult(root.getPath(), traversor.getJSONObject(), MANY, 1);
+ }
+
+ @Test
+ public void collectOneLevelLimitIgnoredAtLevelOne() throws JSONException {
+ createTree(MANY, 1);
+ ResourceTraversor traversor = new ResourceTraversor(1, 1, root, true);
+ traversor.collectResources();
+ assertTraversalResult(root.getPath(), traversor.getJSONObject(), MANY, 1);
+ }
+
+ void assertTraversalResult(String parentPath, JSONObject jso, int childrenPerLevel, int nLevels) throws JSONException {
+ for(int i=0; i < childrenPerLevel; i++) {
+ final String key = makePath(parentPath, i);
+ assertTrue("Expecting " + key + " on " + describe(jso), jso.has(key));
+ final JSONObject child = jso.getJSONObject(key);
+ assertTrue("Expecting property " + ID, child.has(ID));
+ assertEquals("Expecting value " + key, key, child.get(ID));
+ if(nLevels > 1) {
+ assertTraversalResult(key, child, childrenPerLevel, nLevels - 1);
+ }
+ }
+ int keysCount = 0;
+ final Iterator<String> k = jso.keys();
+ while(k.hasNext()) {
+ k.next();
+ keysCount++;
}
- when(resourceResolver.listChildren(any(Resource.class))).thenReturn(children.iterator());
- return resource;
+ assertEquals("Expecting " + childrenPerLevel + " keys on " + describe(jso), childrenPerLevel, keysCount);
}
-}
+}
\ No newline at end of file