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 2014/10/11 11:13:01 UTC
svn commit: r1631031 - in /sling/trunk/testing/resourceresolver-mock: ./
src/main/java/org/apache/sling/testing/resourceresolver/
src/test/java/org/apache/sling/testing/resourceresolver/
Author: sseifert
Date: Sat Oct 11 09:13:01 2014
New Revision: 1631031
URL: http://svn.apache.org/r1631031
Log:
SLING-4033 Lower Sling API Dependency to 2.4.0
Modified:
sling/trunk/testing/resourceresolver-mock/pom.xml
sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java
sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
Modified: sling/trunk/testing/resourceresolver-mock/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/pom.xml?rev=1631031&r1=1631030&r2=1631031&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/pom.xml (original)
+++ sling/trunk/testing/resourceresolver-mock/pom.xml Sat Oct 11 09:13:01 2014
@@ -59,16 +59,17 @@
</plugins>
</reporting>
<dependencies>
- <dependency>
+ <dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.api</artifactId>
- <version>2.8.0</version>
+ <!-- TODO: resarch why unit tests fail on InputStream tests with Sling API < 2.7.0 -->
+ <!--version>2.4.0</version-->
+ <version>2.7.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.3.0</version>
<scope>compile</scope>
</dependency>
<dependency>
Modified: sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java?rev=1631031&r1=1631030&r2=1631031&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResource.java Sat Oct 11 09:13:01 2014
@@ -26,6 +26,7 @@ import org.apache.sling.api.resource.Mod
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceMetadata;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.apache.sling.api.wrappers.ModifiableValueMapDecorator;
import org.apache.sling.api.wrappers.ValueMapDecorator;
@@ -96,7 +97,7 @@ public class MockResource extends Abstra
}
else if ( type == InputStream.class ) {
InputStream is = getFileResourceInputStream();
- if (is!=null) {
+ if (is != null) {
return (AdapterType)is;
}
}
@@ -115,13 +116,13 @@ public class MockResource extends Abstra
else if (NT_FILE.equals(resourceType)) {
Resource contentResource = getChild(JCR_CONTENT);
if (contentResource != null) {
- return contentResource.getValueMap().get(JCR_DATA, InputStream.class);
+ return ResourceUtil.getValueMap(contentResource).get(JCR_DATA, InputStream.class);
}
}
return null;
}
- @Override
+ // part of Resource API 2.7.0
public ValueMap getValueMap() {
return this.props;
}
Modified: sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java?rev=1631031&r1=1631030&r2=1631031&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolver.java Sat Oct 11 09:13:01 2014
@@ -18,13 +18,12 @@
*/
package org.apache.sling.testing.resourceresolver;
-import java.io.UnsupportedEncodingException;
-import java.net.URI;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Dictionary;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -133,7 +132,7 @@ public class MockResourceResolver extend
String parentPath = ResourceUtil.getParent(path);
Resource parentResource = getResourceInternal(parentPath);
if (parentResource!=null) {
- ValueMap props = parentResource.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(parentResource);
if (props.containsKey(name)) {
return new MockPropertyResource(path, props, this);
}
@@ -217,7 +216,7 @@ public class MockResourceResolver extend
return children.iterator();
}
- @Override
+ // part of Resource API 2.5.0
public Iterable<Resource> getChildren(final Resource parent) {
return new Iterable<Resource>() {
@@ -312,7 +311,7 @@ public class MockResourceResolver extend
}
Resource mockResource = new MockResource(path, properties, this);
- this.temporaryResources.put(path, mockResource.getValueMap());
+ this.temporaryResources.put(path, ResourceUtil.getValueMap(mockResource));
return mockResource;
}
@@ -327,7 +326,7 @@ public class MockResourceResolver extend
synchronized ( this.resources ) {
for(final String path : this.deletedResources ) {
if ( this.resources.remove(path) != null && this.options.getEventAdmin() != null ) {
- final Map<String, Object> props = new HashMap<String, Object>();
+ final Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(SlingConstants.PROPERTY_PATH, path);
final Event e = new Event(SlingConstants.TOPIC_RESOURCE_REMOVED, props);
this.options.getEventAdmin().sendEvent(e);
@@ -338,7 +337,7 @@ public class MockResourceResolver extend
final boolean changed = this.resources.containsKey(path);
this.resources.put(path, this.temporaryResources.get(path));
if ( this.options.getEventAdmin() != null ) {
- final Map<String, Object> props = new HashMap<String, Object>();
+ final Dictionary<String, Object> props = new Hashtable<String, Object>();
props.put(SlingConstants.PROPERTY_PATH, path);
if ( this.resources.get(path).get(ResourceResolver.PROPERTY_RESOURCE_TYPE) != null ) {
props.put(SlingConstants.PROPERTY_RESOURCE_TYPE, this.resources.get(path).get(ResourceResolver.PROPERTY_RESOURCE_TYPE));
@@ -380,7 +379,7 @@ public class MockResourceResolver extend
this.temporaryResources.put(path, props);
}
- @Override
+ // part of Resource API 2.6.0
public boolean hasChildren(Resource resource) {
return this.listChildren(resource).hasNext();
}
Modified: sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java?rev=1631031&r1=1631030&r2=1631031&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/main/java/org/apache/sling/testing/resourceresolver/MockResourceResolverFactory.java Sat Oct 11 09:13:01 2014
@@ -80,7 +80,7 @@ public class MockResourceResolverFactory
return new MockResourceResolver(options, this, resources);
}
- @Override
+ // part of Resource API 2.5.0
public ResourceResolver getServiceResourceResolver(
Map<String, Object> authenticationInfo) throws LoginException {
return new MockResourceResolver(options, this, resources);
@@ -94,7 +94,7 @@ public class MockResourceResolverFactory
/**
* @see org.apache.sling.api.resource.ResourceResolverFactory#getThreadResourceResolver()
*/
- @Override
+ // part of Resource API 2.8.0
public ResourceResolver getThreadResourceResolver() {
ResourceResolver result = null;
final Stack<ResourceResolver> resolverStack = resolverStackHolder.get();
Modified: sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java?rev=1631031&r1=1631030&r2=1631031&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/CreateDeleteResourceResolverTest.java Sat Oct 11 09:13:01 2014
@@ -28,6 +28,7 @@ import org.apache.sling.api.resource.Log
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.junit.Before;
import org.junit.Test;
@@ -58,7 +59,7 @@ public class CreateDeleteResourceResolve
public void testCreateDeleteCreate() throws PersistenceException {
// create new node without commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
- assertEquals(PROPS1, resource.getValueMap());
+ assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
// delete node without commit
resourceResolver.delete(resource);
@@ -66,14 +67,14 @@ public class CreateDeleteResourceResolve
// create node again with different properties without commit
resource = resourceResolver.create(testRoot, "node", PROPS2);
- assertEquals(PROPS2, resource.getValueMap());
+ assertEquals(PROPS2, ResourceUtil.getValueMap(resource));
}
@Test
public void testCreateDeleteCreateCommit() throws PersistenceException {
// create new node without commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
- assertEquals(PROPS1, resource.getValueMap());
+ assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
// delete node without commit
resourceResolver.delete(resource);
@@ -81,7 +82,7 @@ public class CreateDeleteResourceResolve
// create node again with different properties with commit
resource = resourceResolver.create(testRoot, "node", PROPS2);
- assertEquals(PROPS2, resource.getValueMap());
+ assertEquals(PROPS2, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
}
@@ -89,7 +90,7 @@ public class CreateDeleteResourceResolve
public void testCreateCommitDeleteCreateCommit() throws PersistenceException {
// create new node with commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
- assertEquals(PROPS1, resource.getValueMap());
+ assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
// delete node without commit
@@ -98,7 +99,7 @@ public class CreateDeleteResourceResolve
// create node again with different properties with commit
resource = resourceResolver.create(testRoot, "node", PROPS2);
- assertEquals(PROPS2, resource.getValueMap());
+ assertEquals(PROPS2, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
}
@@ -106,7 +107,7 @@ public class CreateDeleteResourceResolve
public void testCreateCommitDeleteCommitCreateCommit() throws PersistenceException {
// create new node with commit
Resource resource = resourceResolver.create(testRoot, "node", PROPS1);
- assertEquals(PROPS1, resource.getValueMap());
+ assertEquals(PROPS1, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
// delete node with commit
@@ -116,7 +117,7 @@ public class CreateDeleteResourceResolve
// create node again with different properties with commit
resource = resourceResolver.create(testRoot, "node", PROPS2);
- assertEquals(PROPS2, resource.getValueMap());
+ assertEquals(PROPS2, ResourceUtil.getValueMap(resource));
resourceResolver.commit();
}
Modified: sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java?rev=1631031&r1=1631030&r2=1631031&view=diff
==============================================================================
--- sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java (original)
+++ sling/trunk/testing/resourceresolver-mock/src/test/java/org/apache/sling/testing/resourceresolver/SlingCrudResourceResolverTest.java Sat Oct 11 09:13:01 2014
@@ -34,6 +34,7 @@ import org.apache.sling.api.resource.Log
import org.apache.sling.api.resource.PersistenceException;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.ResourceUtil;
import org.apache.sling.api.resource.ValueMap;
import org.junit.Before;
import org.junit.Test;
@@ -93,7 +94,7 @@ public class SlingCrudResourceResolverTe
assertNotNull(resource1);
assertEquals("node1", resource1.getName());
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(STRING_VALUE, props.get("stringProp", String.class));
assertArrayEquals(STRING_ARRAY_VALUE, props.get("stringArrayProp", String[].class));
assertEquals((Integer) INTEGER_VALUE, props.get("integerProp", Integer.class));
@@ -104,14 +105,14 @@ public class SlingCrudResourceResolverTe
@Test
public void testDateProperty() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(DATE_VALUE, props.get("dateProp", Date.class));
}
@Test
public void testDatePropertyToCalendar() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
Calendar calendarValue = props.get("dateProp", Calendar.class);
assertNotNull(calendarValue);
assertEquals(DATE_VALUE, calendarValue.getTime());
@@ -120,14 +121,14 @@ public class SlingCrudResourceResolverTe
@Test
public void testCalendarProperty() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
assertEquals(CALENDAR_VALUE.getTime(), props.get("calendarProp", Calendar.class).getTime());
}
@Test
public void testCalendarPropertyToDate() throws IOException {
Resource resource1 = resourceResolver.getResource(testRoot.getPath() + "/node1");
- ValueMap props = resource1.getValueMap();
+ ValueMap props = ResourceUtil.getValueMap(resource1);
Date dateValue = props.get("calendarProp", Date.class);
assertNotNull(dateValue);
assertEquals(CALENDAR_VALUE.getTime(), dateValue);
@@ -155,7 +156,7 @@ public class SlingCrudResourceResolverTe
// read second time to ensure not the original input stream was returned
// and this time using another syntax
- InputStream is2 = resource1.getValueMap().get("binaryProp", InputStream.class);
+ InputStream is2 = ResourceUtil.getValueMap(resource1).get("binaryProp", InputStream.class);
byte[] dataFromResource2 = IOUtils.toByteArray(is2);
is2.close();
assertArrayEquals(BINARY_VALUE, dataFromResource2);