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/11/07 11:28:08 UTC
svn commit: r1637333 [10/12] - in /sling/trunk/contrib/extensions:
distribution/ distribution/core/
distribution/core/src/main/java/org/apache/sling/distribution/
distribution/core/src/main/java/org/apache/sling/distribution/agent/
distribution/core/sr...
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/SingleQueueDistributionStrategyTest.java Fri Nov 7 10:28:02 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.queue.impl;
+package org.apache.sling.distribution.queue.impl;
-import org.apache.sling.replication.packaging.ReplicationPackage;
-import org.apache.sling.replication.queue.*;
+import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.queue.*;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -38,54 +38,54 @@ public class SingleQueueDistributionStra
@Test
public void testPackageAdditionWithSucceedingItemDelivery() throws Exception {
SingleQueueDistributionStrategy singleQueueDistributionStrategy = new SingleQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
- ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
- ReplicationQueue queue = mock(ReplicationQueue.class);
- when(queueProvider.getQueue(ReplicationQueueDistributionStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
- when(queue.add(any(ReplicationQueueItem.class))).thenReturn(true);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
+ DistributionQueue queue = mock(DistributionQueue.class);
+ when(queueProvider.getQueue(DistributionQueueDistributionStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
+ when(queue.add(any(DistributionQueueItem.class))).thenReturn(true);
- boolean returnedState = singleQueueDistributionStrategy.add(replicationPackage, queueProvider);
+ boolean returnedState = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
assertTrue(returnedState);
}
@Test
public void testPackageAdditionWithFailingItemDelivery() throws Exception {
SingleQueueDistributionStrategy singleQueueDistributionStrategy = new SingleQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
- ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
- ReplicationQueue queue = mock(ReplicationQueue.class);
- ReplicationQueueItem queueItem = mock(ReplicationQueueItem.class);
- when(queueProvider.getQueue(ReplicationQueueDistributionStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
+ DistributionQueue queue = mock(DistributionQueue.class);
+ DistributionQueueItem queueItem = mock(DistributionQueueItem.class);
+ when(queueProvider.getQueue(DistributionQueueDistributionStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
when(queue.add(queueItem)).thenReturn(true);
- ReplicationQueueItemState state = mock(ReplicationQueueItemState.class);
+ DistributionQueueItemState state = mock(DistributionQueueItemState.class);
when(state.isSuccessful()).thenReturn(false);
when(queue.getStatus(queueItem)).thenReturn(state);
- boolean returnedState = singleQueueDistributionStrategy.add(replicationPackage, queueProvider);
+ boolean returnedState = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
assertFalse(returnedState);
}
@Test
public void testPackageAdditionWithNullItemStateFromTheQueue() throws Exception {
SingleQueueDistributionStrategy singleQueueDistributionStrategy = new SingleQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
- ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
- ReplicationQueue queue = mock(ReplicationQueue.class);
- when(queueProvider.getQueue(ReplicationQueueDistributionStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
- when(queue.add(any(ReplicationQueueItem.class))).thenReturn(true);
- boolean returnedState = singleQueueDistributionStrategy.add(replicationPackage, queueProvider);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
+ DistributionQueue queue = mock(DistributionQueue.class);
+ when(queueProvider.getQueue(DistributionQueueDistributionStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
+ when(queue.add(any(DistributionQueueItem.class))).thenReturn(true);
+ boolean returnedState = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
assertTrue(returnedState);
}
@Test
public void testPackageAdditionWithNotNullItemStateFromTheQueue() throws Exception {
SingleQueueDistributionStrategy singleQueueDistributionStrategy = new SingleQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
- ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
- ReplicationQueue queue = mock(ReplicationQueue.class);
- when(queueProvider.getQueue(ReplicationQueueDistributionStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
- when(queue.add(any(ReplicationQueueItem.class))).thenReturn(true);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
+ DistributionQueue queue = mock(DistributionQueue.class);
+ when(queueProvider.getQueue(DistributionQueueDistributionStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
+ when(queue.add(any(DistributionQueueItem.class))).thenReturn(true);
- boolean returnedState = singleQueueDistributionStrategy.add(replicationPackage, queueProvider);
+ boolean returnedState = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
assertTrue(returnedState);
}
}
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/ReplicationAgentJobConsumerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/ReplicationAgentJobConsumerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/ReplicationAgentJobConsumerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java Fri Nov 7 10:28:02 2014
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.queue.impl.jobhandling;
+package org.apache.sling.distribution.queue.impl.jobhandling;
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.consumer.JobConsumer;
-import org.apache.sling.replication.queue.ReplicationQueueItem;
-import org.apache.sling.replication.queue.ReplicationQueueProcessor;
+import org.apache.sling.distribution.queue.DistributionQueueItem;
+import org.apache.sling.distribution.queue.DistributionQueueProcessor;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -31,29 +31,29 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.queue.impl.jobhandling.ReplicationAgentJobConsumer}
+ * Testcase for {@link DistributionAgentJobConsumer}
*/
-public class ReplicationAgentJobConsumerTest {
+public class DistributionAgentJobConsumerTest {
@Test
public void testJobWithSuccessfulAgent() throws Exception {
- ReplicationQueueProcessor queueProcessor = mock(ReplicationQueueProcessor.class);
- when(queueProcessor.process(anyString(), any(ReplicationQueueItem.class))).thenReturn(true);
+ DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
+ when(queueProcessor.process(anyString(), any(DistributionQueueItem.class))).thenReturn(true);
- ReplicationAgentJobConsumer replicationAgentJobConsumer = new ReplicationAgentJobConsumer(queueProcessor);
+ DistributionAgentJobConsumer distributionAgentJobConsumer = new DistributionAgentJobConsumer(queueProcessor);
Job job = mock(Job.class);
- JobConsumer.JobResult jobResult = replicationAgentJobConsumer.process(job);
+ JobConsumer.JobResult jobResult = distributionAgentJobConsumer.process(job);
assertEquals(JobConsumer.JobResult.OK, jobResult);
}
@Test
public void testJobWithUnsuccessfulAgent() throws Exception {
- ReplicationQueueProcessor queueProcessor = mock(ReplicationQueueProcessor.class);
- when(queueProcessor.process(anyString(), any(ReplicationQueueItem.class))).thenReturn(false);
+ DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
+ when(queueProcessor.process(anyString(), any(DistributionQueueItem.class))).thenReturn(false);
- ReplicationAgentJobConsumer replicationAgentJobConsumer = new ReplicationAgentJobConsumer(queueProcessor);
+ DistributionAgentJobConsumer distributionAgentJobConsumer = new DistributionAgentJobConsumer(queueProcessor);
Job job = mock(Job.class);
- JobConsumer.JobResult jobResult = replicationAgentJobConsumer.process(job);
+ JobConsumer.JobResult jobResult = distributionAgentJobConsumer.process(job);
assertEquals(JobConsumer.JobResult.FAILED, jobResult);
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueProviderTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueProviderTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueProviderTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueProviderTest.java Fri Nov 7 10:28:02 2014
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.queue.impl.jobhandling;
+package org.apache.sling.distribution.queue.impl.jobhandling;
import org.apache.sling.event.jobs.JobManager;
-import org.apache.sling.event.jobs.Queue;
import org.apache.sling.event.jobs.QueueConfiguration;
-import org.apache.sling.replication.queue.ReplicationQueue;
-import org.apache.sling.replication.queue.ReplicationQueueProcessor;
+import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueProcessor;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.service.cm.Configuration;
@@ -33,18 +32,18 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.queue.impl.jobhandling.JobHandlingReplicationQueueProvider}
+ * Testcase for {@link JobHandlingDistributionQueueProvider}
*/
-public class JobHandlingReplicationQueueProviderTest {
+public class JobHandlingDistributionQueueProviderTest {
@Test
public void testGetOrCreateNamedQueue() throws Exception {
JobManager jobManager = mock(JobManager.class);
BundleContext context = mock(BundleContext.class);
- JobHandlingReplicationQueueProvider jobHandlingReplicationQueueProvider = new JobHandlingReplicationQueueProvider("dummy-agent",
+ JobHandlingDistributionQueueProvider jobHandlingdistributionQueueProvider = new JobHandlingDistributionQueueProvider("dummy-agent",
jobManager, context);
- ReplicationQueue queue = jobHandlingReplicationQueueProvider.getQueue("default");
+ DistributionQueue queue = jobHandlingdistributionQueueProvider.getQueue("default");
assertNotNull(queue);
}
@@ -57,11 +56,11 @@ public class JobHandlingReplicationQueue
Configuration config = mock(Configuration.class);
when(configAdmin.createFactoryConfiguration(QueueConfiguration.class.getName(), null)).thenReturn(config);
BundleContext context = mock(BundleContext.class);
- JobHandlingReplicationQueueProvider jobHandlingReplicationQueueProvider = new JobHandlingReplicationQueueProvider("dummy-agent",
+ JobHandlingDistributionQueueProvider jobHandlingdistributionQueueProvider = new JobHandlingDistributionQueueProvider("dummy-agent",
jobManager, context);
String agentName = "dummy-agent";
- ReplicationQueueProcessor queueProcessor = mock(ReplicationQueueProcessor.class);
- jobHandlingReplicationQueueProvider.enableQueueProcessing(queueProcessor);
+ DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
+ jobHandlingdistributionQueueProvider.enableQueueProcessing(queueProcessor);
}
@Test
@@ -71,9 +70,9 @@ public class JobHandlingReplicationQueue
Configuration config = mock(Configuration.class);
when(configAdmin.createFactoryConfiguration(QueueConfiguration.class.getName(), null)).thenReturn(config);
BundleContext context = mock(BundleContext.class);
- JobHandlingReplicationQueueProvider jobHandlingReplicationQueueProvider = new JobHandlingReplicationQueueProvider("dummy-agent",
+ JobHandlingDistributionQueueProvider jobHandlingdistributionQueueProvider = new JobHandlingDistributionQueueProvider("dummy-agent",
jobManager, context);
String agentName = "dummy-agent";
- jobHandlingReplicationQueueProvider.disableQueueProcessing();
+ jobHandlingdistributionQueueProvider.disableQueueProcessing();
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java Fri Nov 7 10:28:02 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.queue.impl.jobhandling;
+package org.apache.sling.distribution.queue.impl.jobhandling;
import java.util.Collections;
import java.util.Map;
@@ -24,10 +24,10 @@ import java.util.Map;
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.JobBuilder;
import org.apache.sling.event.jobs.JobManager;
-import org.apache.sling.replication.queue.ReplicationQueue;
-import org.apache.sling.replication.queue.ReplicationQueueItem;
-import org.apache.sling.replication.queue.ReplicationQueueItemState;
-import org.apache.sling.replication.queue.ReplicationQueueItemState.ItemState;
+import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueItem;
+import org.apache.sling.distribution.queue.DistributionQueueItemState;
+import org.apache.sling.distribution.queue.DistributionQueueItemState.ItemState;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -39,9 +39,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link JobHandlingReplicationQueue}
+ * Testcase for {@link JobHandlingDistributionQueue}
*/
-public class JobHandlingReplicationQueueTest {
+public class JobHandlingDistributionQueueTest {
@SuppressWarnings("unchecked")
@Test
@@ -52,12 +52,12 @@ public class JobHandlingReplicationQueue
Job job = mock(Job.class);
when(job.getId()).thenReturn("id-123");
when(builder.add()).thenReturn(job);
- String topic = JobHandlingReplicationQueue.REPLICATION_QUEUE_TOPIC + "/aname";
+ String topic = JobHandlingDistributionQueue.DISTRIBUTION_QUEUE_TOPIC + "/aname";
when(jobManager.createJob(topic)).thenReturn(builder);
when(jobManager.findJobs(JobManager.QueryType.ALL, topic, -1)).thenReturn(Collections.<Job>emptySet());
when(builder.properties(any(Map.class))).thenReturn(builder);
- ReplicationQueue queue = new JobHandlingReplicationQueue("aname", topic, jobManager);
- ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
+ DistributionQueue queue = new JobHandlingDistributionQueue("aname", topic, jobManager);
+ DistributionQueueItem pkg = mock(DistributionQueueItem.class);
assertTrue(queue.add(pkg));
}
@@ -70,14 +70,14 @@ public class JobHandlingReplicationQueue
Job job = mock(Job.class);
when(job.getId()).thenReturn("id-123");
when(builder.add()).thenReturn(job);
- String topic = JobHandlingReplicationQueue.REPLICATION_QUEUE_TOPIC + "/aname";
+ String topic = JobHandlingDistributionQueue.DISTRIBUTION_QUEUE_TOPIC + "/aname";
when(jobManager.createJob(topic)).thenReturn(builder);
when(jobManager.findJobs(JobManager.QueryType.ALL, topic, -1)).thenReturn(Collections.<Job>emptySet());
when(builder.properties(any(Map.class))).thenReturn(builder);
- ReplicationQueue queue = new JobHandlingReplicationQueue("aname", topic, jobManager);
- ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
+ DistributionQueue queue = new JobHandlingDistributionQueue("aname", topic, jobManager);
+ DistributionQueueItem pkg = mock(DistributionQueueItem.class);
assertTrue(queue.add(pkg));
- ReplicationQueueItemState status = queue.getStatus(pkg);
+ DistributionQueueItemState status = queue.getStatus(pkg);
assertNotNull(status);
assertFalse(status.isSuccessful());
assertEquals(ItemState.DROPPED, status.getItemState());
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingUtilsTest.java Fri Nov 7 10:28:02 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.queue.impl.jobhandling;
+package org.apache.sling.distribution.queue.impl.jobhandling;
import java.util.Map;
-import org.apache.sling.replication.queue.ReplicationQueueItem;
+import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -34,27 +34,27 @@ import static org.mockito.Mockito.when;
public class JobHandlingUtilsTest {
@Test
public void testFullPropertiesFromPackageCreation() throws Exception {
- ReplicationQueueItem replicationQueueItem = mock(ReplicationQueueItem.class);
- when(replicationQueueItem.getAction()).thenReturn("ADD");
- when(replicationQueueItem.getId()).thenReturn("an-id");
- when(replicationQueueItem.getPaths()).thenReturn(new String[]{"/content", "/apps"});
- when(replicationQueueItem.getType()).thenReturn("vlt");
- Map<String, Object> fullPropertiesFromPackage = JobHandlingUtils.createFullProperties(replicationQueueItem);
+ DistributionQueueItem distributionQueueItem = mock(DistributionQueueItem.class);
+ when(distributionQueueItem.getAction()).thenReturn("ADD");
+ when(distributionQueueItem.getId()).thenReturn("an-id");
+ when(distributionQueueItem.getPaths()).thenReturn(new String[]{"/content", "/apps"});
+ when(distributionQueueItem.getType()).thenReturn("vlt");
+ Map<String, Object> fullPropertiesFromPackage = JobHandlingUtils.createFullProperties(distributionQueueItem);
assertNotNull(fullPropertiesFromPackage);
assertEquals(4, fullPropertiesFromPackage.size());
- assertNotNull(fullPropertiesFromPackage.get("replication.package.paths"));
- assertNotNull(fullPropertiesFromPackage.get("replication.package.id"));
- assertNotNull(fullPropertiesFromPackage.get("replication.package.type"));
- assertNotNull(fullPropertiesFromPackage.get("replication.package.action"));
+ assertNotNull(fullPropertiesFromPackage.get("distribution.package.paths"));
+ assertNotNull(fullPropertiesFromPackage.get("distribution.package.id"));
+ assertNotNull(fullPropertiesFromPackage.get("distribution.package.type"));
+ assertNotNull(fullPropertiesFromPackage.get("distribution.package.action"));
}
@Test
public void testIdPropertiesFromPackageCreation() throws Exception {
- ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
- when(replicationPackage.getId()).thenReturn("an-id");
- Map<String, Object> idPropertiesFromPackage = JobHandlingUtils.createIdProperties(replicationPackage.getId());
+ DistributionQueueItem distributionPackage = mock(DistributionQueueItem.class);
+ when(distributionPackage.getId()).thenReturn("an-id");
+ Map<String, Object> idPropertiesFromPackage = JobHandlingUtils.createIdProperties(distributionPackage.getId());
assertNotNull(idPropertiesFromPackage);
assertEquals(1, idPropertiesFromPackage.size());
- assertNotNull(idPropertiesFromPackage.get("replication.package.id"));
+ assertNotNull(idPropertiesFromPackage.get("distribution.package.id"));
}
}
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTaskTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/ScheduledReplicationQueueProcessorTaskTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTaskTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTaskTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/ScheduledReplicationQueueProcessorTaskTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/ScheduledReplicationQueueProcessorTaskTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTaskTest.java Fri Nov 7 10:28:02 2014
@@ -16,62 +16,61 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.queue.impl.simple;
+package org.apache.sling.distribution.queue.impl.simple;
import java.util.Collection;
import java.util.LinkedList;
-import org.apache.sling.replication.queue.ReplicationQueue;
-import org.apache.sling.replication.queue.ReplicationQueueItem;
-import org.apache.sling.replication.queue.ReplicationQueueProcessor;
-import org.apache.sling.replication.queue.ReplicationQueueProvider;
+import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueItem;
+import org.apache.sling.distribution.queue.DistributionQueueProcessor;
import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link ScheduledReplicationQueueProcessorTask}
+ * Testcase for {@link ScheduledDistributionQueueProcessorTask}
*/
-public class ScheduledReplicationQueueProcessorTaskTest {
+public class ScheduledDistributionQueueProcessorTaskTest {
@Test
public void testRunWithNoQueue() throws Exception {
- SimpleReplicationQueueProvider queueProvider = mock(SimpleReplicationQueueProvider.class);
- ReplicationQueueProcessor queueProcessor = mock(ReplicationQueueProcessor.class);
- ScheduledReplicationQueueProcessorTask scheduledReplicationQueueProcessorTask = new ScheduledReplicationQueueProcessorTask(
+ SimpleDistributionQueueProvider queueProvider = mock(SimpleDistributionQueueProvider.class);
+ DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
+ ScheduledDistributionQueueProcessorTask scheduledDistributionQueueProcessorTask = new ScheduledDistributionQueueProcessorTask(
queueProvider, queueProcessor);
- scheduledReplicationQueueProcessorTask.run();
+ scheduledDistributionQueueProcessorTask.run();
}
@Test
public void testRunWithOneEmptyQueue() throws Exception {
- SimpleReplicationQueueProvider queueProvider = mock(SimpleReplicationQueueProvider.class);
- Collection<ReplicationQueue> queues = new LinkedList<ReplicationQueue>();
- ReplicationQueue queue = mock(ReplicationQueue.class);
+ SimpleDistributionQueueProvider queueProvider = mock(SimpleDistributionQueueProvider.class);
+ Collection<DistributionQueue> queues = new LinkedList<DistributionQueue>();
+ DistributionQueue queue = mock(DistributionQueue.class);
when(queue.isEmpty()).thenReturn(true);
queues.add(queue);
when(queueProvider.getQueues()).thenReturn(queues);
- ReplicationQueueProcessor queueProcessor = mock(ReplicationQueueProcessor.class);
- ScheduledReplicationQueueProcessorTask scheduledReplicationQueueProcessorTask = new ScheduledReplicationQueueProcessorTask(
+ DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
+ ScheduledDistributionQueueProcessorTask scheduledDistributionQueueProcessorTask = new ScheduledDistributionQueueProcessorTask(
queueProvider, queueProcessor);
- scheduledReplicationQueueProcessorTask.run();
+ scheduledDistributionQueueProcessorTask.run();
}
@Test
public void testRunWithOneNonEmptyQueue() throws Exception {
- SimpleReplicationQueueProvider queueProvider = mock(SimpleReplicationQueueProvider.class);
- Collection<ReplicationQueue> queues = new LinkedList<ReplicationQueue>();
- ReplicationQueue queue = mock(ReplicationQueue.class);
+ SimpleDistributionQueueProvider queueProvider = mock(SimpleDistributionQueueProvider.class);
+ Collection<DistributionQueue> queues = new LinkedList<DistributionQueue>();
+ DistributionQueue queue = mock(DistributionQueue.class);
when(queue.isEmpty()).thenReturn(false).thenReturn(true);
- ReplicationQueueItem item = mock(ReplicationQueueItem.class);
+ DistributionQueueItem item = mock(DistributionQueueItem.class);
when(queue.getHead()).thenReturn(item);
queues.add(queue);
when(queueProvider.getQueues()).thenReturn(queues);
- ReplicationQueueProcessor queueProcessor = mock(ReplicationQueueProcessor.class);
- ScheduledReplicationQueueProcessorTask scheduledReplicationQueueProcessorTask = new ScheduledReplicationQueueProcessorTask(
+ DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
+ ScheduledDistributionQueueProcessorTask scheduledDistributionQueueProcessorTask = new ScheduledDistributionQueueProcessorTask(
queueProvider, queueProcessor);
- scheduledReplicationQueueProcessorTask.run();
+ scheduledDistributionQueueProcessorTask.run();
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueProviderTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueProviderTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueProviderTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueProviderTest.java Fri Nov 7 10:28:02 2014
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.queue.impl.simple;
+package org.apache.sling.distribution.queue.impl.simple;
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
-import org.apache.sling.replication.queue.ReplicationQueue;
-import org.apache.sling.replication.queue.ReplicationQueueProcessor;
+import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueProcessor;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -30,14 +30,14 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.queue.impl.simple.SimpleReplicationQueueProvider}
+ * Testcase for {@link SimpleDistributionQueueProvider}
*/
-public class SimpleReplicationQueueProviderTest {
+public class SimpleDistributionQueueProviderTest {
@Test
public void testGetOrCreateQueue() throws Exception {
- SimpleReplicationQueueProvider simpleReplicationQueueProvider = new SimpleReplicationQueueProvider(mock(Scheduler.class), "agentName");
- ReplicationQueue queue = simpleReplicationQueueProvider.getQueue("default");
+ SimpleDistributionQueueProvider simpledistributionQueueProvider = new SimpleDistributionQueueProvider(mock(Scheduler.class), "agentName");
+ DistributionQueue queue = simpledistributionQueueProvider.getQueue("default");
assertNotNull(queue);
}
@@ -50,9 +50,9 @@ public class SimpleReplicationQueueProvi
when(scheduler.NOW(-1, 10)).thenReturn(options);
when(options.canRunConcurrently(false)).thenReturn(options);
when(options.name(any(String.class))).thenReturn(options);
- SimpleReplicationQueueProvider simpleReplicationQueueProvider = new SimpleReplicationQueueProvider(scheduler, "dummy-agent");
- ReplicationQueueProcessor processor = mock(ReplicationQueueProcessor.class);
- simpleReplicationQueueProvider.enableQueueProcessing(processor);
+ SimpleDistributionQueueProvider simpledistributionQueueProvider = new SimpleDistributionQueueProvider(scheduler, "dummy-agent");
+ DistributionQueueProcessor processor = mock(DistributionQueueProcessor.class);
+ simpledistributionQueueProvider.enableQueueProcessing(processor);
}
@Test
@@ -62,7 +62,7 @@ public class SimpleReplicationQueueProvi
when(scheduler.NOW(-1, 10)).thenReturn(options);
when(options.canRunConcurrently(false)).thenReturn(options);
when(options.name(any(String.class))).thenReturn(options);
- SimpleReplicationQueueProvider simpleReplicationQueueProvider = new SimpleReplicationQueueProvider(scheduler, "dummy-agent");
- simpleReplicationQueueProvider.disableQueueProcessing();
+ SimpleDistributionQueueProvider simpledistributionQueueProvider = new SimpleDistributionQueueProvider(scheduler, "dummy-agent");
+ simpledistributionQueueProvider.disableQueueProcessing();
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java Fri Nov 7 10:28:02 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.queue.impl.simple;
+package org.apache.sling.distribution.queue.impl.simple;
-import org.apache.sling.replication.queue.ReplicationQueue;
-import org.apache.sling.replication.queue.ReplicationQueueItem;
-import org.apache.sling.replication.queue.ReplicationQueueItemState;
+import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueItem;
+import org.apache.sling.distribution.queue.DistributionQueueItemState;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -31,36 +31,36 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link SimpleReplicationQueue}
+ * Testcase for {@link SimpleDistributionQueue}
*/
-public class SimpleReplicationQueueTest {
+public class SimpleDistributionQueueTest {
@Test
public void testPackageAddition() throws Exception {
- ReplicationQueue queue = new SimpleReplicationQueue("agentName", "default");
- ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
+ DistributionQueue queue = new SimpleDistributionQueue("agentName", "default");
+ DistributionQueueItem pkg = mock(DistributionQueueItem.class);
assertTrue(queue.add(pkg));
assertFalse(queue.isEmpty());
}
@Test
public void testPackageAdditionAndRemoval() throws Exception {
- ReplicationQueue queue = new SimpleReplicationQueue("agentName", "default");
- ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
+ DistributionQueue queue = new SimpleDistributionQueue("agentName", "default");
+ DistributionQueueItem pkg = mock(DistributionQueueItem.class);
when(pkg.getId()).thenReturn("id");
assertTrue(queue.add(pkg));
assertFalse(queue.isEmpty());
queue.remove(pkg.getId());
assertTrue(queue.isEmpty());
- ReplicationQueueItemState status = queue.getStatus(pkg);
+ DistributionQueueItemState status = queue.getStatus(pkg);
assertNotNull(status);
assertTrue(status.isSuccessful());
}
@Test
public void testPackageAdditionRetrievalAndRemoval() throws Exception {
- ReplicationQueue queue = new SimpleReplicationQueue("agentName", "default");
- ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
+ DistributionQueue queue = new SimpleDistributionQueue("agentName", "default");
+ DistributionQueueItem pkg = mock(DistributionQueueItem.class);
when(pkg.getId()).thenReturn("id");
assertTrue(queue.add(pkg));
assertFalse(queue.isEmpty());
@@ -68,7 +68,7 @@ public class SimpleReplicationQueueTest
assertFalse(queue.isEmpty());
queue.remove(pkg.getId());
assertTrue(queue.isEmpty());
- ReplicationQueueItemState status = queue.getStatus(pkg);
+ DistributionQueueItemState status = queue.getStatus(pkg);
assertNotNull(status);
assertTrue(status.isSuccessful());
assertEquals(1, status.getAttempts());
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageBuilderTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageBuilderTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageBuilderTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java Fri Nov 7 10:28:02 2014
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.serialization.impl;
+package org.apache.sling.distribution.serialization.impl;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.packaging.ReplicationPackage;
-import org.apache.sling.replication.serialization.ReplicationPackageReadingException;
+import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequest;
+import org.apache.sling.distribution.packaging.DistributionPackage;
+import org.apache.sling.distribution.serialization.DistributionPackageReadingException;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -36,82 +36,82 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.serialization.impl.VoidReplicationPackageBuilder}
+ * Testcase for {@link VoidDistributionPackageBuilder}
*/
-public class VoidReplicationPackageBuilderTest {
+public class VoidDistributionPackageBuilderTest {
@Test
public void testCreatePackage() throws Exception {
- VoidReplicationPackageBuilder voidReplicationPackageBuilder = new VoidReplicationPackageBuilder();
+ VoidDistributionPackageBuilder voiddistributionPackageBuilder = new VoidDistributionPackageBuilder();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
String[] paths = new String[0];
- for (ReplicationActionType action : ReplicationActionType.values()) {
- ReplicationRequest request = mock(ReplicationRequest.class);
+ for (DistributionActionType action : DistributionActionType.values()) {
+ DistributionRequest request = mock(DistributionRequest.class);
when(request.getAction()).thenReturn(action);
when(request.getPaths()).thenReturn(paths);
when(request.getTime()).thenReturn(System.currentTimeMillis());
- ReplicationPackage replicationPackage = voidReplicationPackageBuilder.createPackage(resourceResolver, request);
- assertNotNull(replicationPackage);
+ DistributionPackage distributionPackage = voiddistributionPackageBuilder.createPackage(resourceResolver, request);
+ assertNotNull(distributionPackage);
}
}
@Test
public void testReadPackageWithEmptyStream() throws Exception {
try {
- VoidReplicationPackageBuilder voidReplicationPackageBuilder = new VoidReplicationPackageBuilder();
+ VoidDistributionPackageBuilder voiddistributionPackageBuilder = new VoidDistributionPackageBuilder();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
InputStream stream = mock(InputStream.class);
- voidReplicationPackageBuilder.readPackage(resourceResolver, stream);
+ voiddistributionPackageBuilder.readPackage(resourceResolver, stream);
fail("an empty stream should not generate a void package");
- } catch (ReplicationPackageReadingException e) {
+ } catch (DistributionPackageReadingException e) {
// expected to fail
}
}
@Test
public void testReadPackageWithAnotherStream() throws Exception {
- VoidReplicationPackageBuilder voidReplicationPackageBuilder = new VoidReplicationPackageBuilder();
+ VoidDistributionPackageBuilder voiddistributionPackageBuilder = new VoidDistributionPackageBuilder();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
InputStream stream = new ByteArrayInputStream("some words".getBytes("UTF-8"));
- ReplicationPackage replicationPackage = voidReplicationPackageBuilder.readPackage(resourceResolver, stream);
- assertNull(replicationPackage);
+ DistributionPackage distributionPackage = voiddistributionPackageBuilder.readPackage(resourceResolver, stream);
+ assertNull(distributionPackage);
}
@Test
public void testReadPackageWithValidStream() throws Exception {
- VoidReplicationPackageBuilder voidReplicationPackageBuilder = new VoidReplicationPackageBuilder();
+ VoidDistributionPackageBuilder voiddistributionPackageBuilder = new VoidDistributionPackageBuilder();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- for (ReplicationActionType action : ReplicationActionType.values()) {
- ReplicationRequest request = new ReplicationRequest(action, new String[]{"/"});
- InputStream stream = new VoidReplicationPackage(request).createInputStream();
- ReplicationPackage replicationPackage = voidReplicationPackageBuilder.readPackage(resourceResolver, stream);
- assertNotNull(replicationPackage);
+ for (DistributionActionType action : DistributionActionType.values()) {
+ DistributionRequest request = new DistributionRequest(action, new String[]{"/"});
+ InputStream stream = new VoidDistributionPackage(request).createInputStream();
+ DistributionPackage distributionPackage = voiddistributionPackageBuilder.readPackage(resourceResolver, stream);
+ assertNotNull(distributionPackage);
}
}
@Test
public void testGetNonExistingPackage() throws Exception {
- VoidReplicationPackageBuilder voidReplicationPackageBuilder = new VoidReplicationPackageBuilder();
+ VoidDistributionPackageBuilder voiddistributionPackageBuilder = new VoidDistributionPackageBuilder();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationPackage replicationPackage = voidReplicationPackageBuilder.getPackage(resourceResolver, "missing-id");
- assertNull(replicationPackage);
+ DistributionPackage distributionPackage = voiddistributionPackageBuilder.getPackage(resourceResolver, "missing-id");
+ assertNull(distributionPackage);
}
@Test
public void testGetMatchingIdPackage() throws Exception {
- VoidReplicationPackageBuilder voidReplicationPackageBuilder = new VoidReplicationPackageBuilder();
+ VoidDistributionPackageBuilder voiddistributionPackageBuilder = new VoidDistributionPackageBuilder();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- String id = new VoidReplicationPackage(new ReplicationRequest(ReplicationActionType.DELETE, new String[]{"/"})).getId();
- ReplicationPackage replicationPackage = voidReplicationPackageBuilder.getPackage(resourceResolver, id);
- assertNotNull(replicationPackage);
+ String id = new VoidDistributionPackage(new DistributionRequest(DistributionActionType.DELETE, new String[]{"/"})).getId();
+ DistributionPackage distributionPackage = voiddistributionPackageBuilder.getPackage(resourceResolver, id);
+ assertNotNull(distributionPackage);
}
@Test
public void testInstallDummyPackage() throws Exception {
- VoidReplicationPackageBuilder voidReplicationPackageBuilder = new VoidReplicationPackageBuilder();
+ VoidDistributionPackageBuilder voiddistributionPackageBuilder = new VoidDistributionPackageBuilder();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
- boolean success = voidReplicationPackageBuilder.installPackage(resourceResolver, replicationPackage);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ boolean success = voiddistributionPackageBuilder.installPackage(resourceResolver, distributionPackage);
assertTrue(success);
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java Fri Nov 7 10:28:02 2014
@@ -16,29 +16,29 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.serialization.impl;
+package org.apache.sling.distribution.serialization.impl;
import java.io.ByteArrayInputStream;
import java.util.Arrays;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.communication.ReplicationRequest;
+import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequest;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
/**
- * Testcase for {@link VoidReplicationPackage}
+ * Testcase for {@link VoidDistributionPackage}
*/
-public class VoidReplicationPackageTest {
+public class VoidDistributionPackageTest {
@Test
public void testCreatedAndReadPackagesEquality() throws Exception {
- ReplicationRequest request = new ReplicationRequest(123l, ReplicationActionType.DELETE, "/abc");
- VoidReplicationPackage createdPackage = new VoidReplicationPackage(request);
- VoidReplicationPackage readPackage = VoidReplicationPackage.fromStream(new ByteArrayInputStream("DELETE:/abc:123:VOID".getBytes()));
+ DistributionRequest request = new DistributionRequest(123l, DistributionActionType.DELETE, "/abc");
+ VoidDistributionPackage createdPackage = new VoidDistributionPackage(request);
+ VoidDistributionPackage readPackage = VoidDistributionPackage.fromStream(new ByteArrayInputStream("DELETE:/abc:123:VOID".getBytes()));
assertEquals(createdPackage.getId(), readPackage.getId());
assertEquals(createdPackage.getAction(), readPackage.getAction());
assertEquals(createdPackage.getType(), readPackage.getType());
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java (from r1637123, 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/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageBuilderTest.java&r1=1637123&r2=1637333&rev=1637333&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/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java Fri Nov 7 10:28:02 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.serialization.impl.vlt;
+package org.apache.sling.distribution.serialization.impl.vlt;
import javax.jcr.Session;
import javax.jcr.Workspace;
@@ -33,10 +33,10 @@ import org.apache.jackrabbit.vault.packa
import org.apache.jackrabbit.vault.packaging.Packaging;
import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.replication.communication.ReplicationActionType;
-import org.apache.sling.replication.communication.ReplicationRequest;
-import org.apache.sling.replication.event.impl.ReplicationEventFactory;
-import org.apache.sling.replication.packaging.ReplicationPackage;
+import org.apache.sling.distribution.communication.DistributionActionType;
+import org.apache.sling.distribution.communication.DistributionRequest;
+import org.apache.sling.distribution.event.impl.DistributionEventFactory;
+import org.apache.sling.distribution.packaging.DistributionPackage;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -47,9 +47,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackageBuilder}
+ * Testcase for {@link FileVaultDistributionPackageBuilder}
*/
-public class FileVaultReplicationPackageBuilderTest {
+public class FileVaultDistributionPackageBuilderTest {
@Test
public void testCreatePackageForAdd() throws Exception {
@@ -73,13 +73,13 @@ public class FileVaultReplicationPackage
when(session.getWorkspace()).thenReturn(workspace);
when(resourceResolver.adaptTo(Session.class)).thenReturn(session);
- ReplicationEventFactory eventFactory = mock(ReplicationEventFactory.class);
+ DistributionEventFactory eventFactory = mock(DistributionEventFactory.class);
- FileVaultReplicationPackageBuilder fileVaultReplicationPackageBuilder = new FileVaultReplicationPackageBuilder(
+ FileVaultDistributionPackageBuilder fileVaultdistributionPackageBuilder = new FileVaultDistributionPackageBuilder(
packaging, eventFactory);
- ReplicationRequest request = new ReplicationRequest(ReplicationActionType.ADD, new String[]{"/"});
- ReplicationPackage replicationPackage = fileVaultReplicationPackageBuilder.createPackageForAdd(resourceResolver, request);
- assertNotNull(replicationPackage);
+ DistributionRequest request = new DistributionRequest(DistributionActionType.ADD, new String[]{"/"});
+ DistributionPackage distributionPackage = fileVaultdistributionPackageBuilder.createPackageForAdd(resourceResolver, request);
+ assertNotNull(distributionPackage);
}
@Test
@@ -88,15 +88,15 @@ public class FileVaultReplicationPackage
PackageManager packageManager = mock(PackageManager.class);
when(packaging.getPackageManager()).thenReturn(packageManager);
- ReplicationEventFactory eventFactory = mock(ReplicationEventFactory.class);
+ DistributionEventFactory eventFactory = mock(DistributionEventFactory.class);
- FileVaultReplicationPackageBuilder fileVaultReplicationPackageBuilder = new FileVaultReplicationPackageBuilder(
+ FileVaultDistributionPackageBuilder fileVaultdistributionPackageBuilder = new FileVaultDistributionPackageBuilder(
packaging, eventFactory);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
InputStream stream = new ByteArrayInputStream("some binary".getBytes("UTF-8"));
- ReplicationPackage replicationPackage = fileVaultReplicationPackageBuilder.readPackageInternal(resourceResolver, stream);
- assertNull(replicationPackage);
+ DistributionPackage distributionPackage = fileVaultdistributionPackageBuilder.readPackageInternal(resourceResolver, stream);
+ assertNull(distributionPackage);
}
@Test
@@ -104,14 +104,14 @@ public class FileVaultReplicationPackage
Packaging packaging = mock(Packaging.class);
PackageManager packageManager = mock(PackageManager.class);
when(packaging.getPackageManager()).thenReturn(packageManager);
- ReplicationEventFactory eventFactory = mock(ReplicationEventFactory.class);
+ DistributionEventFactory eventFactory = mock(DistributionEventFactory.class);
- FileVaultReplicationPackageBuilder fileVaultReplicationPackageBuilder = new FileVaultReplicationPackageBuilder(
+ FileVaultDistributionPackageBuilder fileVaultdistributionPackageBuilder = new FileVaultDistributionPackageBuilder(
packaging, eventFactory);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
String id = "some-id";
- ReplicationPackage packageInternal = fileVaultReplicationPackageBuilder.getPackageInternal(resourceResolver, id);
+ DistributionPackage packageInternal = fileVaultdistributionPackageBuilder.getPackageInternal(resourceResolver, id);
assertNull(packageInternal);
}
@@ -123,9 +123,9 @@ public class FileVaultReplicationPackage
VaultPackage vaultPackage = mock(VaultPackage.class);
when(packageManager.open(tempFile)).thenReturn(vaultPackage);
when(packaging.getPackageManager()).thenReturn(packageManager);
- ReplicationEventFactory eventFactory = mock(ReplicationEventFactory.class);
+ DistributionEventFactory eventFactory = mock(DistributionEventFactory.class);
- FileVaultReplicationPackageBuilder fileVaultReplicationPackageBuilder = new FileVaultReplicationPackageBuilder(
+ FileVaultDistributionPackageBuilder fileVaultdistributionPackageBuilder = new FileVaultDistributionPackageBuilder(
packaging, eventFactory);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
@@ -135,12 +135,12 @@ public class FileVaultReplicationPackage
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(tempFile.getAbsolutePath());
- when(replicationPackage.getAction()).thenReturn(ReplicationActionType.ADD.name());
- when(replicationPackage.getPaths()).thenReturn(new String[]{"/something"});
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ when(distributionPackage.getId()).thenReturn(tempFile.getAbsolutePath());
+ when(distributionPackage.getAction()).thenReturn(DistributionActionType.ADD.name());
+ when(distributionPackage.getPaths()).thenReturn(new String[]{"/something"});
- boolean success = fileVaultReplicationPackageBuilder.installPackage(resourceResolver, replicationPackage);
+ boolean success = fileVaultdistributionPackageBuilder.installPackage(resourceResolver, distributionPackage);
assertTrue(success);
}
@@ -152,9 +152,9 @@ public class FileVaultReplicationPackage
VaultPackage vaultPackage = mock(VaultPackage.class);
when(packageManager.open(tempFile)).thenReturn(vaultPackage);
when(packaging.getPackageManager()).thenReturn(packageManager);
- ReplicationEventFactory eventFactory = mock(ReplicationEventFactory.class);
+ DistributionEventFactory eventFactory = mock(DistributionEventFactory.class);
- FileVaultReplicationPackageBuilder fileVaultReplicationPackageBuilder = new FileVaultReplicationPackageBuilder(
+ FileVaultDistributionPackageBuilder fileVaultdistributionPackageBuilder = new FileVaultDistributionPackageBuilder(
packaging, eventFactory, ImportMode.MERGE.name(), AccessControlHandling.MERGE.name());
ResourceResolver resourceResolver = mock(ResourceResolver.class);
@@ -164,12 +164,12 @@ public class FileVaultReplicationPackage
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(tempFile.getAbsolutePath());
- when(replicationPackage.getAction()).thenReturn(ReplicationActionType.ADD.name());
- when(replicationPackage.getPaths()).thenReturn(new String[]{"/something"});
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ when(distributionPackage.getId()).thenReturn(tempFile.getAbsolutePath());
+ when(distributionPackage.getAction()).thenReturn(DistributionActionType.ADD.name());
+ when(distributionPackage.getPaths()).thenReturn(new String[]{"/something"});
- boolean success = fileVaultReplicationPackageBuilder.installPackage(resourceResolver, replicationPackage);
+ boolean success = fileVaultdistributionPackageBuilder.installPackage(resourceResolver, distributionPackage);
assertTrue(success);
}
}
\ No newline at end of file
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/serialization/impl/vlt/FileVaultReplicationPackageTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageTest.java Fri Nov 7 10:28:02 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.serialization.impl.vlt;
+package org.apache.sling.distribution.serialization.impl.vlt;
import java.io.File;
@@ -28,9 +28,9 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.serialization.impl.vlt.FileVaultReplicationPackage}
+ * Testcase for {@link FileVaultDistributionPackage}
*/
-public class FileVaultReplicationPackageTest {
+public class FileVaultDistributionPackageTest {
@Test
public void testGetId() throws Exception {
@@ -38,8 +38,8 @@ public class FileVaultReplicationPackage
File file = mock(File.class);
when(file.getAbsolutePath()).thenReturn("/path/to/file.txt");
when(vaultPackage.getFile()).thenReturn(file);
- FileVaultReplicationPackage fileVaultReplicationPackage = new FileVaultReplicationPackage(vaultPackage);
- assertNotNull(fileVaultReplicationPackage.getId());
+ FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
+ assertNotNull(fileVaultdistributionPackage.getId());
}
@Test
@@ -48,8 +48,8 @@ public class FileVaultReplicationPackage
File file = mock(File.class);
when(file.getAbsolutePath()).thenReturn("/path/to/file.txt");
when(vaultPackage.getFile()).thenReturn(file);
- FileVaultReplicationPackage fileVaultReplicationPackage = new FileVaultReplicationPackage(vaultPackage);
- assertNotNull(fileVaultReplicationPackage.getPaths());
+ FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
+ assertNotNull(fileVaultdistributionPackage.getPaths());
}
@Test
@@ -57,8 +57,8 @@ public class FileVaultReplicationPackage
VaultPackage vaultPackage = mock(VaultPackage.class);
File file = File.createTempFile("sample","txt");
when(vaultPackage.getFile()).thenReturn(file);
- FileVaultReplicationPackage fileVaultReplicationPackage = new FileVaultReplicationPackage(vaultPackage);
- assertNotNull(fileVaultReplicationPackage.createInputStream());
+ FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
+ assertNotNull(fileVaultdistributionPackage.createInputStream());
}
@Test
@@ -67,8 +67,8 @@ public class FileVaultReplicationPackage
File file = mock(File.class);
when(file.getAbsolutePath()).thenReturn("/path/to/file.txt");
when(vaultPackage.getFile()).thenReturn(file);
- FileVaultReplicationPackage fileVaultReplicationPackage = new FileVaultReplicationPackage(vaultPackage);
- assertNotNull(fileVaultReplicationPackage.getLength());
+ FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
+ assertNotNull(fileVaultdistributionPackage.getLength());
}
@Test
@@ -77,8 +77,8 @@ public class FileVaultReplicationPackage
File file = mock(File.class);
when(file.getAbsolutePath()).thenReturn("/path/to/file.txt");
when(vaultPackage.getFile()).thenReturn(file);
- FileVaultReplicationPackage fileVaultReplicationPackage = new FileVaultReplicationPackage(vaultPackage);
- assertNotNull(fileVaultReplicationPackage.getType());
+ FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
+ assertNotNull(fileVaultdistributionPackage.getType());
}
@Test
@@ -87,8 +87,8 @@ public class FileVaultReplicationPackage
File file = mock(File.class);
when(file.getAbsolutePath()).thenReturn("/path/to/file.txt");
when(vaultPackage.getFile()).thenReturn(file);
- FileVaultReplicationPackage fileVaultReplicationPackage = new FileVaultReplicationPackage(vaultPackage);
- assertNotNull(fileVaultReplicationPackage.getAction());
+ FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
+ assertNotNull(fileVaultdistributionPackage.getAction());
}
@Test
@@ -97,8 +97,8 @@ public class FileVaultReplicationPackage
File file = mock(File.class);
when(file.getAbsolutePath()).thenReturn("/path/to/file.txt");
when(vaultPackage.getFile()).thenReturn(file);
- FileVaultReplicationPackage fileVaultReplicationPackage = new FileVaultReplicationPackage(vaultPackage);
- fileVaultReplicationPackage.close();
+ FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
+ fileVaultdistributionPackage.close();
}
@Test
@@ -107,7 +107,7 @@ public class FileVaultReplicationPackage
File file = mock(File.class);
when(file.getAbsolutePath()).thenReturn("/path/to/file.txt");
when(vaultPackage.getFile()).thenReturn(file);
- FileVaultReplicationPackage fileVaultReplicationPackage = new FileVaultReplicationPackage(vaultPackage);
- fileVaultReplicationPackage.delete();
+ FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
+ fileVaultdistributionPackage.delete();
}
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/authentication/impl/RepositoryTransportAuthenticationProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/authentication/impl/RepositoryTransportAuthenticationProviderTest.java?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/authentication/impl/RepositoryTransportAuthenticationProviderTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/authentication/impl/RepositoryTransportAuthenticationProviderTest.java Fri Nov 7 10:28:02 2014
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.transport.authentication.impl;
+package org.apache.sling.distribution.transport.authentication.impl;
import javax.jcr.Session;
import javax.jcr.security.Privilege;
import org.apache.sling.jcr.api.SlingRepository;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationException;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationContext;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationException;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link org.apache.sling.replication.transport.authentication.impl.RepositoryTransportAuthenticationProvider}
+ * Testcase for {@link org.apache.sling.distribution.transport.authentication.impl.RepositoryTransportAuthenticationProvider}
*/
public class RepositoryTransportAuthenticationProviderTest {
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java?rev=1637333&r1=1637123&r2=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/authentication/impl/UserCredentialsTransportAuthenticationProviderTest.java Fri Nov 7 10:28:02 2014
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.transport.authentication.impl;
+package org.apache.sling.distribution.transport.authentication.impl;
import org.apache.http.client.fluent.Executor;
-import org.apache.sling.replication.transport.impl.ReplicationEndpoint;
-import org.apache.sling.replication.transport.authentication.TransportAuthenticationContext;
+import org.apache.sling.distribution.transport.impl.DistributionEndpoint;
+import org.apache.sling.distribution.transport.authentication.TransportAuthenticationContext;
import org.junit.Test;
import static org.junit.Assert.fail;
@@ -78,7 +78,7 @@ public class UserCredentialsTransportAut
"foo", "bar");
Executor authenticable = Executor.newInstance();
TransportAuthenticationContext context = new TransportAuthenticationContext();
- context.addAttribute("endpoint", new ReplicationEndpoint("http://www.apache.org"));
+ context.addAttribute("endpoint", new DistributionEndpoint("http://www.apache.org"));
authenticationHandler.authenticate(authenticable, context);
}
}
Copied: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandlerTest.java (from r1637123, sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandlerTest.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandlerTest.java?p2=sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandlerTest.java&p1=sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandlerTest.java&r1=1637123&r2=1637333&rev=1637333&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/core/src/test/java/org/apache/sling/replication/transport/impl/AdvancedHttpReplicationTransportHandlerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/AdvancedHttpDistributionTransportHandlerTest.java Fri Nov 7 10:28:02 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.replication.transport.impl;
+package org.apache.sling.distribution.transport.impl;
import java.util.Arrays;
@@ -27,10 +27,10 @@ import org.junit.runners.Parameterized;
import static org.junit.Assert.assertArrayEquals;
/**
- * Testcase for {@link AdvancedHttpReplicationTransportHandler}
+ * Testcase for {@link AdvancedHttpDistributionTransportHandler}
*/
@RunWith(Parameterized.class)
-public class AdvancedHttpReplicationTransportHandlerTest {
+public class AdvancedHttpDistributionTransportHandlerTest {
private final String[] inputTransportProperties;
private final String inputSelector;
@@ -62,8 +62,8 @@ public class AdvancedHttpReplicationTran
}
- public AdvancedHttpReplicationTransportHandlerTest(String[] inputTransportProperties, String inputSelector, String[] inputPaths,
- String[] outputHeaders) {
+ public AdvancedHttpDistributionTransportHandlerTest(String[] inputTransportProperties, String inputSelector, String[] inputPaths,
+ String[] outputHeaders) {
this.inputTransportProperties = inputTransportProperties;
this.inputSelector = inputSelector;
this.outputHeaders = outputHeaders;
@@ -72,7 +72,7 @@ public class AdvancedHttpReplicationTran
@Test
public void testHttpTransportProperties() {
- String[] headers = AdvancedHttpReplicationTransportHandler.getCustomizedHeaders(inputTransportProperties, inputSelector, inputPaths);
+ String[] headers = AdvancedHttpDistributionTransportHandler.getCustomizedHeaders(inputTransportProperties, inputSelector, inputPaths);
assertArrayEquals(outputHeaders, headers);
}