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/09 12:22:46 UTC
svn commit: r1701971 - in /sling/trunk/testing/mocks: sling-mock-jackrabbit/
sling-mock-jackrabbit/src/test/java/org/apache/sling/testing/mock/sling/jackrabbit/resource/
sling-mock-oak/
sling-mock-oak/src/test/java/org/apache/sling/testing/mock/sling/o...
Author: sseifert
Date: Wed Sep 9 10:22:46 2015
New Revision: 1701971
URL: http://svn.apache.org/r1701971
Log:
SLING-5007 realx unit test to test root path child listing in sling-mock-jackrabbit and sling-mock-jackrabbit and sling-mock-oak because in real repositories multiple root test nodes may be created in parallel, or nodes already exist
Modified:
sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
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/pom.xml
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/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml?rev=1701971&r1=1701970&r2=1701971&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml Wed Sep 9 10:22:46 2015
@@ -45,14 +45,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.4.0</version>
+ <version>1.5.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.4.0</version>
+ <version>1.5.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
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=1701971&r1=1701970&r2=1701971&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 9 10:22:46 2015
@@ -18,17 +18,23 @@
*/
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
@@ -52,4 +58,16 @@ 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/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak/pom.xml?rev=1701971&r1=1701970&r2=1701971&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-oak/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-oak/pom.xml Wed Sep 9 10:22:46 2015
@@ -50,14 +50,14 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.4.0</version>
+ <version>1.5.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.sling-mock</artifactId>
- <version>1.4.0</version>
+ <version>1.5.1-SNAPSHOT</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
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=1701971&r1=1701970&r2=1701971&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 9 10:22:46 2015
@@ -18,17 +18,23 @@
*/
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
@@ -52,4 +58,16 @@ 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=1701971&r1=1701970&r2=1701971&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 9 10:22:46 2015
@@ -64,7 +64,7 @@ public abstract class AbstractSlingCrudR
private static final Calendar CALENDAR_VALUE = Calendar.getInstance();
private static final byte[] BINARY_VALUE = new byte[] { 0x01, 0x02, 0x03, 0x04, 0x05, 0x06 };
- private ResourceResolver resourceResolver;
+ protected ResourceResolver resourceResolver;
protected Resource testRoot;
private static volatile long rootNodeCounter;
@@ -110,7 +110,7 @@ public abstract class AbstractSlingCrudR
* Return a test root resource, created on demand, with a unique path
* @throws PersistenceException
*/
- private Resource getTestRootResource() throws PersistenceException {
+ protected Resource getTestRootResource() throws PersistenceException {
if (this.testRoot == null) {
Map<String, Object> props = new HashMap<String, Object>();
props.put(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED);