svn commit: r934819 - in /sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal: JcrResourceListenerTest.java SynchronousJcrResourceListener.java

[cziegeler]

Author: cziegeler
Date: Fri Apr 16 12:00:36 2010
New Revision: 934819

URL: http://svn.apache.org/viewvc?rev=934819&view=rev
Log:
SLING-1447 : support for resource paths containing workspace name - fix tests

Modified:
    
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
    
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java

Modified: 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java?rev=934819&r1=934818&r2=934819&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
 (original)
+++ 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/JcrResourceListenerTest.java
 Fri Apr 16 12:00:36 2010
@@ -16,7 +16,8 @@
  */
 package org.apache.sling.jcr.resource.internal;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -138,7 +139,7 @@ public class JcrResourceListenerTest ext
         final ServiceTracker tracker = mock(ServiceTracker.class);
         when(tracker.getService()).thenReturn(mockEA);
 
-        JcrResourceListener listener = new 
SynchronousJcrResourceListener(getRepository(), workspaceName, factory, "/",
+        JcrResourceListener listener = new 
SynchronousJcrResourceListener(workspaceName, factory, "/",
                 "/", tracker);
 
         createdPath = createTestPath();

Modified: 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java?rev=934819&r1=934818&r2=934819&view=diff
==============================================================================
--- 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java
 (original)
+++ 
sling/trunk/bundles/jcr/resource/src/test/java/org/apache/sling/jcr/resource/internal/SynchronousJcrResourceListener.java
 Fri Apr 16 12:00:36 2010
@@ -21,7 +21,6 @@ import javax.jcr.RepositoryException;
 import org.apache.jackrabbit.core.observation.SynchronousEventListener;
 import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.ResourceResolverFactory;
-import org.apache.sling.jcr.api.SlingRepository;
 import org.osgi.util.tracker.ServiceTracker;
 
 /**
@@ -33,10 +32,10 @@ import org.osgi.util.tracker.ServiceTrac
  */
 public class SynchronousJcrResourceListener extends JcrResourceListener 
implements SynchronousEventListener {
 
-    public SynchronousJcrResourceListener(SlingRepository repository, String 
workspaceName,
+    public SynchronousJcrResourceListener(String workspaceName,
             ResourceResolverFactory factory, String startPath, String 
mountPrefix, ServiceTracker eventAdminTracker)
             throws LoginException, RepositoryException {
-        super(repository, workspaceName, factory, startPath, mountPrefix, 
eventAdminTracker);
+        super(workspaceName, factory, startPath, mountPrefix, 
eventAdminTracker);
     }
 
 }