You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by to...@apache.org on 2014/10/28 13:15:49 UTC
svn commit: r1634855 [2/2] - in
/sling/trunk/contrib/extensions/replication/core/src:
main/java/org/apache/sling/replication/agent/impl/
main/java/org/apache/sling/replication/component/impl/
main/java/org/apache/sling/replication/event/ main/java/org/...
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilderTest.java?rev=1634855&r1=1634854&r2=1634855&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilderTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilderTest.java Tue Oct 28 12:15:48 2014
@@ -19,6 +19,8 @@
package org.apache.sling.replication.serialization.impl.vlt;
import javax.jcr.Session;
+import javax.jcr.Workspace;
+import javax.jcr.observation.ObservationManager;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.InputStream;
@@ -61,11 +63,18 @@ public class FileVaultReplicationPackage
when(packageManager.assemble(any(Session.class), any(ExportOptions.class), any(File.class))).thenReturn(vaultPackage);
when(packaging.getPackageManager()).thenReturn(packageManager);
+ ResourceResolver resourceResolver = mock(ResourceResolver.class);
+ Session session = mock(Session.class);
+ Workspace workspace = mock(Workspace.class);
+ ObservationManager observationManager = mock(ObservationManager.class);
+ when(workspace.getObservationManager()).thenReturn(observationManager);
+ when(session.getWorkspace()).thenReturn(workspace);
+ when(resourceResolver.adaptTo(Session.class)).thenReturn(session);
+
ReplicationEventFactory eventFactory = mock(ReplicationEventFactory.class);
FileVaultReplicationPackageBuilder fileVaultReplicationPackageBuilder = new FileVaultReplicationPackageBuilder(
packaging, eventFactory);
- ResourceResolver resourceResolver = mock(ResourceResolver.class);
ReplicationRequest request = new ReplicationRequest(ReplicationActionType.ADD, new String[]{"/"});
ReplicationPackage replicationPackage = fileVaultReplicationPackageBuilder.createPackageForAdd(resourceResolver, request);
assertNotNull(replicationPackage);
@@ -115,6 +124,12 @@ public class FileVaultReplicationPackage
packaging, eventFactory);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
+ Session session = mock(Session.class);
+ Workspace workspace = mock(Workspace.class);
+ ObservationManager observationManager = mock(ObservationManager.class);
+ when(workspace.getObservationManager()).thenReturn(observationManager);
+ when(session.getWorkspace()).thenReturn(workspace);
+ when(resourceResolver.adaptTo(Session.class)).thenReturn(session);
ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
when(replicationPackage.getId()).thenReturn("/path/to/file");
boolean success = fileVaultReplicationPackageBuilder.installPackage(resourceResolver, replicationPackage);
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTriggerTest.java?rev=1634855&r1=1634854&r2=1634855&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ChainReplicateReplicationTriggerTest.java Tue Oct 28 12:15:48 2014
@@ -18,7 +18,7 @@
*/
package org.apache.sling.replication.trigger.impl;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
+import org.apache.sling.replication.trigger.ReplicationRequestHandler;
import org.junit.Test;
import org.osgi.framework.BundleContext;
@@ -34,8 +34,8 @@ public class ChainReplicateReplicationTr
String pathPrefix = "/prefix";
BundleContext bundleContext = mock(BundleContext.class);
ChainReplicateReplicationTrigger chainReplicateReplicationTrigger = new ChainReplicateReplicationTrigger(pathPrefix, bundleContext);
- ReplicationTriggerRequestHandler handler = mock(ReplicationTriggerRequestHandler.class);
- chainReplicateReplicationTrigger.register("handler-id-1", handler);
+ ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
+ chainReplicateReplicationTrigger.register(handler);
}
@Test
@@ -43,7 +43,8 @@ public class ChainReplicateReplicationTr
String pathPrefix = "/prefix";
BundleContext bundleContext = mock(BundleContext.class);
ChainReplicateReplicationTrigger chainReplicateReplicationTrigger = new ChainReplicateReplicationTrigger(pathPrefix, bundleContext);
- chainReplicateReplicationTrigger.unregister("handler-id-1");
+ ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
+ chainReplicateReplicationTrigger.unregister(handler);
}
@Test
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTriggerTest.java?rev=1634855&r1=1634854&r2=1634855&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/PersistingJcrEventReplicationTriggerTest.java Tue Oct 28 12:15:48 2014
@@ -27,7 +27,7 @@ import javax.jcr.security.Privilege;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
+import org.apache.sling.replication.trigger.ReplicationRequestHandler;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -73,8 +73,8 @@ public class PersistingJcrEventReplicati
String path = "/some/path";
PersistingJcrEventReplicationTrigger persistingJcrEventReplicationTrigger = new PersistingJcrEventReplicationTrigger(
repository, path, serviceName, nuggetsPath);
- ReplicationTriggerRequestHandler handler = mock(ReplicationTriggerRequestHandler.class);
- persistingJcrEventReplicationTrigger.register("handler-id", handler);
+ ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
+ persistingJcrEventReplicationTrigger.register(handler);
Node nuggetsNode = mock(Node.class);
Node eventNode = mock(Node.class);
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTriggerTest.java?rev=1634855&r1=1634854&r2=1634855&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/RemoteEventReplicationTriggerTest.java Tue Oct 28 12:15:48 2014
@@ -22,7 +22,7 @@ import org.apache.http.client.Credential
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
+import org.apache.sling.replication.trigger.ReplicationRequestHandler;
import org.junit.Test;
import static org.mockito.Mockito.mock;
@@ -35,18 +35,17 @@ public class RemoteEventReplicationTrigg
@Test
public void testRegister() throws Exception {
+ ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
String endpoint = "";
- String handlerId = "handler-id-1";
TransportAuthenticationProvider<CredentialsProvider, CredentialsProvider> authProvider = mock(TransportAuthenticationProvider.class);
when(authProvider.canAuthenticate(CredentialsProvider.class)).thenReturn(true);
Scheduler scheduler = mock(Scheduler.class);
ScheduleOptions options = mock(ScheduleOptions.class);
- when(options.name(handlerId)).thenReturn(options);
+ when(options.name(handler.toString())).thenReturn(options);
when(scheduler.NOW()).thenReturn(options);
RemoteEventReplicationTrigger remoteEventReplicationTrigger = new RemoteEventReplicationTrigger(
endpoint, authProvider, scheduler);
- ReplicationTriggerRequestHandler handler = mock(ReplicationTriggerRequestHandler.class);
- remoteEventReplicationTrigger.register(handlerId, handler);
+ remoteEventReplicationTrigger.register(handler);
}
@Test
@@ -58,6 +57,7 @@ public class RemoteEventReplicationTrigg
Scheduler scheduler = mock(Scheduler.class);
RemoteEventReplicationTrigger remoteEventReplicationTrigger = new RemoteEventReplicationTrigger(
endpoint, authProvider, scheduler);
- remoteEventReplicationTrigger.unregister(handlerId);
+ ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
+ remoteEventReplicationTrigger.unregister(handler);
}
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTriggerTest.java?rev=1634855&r1=1634854&r2=1634855&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ResourceEventReplicationTriggerTest.java Tue Oct 28 12:15:48 2014
@@ -18,7 +18,7 @@
*/
package org.apache.sling.replication.trigger.impl;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
+import org.apache.sling.replication.trigger.ReplicationRequestHandler;
import org.junit.Test;
import org.osgi.framework.BundleContext;
@@ -34,9 +34,8 @@ public class ResourceEventReplicationTri
String path = "/some/path";
BundleContext bundleContext = mock(BundleContext.class);
ResourceEventReplicationTrigger resourceEventReplicationTrigger = new ResourceEventReplicationTrigger(path, bundleContext);
- String handlerId = "handlder-id-123";
- ReplicationTriggerRequestHandler handler = mock(ReplicationTriggerRequestHandler.class);
- resourceEventReplicationTrigger.register(handlerId, handler);
+ ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
+ resourceEventReplicationTrigger.register(handler);
}
@Test
@@ -44,8 +43,8 @@ public class ResourceEventReplicationTri
String path = "/some/path";
BundleContext bundleContext = mock(BundleContext.class);
ResourceEventReplicationTrigger resourceEventReplicationTrigger = new ResourceEventReplicationTrigger(path, bundleContext);
- String handlerId = "handlder-id-123";
- resourceEventReplicationTrigger.unregister(handlerId);
+ ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
+ resourceEventReplicationTrigger.unregister(handler);
}
@Test
Modified: sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTriggerTest.java?rev=1634855&r1=1634854&r2=1634855&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/trigger/impl/ScheduledReplicationTriggerTest.java Tue Oct 28 12:15:48 2014
@@ -21,7 +21,7 @@ package org.apache.sling.replication.tri
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.trigger.ReplicationTriggerRequestHandler;
+import org.apache.sling.replication.trigger.ReplicationRequestHandler;
import org.junit.Test;
import static org.mockito.Mockito.mock;
@@ -35,16 +35,15 @@ public class ScheduledReplicationTrigger
@Test
public void testRegister() throws Exception {
for (ReplicationActionType action : ReplicationActionType.values()) {
- String handlerId = "handler-id-123";
String path = "/path/to/somewhere";
int interval = 10;
+ ReplicationRequestHandler handler = mock(ReplicationRequestHandler.class);
Scheduler scheduler = mock(Scheduler.class);
ScheduleOptions options = mock(ScheduleOptions.class);
when(scheduler.NOW(-1, interval)).thenReturn(options);
- when(options.name(handlerId)).thenReturn(options);
+ when(options.name(handler.toString())).thenReturn(options);
ScheduledReplicationTrigger scheduledReplicationTrigger = new ScheduledReplicationTrigger(action.name(), path, interval, scheduler);
- ReplicationTriggerRequestHandler handler = mock(ReplicationTriggerRequestHandler.class);
- scheduledReplicationTrigger.register(handlerId, handler);
+ scheduledReplicationTrigger.register(handler);
}
}
@@ -55,7 +54,7 @@ public class ScheduledReplicationTrigger
int interval = 10;
Scheduler scheduler = mock(Scheduler.class);
ScheduledReplicationTrigger scheduledReplicationTrigger = new ScheduledReplicationTrigger(action.name(), path, interval, scheduler);
- String handlerId = "handler-id-123";
+ ReplicationRequestHandler handlerId = mock(ReplicationRequestHandler.class);
scheduledReplicationTrigger.unregister(handlerId);
}
}