You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2012/05/29 09:00:06 UTC
svn commit: r1343557 - in
/sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper:
MapEntryTest.java RedirectResourceTest.java ResourcePathIteratorTest.java
ResourceProviderEntryTest.java
Author: cziegeler
Date: Tue May 29 07:00:05 2012
New Revision: 1343557
URL: http://svn.apache.org/viewvc?rev=1343557&view=rev
Log:
SLING-2396 : Add new resource provider interfaces (WiP)
Modified:
sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/MapEntryTest.java
sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java
sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourcePathIteratorTest.java
sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceProviderEntryTest.java
Modified: sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/MapEntryTest.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/MapEntryTest.java?rev=1343557&r1=1343556&r2=1343557&view=diff
==============================================================================
--- sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/MapEntryTest.java (original)
+++ sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/MapEntryTest.java Tue May 29 07:00:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.resource.internal.helper;
+package org.apache.sling.resourceresolver.impl.helper;
import java.lang.reflect.Method;
import java.net.URI;
Modified: sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java?rev=1343557&r1=1343556&r2=1343557&view=diff
==============================================================================
--- sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java (original)
+++ sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/RedirectResourceTest.java Tue May 29 07:00:05 2012
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.resource.internal.helper;
+package org.apache.sling.resourceresolver.impl.helper;
import java.util.Map;
+import junit.framework.TestCase;
+
import org.apache.sling.api.resource.PersistableValueMap;
import org.apache.sling.api.resource.ValueMap;
-import junit.framework.TestCase;
-
public class RedirectResourceTest extends TestCase {
public void testRedirectResource() {
@@ -40,13 +40,13 @@ public class RedirectResourceTest extend
final Map<?, ?> map = res.adaptTo(Map.class);
assertNotNull("Expected Map adapter", map);
- assertEquals(target, map.getFactoryResourceProvider(RedirectResource.PROP_SLING_TARGET));
- assertEquals(status, ((Integer) map.getFactoryResourceProvider(RedirectResource.PROP_SLING_STATUS)).intValue());
+ assertEquals(target, map.get(RedirectResource.PROP_SLING_TARGET));
+ assertEquals(status, ((Integer) map.get(RedirectResource.PROP_SLING_STATUS)).intValue());
final ValueMap valueMap = res.adaptTo(ValueMap.class);
assertNotNull("Expected ValueMap adapter", valueMap);
- assertEquals(target, valueMap.getFactoryResourceProvider(RedirectResource.PROP_SLING_TARGET));
- assertEquals(status, ((Integer) valueMap.getFactoryResourceProvider(RedirectResource.PROP_SLING_STATUS)).intValue());
+ assertEquals(target, valueMap.get(RedirectResource.PROP_SLING_TARGET));
+ assertEquals(status, ((Integer) valueMap.get(RedirectResource.PROP_SLING_STATUS)).intValue());
assertEquals(status, valueMap.get(RedirectResource.PROP_SLING_STATUS, Integer.class).intValue());
final PersistableValueMap persistableValueMap = res.adaptTo(PersistableValueMap.class);
Modified: sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourcePathIteratorTest.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourcePathIteratorTest.java?rev=1343557&r1=1343556&r2=1343557&view=diff
==============================================================================
--- sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourcePathIteratorTest.java (original)
+++ sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourcePathIteratorTest.java Tue May 29 07:00:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.resource.internal.helper;
+package org.apache.sling.resourceresolver.impl.helper;
import java.util.Iterator;
import java.util.NoSuchElementException;
@@ -129,14 +129,14 @@ public class ResourcePathIteratorTest ex
assertNext("some/stuff", it);
assertFinished(it);
}
-
+
private void assertNext(String expected, Iterator<String> iterator) {
assertTrue("Iterator must have next", iterator.hasNext());
assertEquals("Incorrect next value", expected, iterator.next());
}
-
+
private void assertFinished(Iterator<String> iterator) {
-
+
assertFalse("Iterator must not have next", iterator.hasNext());
try {
Modified: sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceProviderEntryTest.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceProviderEntryTest.java?rev=1343557&r1=1343556&r2=1343557&view=diff
==============================================================================
--- sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceProviderEntryTest.java (original)
+++ sling/whiteboard/SLING-2396/resourceresolver/src/test/java/org/apache/sling/resourceresolver/impl/helper/ResourceProviderEntryTest.java Tue May 29 07:00:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.resource.internal.helper;
+package org.apache.sling.resourceresolver.impl.helper;
import java.util.Arrays;
import java.util.Collections;