Author: cziegeler
Date: Fri May 25 15:06:02 2012
New Revision: 1342670
URL: http://svn.apache.org/viewvc?rev=1342670&view=rev
Log:
SLING-2396 : New resource resolver factory based on resource provider factories
(WiP)
Removed:
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/MapEntryTest.java
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/RedirectResourceTest.java
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/ResourcePathIteratorTest.java
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/ResourceProviderEntryTest.java
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/helper/starresource/
Modified:
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java
Modified:
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java?rev=1342670&r1=1342669&r2=1342670&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
(original)
+++
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
Fri May 25 15:06:02 2012
@@ -16,9 +16,6 @@
*/
package org.apache.sling.jcr.resource.internal;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
import java.util.ArrayList;
import java.util.List;
@@ -33,7 +30,6 @@ import org.apache.sling.commons.testing.
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
-import org.osgi.util.tracker.ServiceTracker;
/**
* Test of JcrResourceListener.
@@ -66,40 +62,6 @@ public class JcrResourceListenerTest ext
}
- public void testInWs2() throws Exception {
- List<Event> events = generateEvents("ws2");
-
- assertTrue("Received: " + events, events.size() >= 3);
- Event event = events.get(0);
- assertEquals(SlingConstants.TOPIC_RESOURCE_ADDED, event.getTopic());
- assertEquals("ws2:" + createdPath,
event.getProperty(SlingConstants.PROPERTY_PATH));
- assertNotNull(event.getProperty(SlingConstants.PROPERTY_USERID));
-
- event = events.get(1);
- assertEquals(SlingConstants.TOPIC_RESOURCE_CHANGED, event.getTopic());
- assertEquals("ws2:" + pathToModify,
event.getProperty(SlingConstants.PROPERTY_PATH));
- assertNotNull(event.getProperty(SlingConstants.PROPERTY_USERID));
-
- event = events.get(2);
- assertEquals(SlingConstants.TOPIC_RESOURCE_REMOVED, event.getTopic());
- assertEquals("ws2:" + pathToDelete,
event.getProperty(SlingConstants.PROPERTY_PATH));
- assertNotNull(event.getProperty(SlingConstants.PROPERTY_USERID));
-
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- try {
- getSession().getWorkspace().createWorkspace("ws2");
- } catch (Exception e) {
- if (!e.getMessage().equals("workspace 'ws2' already exists.")) {
- throw e;
- }
- }
-
- }
-
private static void createNode(Session session, String path) throws
RepositoryException {
session.getRootNode().addNode(path.substring(1), "nt:unstructured");
session.save();
@@ -135,7 +97,6 @@ public class JcrResourceListenerTest ext
final JcrResourceResolverFactoryImpl factory = new
JcrResourceResolverFactoryImpl();
PrivateAccessor.setField(factory, "repository", getRepository());
- PrivateAccessor.setField(factory, "useMultiWorkspaces", Boolean.TRUE);
final EventAdmin mockEA = new EventAdmin() {
@@ -147,11 +108,8 @@ public class JcrResourceListenerTest ext
events.add(event);
}
};
- final ServiceTracker tracker = mock(ServiceTracker.class);
- when(tracker.getService()).thenReturn(mockEA);
- JcrResourceListener listener = new
SynchronousJcrResourceListener(workspaceName, factory, "/",
- "/", tracker);
+ SynchronousJcrResourceListener listener = new
SynchronousJcrResourceListener(factory, mockEA);
createdPath = createTestPath();
createNode(session, createdPath);
Modified:
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java?rev=1342670&r1=1342669&r2=1342670&view=diff
==============================================================================
---
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java
(original)
+++
sling/whiteboard/SLING-2396/jcr.resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java
Fri May 25 15:06:02 2012
@@ -18,10 +18,12 @@ package org.apache.sling.jcr.resource.in
import javax.jcr.RepositoryException;
+import junitx.util.PrivateAccessor;
+
import org.apache.jackrabbit.core.observation.SynchronousEventListener;
import org.apache.sling.api.resource.LoginException;
import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.service.event.EventAdmin;
/**
* This class is used to ensure that events are handled during the test.
@@ -32,10 +34,15 @@ import org.osgi.util.tracker.ServiceTrac
*/
public class SynchronousJcrResourceListener extends JcrResourceListener
implements SynchronousEventListener {
- public SynchronousJcrResourceListener(String workspaceName,
- ResourceResolverFactory factory, String startPath, String
mountPrefix, ServiceTracker eventAdminTracker)
- throws LoginException, RepositoryException {
- super(workspaceName, factory, startPath, mountPrefix,
eventAdminTracker);
+ public SynchronousJcrResourceListener(
+ ResourceResolverFactory factory, EventAdmin eventAdmin)
+ throws LoginException, RepositoryException, NoSuchFieldException {
+ PrivateAccessor.setField(this, "resourceResolverFactory", factory);
+ PrivateAccessor.setField(this, "eventAdmin", eventAdmin);
+ this.activate();
}
+ public void dispose() {
+ this.deactivate();
+ }
}
