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/01/20 18:23:52 UTC
svn commit: r1559782 [2/2] - in
/sling/trunk/contrib/extensions/replication/src:
main/java/org/apache/sling/replication/agent/
main/java/org/apache/sling/replication/agent/impl/
main/java/org/apache/sling/replication/monitor/ main/java/org/apache/sling...
Modified: sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentRootServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentRootServlet.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentRootServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentRootServlet.java Mon Jan 20 17:23:50 2014
@@ -19,6 +19,7 @@
package org.apache.sling.replication.servlet;
import java.io.IOException;
+import java.util.Collection;
import java.util.SortedSet;
import javax.servlet.Servlet;
@@ -50,7 +51,7 @@ import org.apache.sling.replication.comm
@Service(value = Servlet.class)
@Properties({
@Property(name = "sling.servlet.resourceTypes", value = ReplicationAgentResource.RESOURCE_ROOT_TYPE),
- @Property(name = "sling.servlet.methods", value = "POST")
+ @Property(name = "sling.servlet.methods", value = {"POST", "GET" })
})
public class ReplicationAgentRootServlet extends SlingAllMethodsServlet {
@@ -97,4 +98,49 @@ public class ReplicationAgentRootServlet
response.setStatus(200);
}
}
+
+
+
+ @Override
+ protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ throws ServletException, IOException {
+
+ Collection<ReplicationAgent> agents = replicationAgentsManager.getAllAvailableAgents();
+
+ response.getWriter().append(toJson(agents));
+ }
+
+ String toJson(Collection<ReplicationAgent> agents) {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("{");
+
+ sb.append("\"items\": ");
+
+ sb.append("[");
+
+ for(ReplicationAgent agent : agents) {
+ sb.append(toJson(agent));
+ sb.append(",");
+ }
+
+ if(sb.charAt(sb.length()-1) == ',')
+ sb.deleteCharAt(sb.length()-1);
+
+ sb.append("]");
+
+ sb.append("}");
+
+ return sb.toString();
+ }
+
+
+ String toJson(ReplicationAgent agent) {
+ StringBuilder sb = new StringBuilder();
+ sb.append("{");
+ sb.append("\"name\": "+ agent.getName());
+ sb.append("}");
+
+ return sb.toString();
+ }
}
Modified: sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationAgentServlet.java Mon Jan 20 17:23:50 2014
@@ -44,7 +44,6 @@ import org.apache.sling.replication.comm
import org.apache.sling.replication.communication.ReplicationHeader;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.communication.ReplicationResponse;
-import org.apache.sling.replication.queue.ReplicationQueue;
import org.apache.sling.replication.queue.ReplicationQueueItemState.ItemState;
import org.apache.sling.replication.serialization.ReplicationPackage;
import org.slf4j.Logger;
@@ -131,12 +130,11 @@ public class ReplicationAgentServlet ext
if (agent != null && (agent.getEndpoint() == null || agent.getEndpoint().toString().length() == 0 )) {
try {
// TODO : consider using queue distribution strategy and validating who's making this request
- if (log.isInfoEnabled()) {
- log.info("getting item from queue {}", queueName);
- }
- ReplicationQueue queue = agent.getQueue(queueName);
+ log.info("getting item from queue {}", queueName);
+
// get first item
- ReplicationPackage head = queue.getHead();
+ ReplicationPackage head = agent.removeHead(queueName);
+
if (head != null) {
InputStream inputStream = null;
int bytesCopied = -1;
@@ -147,23 +145,19 @@ public class ReplicationAgentServlet ext
finally {
IOUtils.closeQuietly(inputStream);
}
-
response.setHeader(ReplicationHeader.TYPE.toString(), head.getType());
- if (log.isInfoEnabled()) {
- log.info("{} bytes written into the response", bytesCopied);
- }
- // remove the item from the queue
- queue.removeHead();
+
+ // delete the package permanently
+ head.delete();
+
+ log.info("{} bytes written into the response", bytesCopied);
+
} else {
- if (log.isInfoEnabled()) {
- log.info("nothing to fetch");
- }
+ log.info("nothing to fetch");
}
} catch (Exception e) {
response.setStatus(503);
- if (log.isErrorEnabled()) {
- log.error("error while reverse replicating from agent", e);
- }
+ log.error("error while reverse replicating from agent", e);
}
// everything ok
response.setStatus(200);
Modified: sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java (original)
+++ sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/servlet/ReplicationQueueServlet.java Mon Jan 20 17:23:50 2014
@@ -21,6 +21,7 @@ package org.apache.sling.replication.ser
import java.io.IOException;
import javax.servlet.Servlet;
import javax.servlet.ServletException;
+
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Properties;
import org.apache.felix.scr.annotations.Property;
@@ -28,11 +29,16 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.api.SlingHttpServletRequest;
import org.apache.sling.api.SlingHttpServletResponse;
import org.apache.sling.api.servlets.SlingAllMethodsServlet;
+
+import org.apache.sling.replication.agent.ReplicationAgent;
import org.apache.sling.replication.agent.impl.ReplicationAgentQueueResource;
import org.apache.sling.replication.communication.ReplicationHeader;
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.serialization.ReplicationPackage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Servlet to retrieve a {@link org.apache.sling.replication.queue.ReplicationQueue} status.
@@ -42,7 +48,7 @@ import org.apache.sling.replication.seri
@Service(value = Servlet.class)
@Properties({
@Property(name = "sling.servlet.resourceTypes", value = ReplicationAgentQueueResource.RESOURCE_TYPE),
- @Property(name = "sling.servlet.methods", value = {"GET"})})
+ @Property(name = "sling.servlet.methods", value = { "GET", "POST", "DELETE" } ) })
public class ReplicationQueueServlet extends SlingAllMethodsServlet {
@Override
@@ -65,11 +71,35 @@ public class ReplicationQueueServlet ext
}
}
+
+ @Override
+ protected void doPost(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ throws ServletException, IOException {
+ @SuppressWarnings("unchecked")
+ String operation = request.getParameter(":operation");
+
+ if("delete".equals(operation)) {
+ doDelete(request, response);
+ return;
+ };
+ }
+
+
+ @Override
+ protected void doDelete(SlingHttpServletRequest request, SlingHttpServletResponse response)
+ throws ServletException, IOException {
+ ReplicationQueue queue = request.getResource().adaptTo(ReplicationQueue.class);
+
+ while(!queue.isEmpty()){
+ queue.removeHead();
+ }
+ }
+
private String toJSoN(ReplicationQueue queue) throws Exception {
StringBuilder builder = new StringBuilder("{\"name\":\"" + queue.getName() + "\",\"empty\":" + queue.isEmpty());
if (!queue.isEmpty()) {
builder.append(",\"items\":[");
- for (ReplicationPackage item : queue.getItems()) {
+ for (ReplicationQueueItem item : queue.getItems()) {
builder.append('{');
builder.append(toJSoN(item));
builder.append(',');
@@ -89,7 +119,7 @@ public class ReplicationQueueServlet ext
return "\"attempts\":" + status.getAttempts() + ",\"state\":\"" + status.getItemState().name() + "\",\"entered\":\"" + status.getEntered().getTime() + "\"";
}
- private String toJSoN(ReplicationPackage item) {
+ private String toJSoN(ReplicationQueueItem item) {
StringBuilder builder = new StringBuilder();
builder.append("\"id\":\"").append(item.getId().replace("\\", "\\\\"));
builder.append("\",\"paths\":[");
@@ -102,8 +132,7 @@ public class ReplicationQueueServlet ext
builder.append(']');
builder.append(",\"action\":\"").append(item.getAction());
builder.append("\",\"type\":\"").append(item.getType());
- builder.append("\",\"length\":").append(item.getLength());
-
+ builder.append("\"");
return builder.toString();
}
}
Modified: sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/transport/impl/PollingTransportHandler.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/transport/impl/PollingTransportHandler.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/transport/impl/PollingTransportHandler.java (original)
+++ sling/trunk/contrib/extensions/replication/src/main/java/org/apache/sling/replication/transport/impl/PollingTransportHandler.java Mon Jan 20 17:23:50 2014
@@ -98,7 +98,7 @@ public class PollingTransportHandler imp
Header typeHeader = httpResponse.getFirstHeader(ReplicationHeader.TYPE.toString());
if (entity.getContentLength() > 0) {
- replicationPackageImporter.scheduleImport(entity.getContent(), typeHeader.getValue());
+ replicationPackageImporter.importStream(entity.getContent(), typeHeader.getValue());
polls--;
if (log.isInfoEnabled()) {
log.info("scheduled import of package stream");
Modified: sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json (original)
+++ sling/trunk/contrib/extensions/replication/src/main/resources/SLING-CONTENT/libs/sling/replication/config.author/org.apache.sling.replication.agent.impl.ReplicationAgentServiceFactory-publish-reverse.json Mon Jan 20 17:23:50 2014
@@ -3,7 +3,7 @@
"name" : "publish-reverse",
"endpoint" : "http://localhost:4503/system/replication/agent/reverserepo",
"TransportHandler.target" : "(name=poll)",
- "ReplicationPackageBuilder.target" : "(name=vlt)",
+ "ReplicationPackageBuilder.target" : "(name=void)",
"ReplicationQueueProvider.target" : "(name=sjh)",
"TransportAuthenticationProviderFactory.target" : "(name=user)",
"authentication.properties" : ["user=admin","password=admin"],
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentJobConsumerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentJobConsumerTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentJobConsumerTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/ReplicationAgentJobConsumerTest.java Mon Jan 20 17:23:50 2014
@@ -2,9 +2,9 @@ package org.apache.sling.replication.age
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.consumer.JobConsumer;
-import org.apache.sling.replication.agent.ReplicationAgent;
-import org.apache.sling.replication.serialization.ReplicationPackage;
-import org.apache.sling.replication.serialization.ReplicationPackageBuilder;
+import org.apache.sling.replication.queue.ReplicationQueueItem;
+import org.apache.sling.replication.queue.ReplicationQueueProcessor;
+import org.apache.sling.replication.queue.impl.jobhandling.ReplicationAgentJobConsumer;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -13,16 +13,17 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
/**
- * Testcase for {@link ReplicationAgentJobConsumer}
+ * Testcase for {@link org.apache.sling.replication.queue.impl.jobhandling.ReplicationAgentJobConsumer}
*/
public class ReplicationAgentJobConsumerTest {
@Test
public void testJobWithSuccessfulAgent() throws Exception {
- ReplicationAgent replicationAgent = mock(ReplicationAgent.class);
- when(replicationAgent.process(any(ReplicationPackage.class))).thenReturn(true);
- ReplicationPackageBuilder packageBuilder = mock(ReplicationPackageBuilder.class);
- ReplicationAgentJobConsumer replicationAgentJobConsumer = new ReplicationAgentJobConsumer(replicationAgent, packageBuilder);
+ SimpleReplicationAgent replicationAgent = mock(SimpleReplicationAgent.class);
+ ReplicationQueueProcessor queueProcessor = mock(ReplicationQueueProcessor.class);
+ when(queueProcessor.process(any(ReplicationQueueItem.class))).thenReturn(true);
+
+ ReplicationAgentJobConsumer replicationAgentJobConsumer = new ReplicationAgentJobConsumer(replicationAgent, queueProcessor);
Job job = mock(Job.class);
JobConsumer.JobResult jobResult = replicationAgentJobConsumer.process(job);
assertEquals(JobConsumer.JobResult.OK, jobResult);
@@ -30,10 +31,11 @@ public class ReplicationAgentJobConsumer
@Test
public void testJobWithUnsuccessfulAgent() throws Exception {
- ReplicationAgent replicationAgent = mock(ReplicationAgent.class);
- when(replicationAgent.process(any(ReplicationPackage.class))).thenReturn(false);
- ReplicationPackageBuilder packageBuilder = mock(ReplicationPackageBuilder.class);
- ReplicationAgentJobConsumer replicationAgentJobConsumer = new ReplicationAgentJobConsumer(replicationAgent, packageBuilder);
+ SimpleReplicationAgent replicationAgent = mock(SimpleReplicationAgent.class);
+ ReplicationQueueProcessor queueProcessor = mock(ReplicationQueueProcessor.class);
+ when(queueProcessor.process(any(ReplicationQueueItem.class))).thenReturn(false);
+
+ ReplicationAgentJobConsumer replicationAgentJobConsumer = new ReplicationAgentJobConsumer(replicationAgent, queueProcessor);
Job job = mock(Job.class);
JobConsumer.JobResult jobResult = replicationAgentJobConsumer.process(job);
assertEquals(JobConsumer.JobResult.FAILED, jobResult);
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/agent/impl/SimpleReplicationAgentTest.java Mon Jan 20 17:23:50 2014
@@ -21,13 +21,11 @@ package org.apache.sling.replication.age
import org.apache.sling.replication.communication.ReplicationActionType;
import org.apache.sling.replication.communication.ReplicationRequest;
import org.apache.sling.replication.communication.ReplicationResponse;
-import org.apache.sling.replication.queue.ReplicationQueue;
-import org.apache.sling.replication.queue.ReplicationQueueDistributionStrategy;
-import org.apache.sling.replication.queue.ReplicationQueueItemState;
-import org.apache.sling.replication.queue.ReplicationQueueProvider;
+import org.apache.sling.replication.queue.*;
import org.apache.sling.replication.queue.impl.simple.SimpleReplicationQueue;
import org.apache.sling.replication.serialization.ReplicationPackage;
import org.apache.sling.replication.serialization.ReplicationPackageBuilder;
+import org.apache.sling.replication.queue.ReplicationQueueItem;
import org.apache.sling.replication.transport.TransportHandler;
import org.apache.sling.replication.transport.authentication.TransportAuthenticationProvider;
import org.junit.Test;
@@ -36,7 +34,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.*;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -51,12 +49,13 @@ public class SimpleReplicationAgentTest
String endpoint = "/tmp";
TransportHandler transportHandler = mock(TransportHandler.class);
ReplicationPackageBuilder packageBuilder = mock(ReplicationPackageBuilder.class);
+ when(packageBuilder.getPackage(anyString())).thenReturn(mock(ReplicationPackage.class));
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
TransportAuthenticationProvider transportAuthenticationProvider = mock(TransportAuthenticationProvider.class);
ReplicationQueueDistributionStrategy distributionHandler = mock(ReplicationQueueDistributionStrategy.class);
SimpleReplicationAgent agent = new SimpleReplicationAgent(name, endpoint, new String[0], true,
transportHandler, packageBuilder, queueProvider, transportAuthenticationProvider, distributionHandler);
- ReplicationPackage item = mock(ReplicationPackage.class);
+ ReplicationQueueItem item = mock(ReplicationQueueItem.class);
assertTrue(agent.process(item));
}
@@ -75,8 +74,6 @@ public class SimpleReplicationAgentTest
ReplicationActionType.ADD, "/");
ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
when(packageBuilder.createPackage(request)).thenReturn(replicationPackage);
- when(queueProvider.getQueue(agent, replicationPackage)).thenReturn(
- new SimpleReplicationQueue(agent, "name"));
when(queueProvider.getDefaultQueue(agent)).thenReturn(
new SimpleReplicationQueue(agent, "name"));
ReplicationResponse response = agent.execute(request);
@@ -100,10 +97,8 @@ public class SimpleReplicationAgentTest
ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
ReplicationQueueItemState state = new ReplicationQueueItemState();
state.setItemState(ReplicationQueueItemState.ItemState.SUCCEEDED);
- when(distributionHandler.add(replicationPackage, agent, queueProvider)).thenReturn(state);
+ when(distributionHandler.add(any(ReplicationQueueItem.class), eq(agent), eq(queueProvider))).thenReturn(state);
when(packageBuilder.createPackage(any(ReplicationRequest.class))).thenReturn(replicationPackage);
- when(queueProvider.getQueue(agent, replicationPackage)).thenReturn(
- new SimpleReplicationQueue(agent, "name"));
when(queueProvider.getDefaultQueue(agent)).thenReturn(
new SimpleReplicationQueue(agent, "name"));
ReplicationResponse response = agent.execute(request);
@@ -126,8 +121,6 @@ public class SimpleReplicationAgentTest
ReplicationActionType.ADD, "/");
ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
when(packageBuilder.createPackage(request)).thenReturn(replicationPackage);
- when(queueProvider.getQueue(agent, replicationPackage)).thenReturn(
- new SimpleReplicationQueue(agent, "name"));
when(queueProvider.getDefaultQueue(agent)).thenReturn(
new SimpleReplicationQueue(agent, "name"));
agent.send(request);
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheckTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheckTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheckTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/monitor/ReplicationQueueHealthCheckTest.java Mon Jan 20 17:23:50 2014
@@ -23,9 +23,9 @@ import java.util.Collections;
import java.util.LinkedList;
import org.apache.sling.hc.api.Result;
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.ReplicationQueueProvider;
-import org.apache.sling.replication.serialization.ReplicationPackage;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -72,7 +72,7 @@ public class ReplicationQueueHealthCheck
replicationQueueHealthCheck.activate(Collections.<String, Object>emptyMap());
ReplicationQueue queue = mock(ReplicationQueue.class);
- ReplicationPackage item = mock(ReplicationPackage.class);
+ ReplicationQueueItem item = mock(ReplicationQueueItem.class);
ReplicationQueueItemState status = mock(ReplicationQueueItemState.class);
when(status.getAttempts()).thenReturn(1);
when(queue.getStatus(item)).thenReturn(status);
@@ -94,7 +94,7 @@ public class ReplicationQueueHealthCheck
replicationQueueHealthCheck.activate(Collections.<String, Object>emptyMap());
ReplicationQueue queue = mock(ReplicationQueue.class);
- ReplicationPackage item = mock(ReplicationPackage.class);
+ ReplicationQueueItem item = mock(ReplicationQueueItem.class);
ReplicationQueueItemState status = mock(ReplicationQueueItemState.class);
when(status.getAttempts()).thenReturn(10);
when(queue.getStatus(item)).thenReturn(status);
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategyTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategyTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/ErrorAwareQueueDistributionStrategyTest.java Mon Jan 20 17:23:50 2014
@@ -21,9 +21,9 @@ package org.apache.sling.replication.que
import java.util.Dictionary;
import org.apache.sling.replication.agent.ReplicationAgent;
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.ReplicationQueueProvider;
-import org.apache.sling.replication.serialization.ReplicationPackage;
import org.junit.Test;
import org.osgi.service.component.ComponentContext;
@@ -43,7 +43,7 @@ public class ErrorAwareQueueDistribution
@Test
public void testPackageAdditionWithSucceedingItemDelivery() throws Exception {
ErrorAwareQueueDistributionStrategy errorAwareDistributionStrategy = new ErrorAwareQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
@@ -60,7 +60,7 @@ public class ErrorAwareQueueDistribution
@Test
public void testPackageAdditionWithFailingItemDelivery() throws Exception {
ErrorAwareQueueDistributionStrategy errorAwareDistributionStrategy = new ErrorAwareQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
@@ -83,7 +83,7 @@ public class ErrorAwareQueueDistribution
when(properties.get("stuck.handling")).thenReturn(new String[]{"ERROR"});
when(context.getProperties()).thenReturn(properties);
errorAwareDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
@@ -96,7 +96,7 @@ public class ErrorAwareQueueDistribution
ReplicationQueueItemState state = mock(ReplicationQueueItemState.class);
when(state.isSuccessful()).thenReturn(false);
when(state.getAttempts()).thenReturn(2);
- when(queue.getStatus(any(ReplicationPackage.class))).thenReturn(state);
+ when(queue.getStatus(any(ReplicationQueueItem.class))).thenReturn(state);
ReplicationQueueItemState returnedState = errorAwareDistributionStrategy.add(replicationPackage, agent, queueProvider);
assertNotNull(returnedState);
assertFalse(returnedState.isSuccessful());
@@ -111,7 +111,7 @@ public class ErrorAwareQueueDistribution
when(properties.get("stuck.handling")).thenReturn(new String[]{"DROP"});
when(context.getProperties()).thenReturn(properties);
errorAwareDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
@@ -121,7 +121,7 @@ public class ErrorAwareQueueDistribution
ReplicationQueueItemState state = mock(ReplicationQueueItemState.class);
when(state.isSuccessful()).thenReturn(false);
when(state.getAttempts()).thenReturn(2);
- when(queue.getStatus(any(ReplicationPackage.class))).thenReturn(state);
+ when(queue.getStatus(any(ReplicationQueueItem.class))).thenReturn(state);
ReplicationQueueItemState returnedState = errorAwareDistributionStrategy.add(replicationPackage, agent, queueProvider);
assertNotNull(returnedState);
assertFalse(returnedState.isSuccessful());
@@ -130,7 +130,7 @@ public class ErrorAwareQueueDistribution
@Test
public void testPackageAdditionWithNullItemStateFromTheQueue() throws Exception {
ErrorAwareQueueDistributionStrategy errorAwareDistributionStrategy = new ErrorAwareQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
@@ -143,7 +143,7 @@ public class ErrorAwareQueueDistribution
@Test
public void testPackageAdditionWithNotNullItemStateFromTheQueue() throws Exception {
ErrorAwareQueueDistributionStrategy errorAwareDistributionStrategy = new ErrorAwareQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/PriorityPathQueueDistributionStrategyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/PriorityPathQueueDistributionStrategyTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/PriorityPathQueueDistributionStrategyTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/PriorityPathQueueDistributionStrategyTest.java Mon Jan 20 17:23:50 2014
@@ -21,9 +21,9 @@ package org.apache.sling.replication.que
import java.util.Dictionary;
import org.apache.sling.replication.agent.ReplicationAgent;
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.ReplicationQueueProvider;
-import org.apache.sling.replication.serialization.ReplicationPackage;
import org.junit.Test;
import org.osgi.service.component.ComponentContext;
@@ -47,7 +47,7 @@ public class PriorityPathQueueDistributi
when(properties.get("priority.paths")).thenReturn(new String[]{"/content", "/apps"});
when(context.getProperties()).thenReturn(properties);
priorityPathDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/etc"});
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
@@ -70,7 +70,7 @@ public class PriorityPathQueueDistributi
when(properties.get("priority.paths")).thenReturn(new String[]{"/content", "/apps"});
when(context.getProperties()).thenReturn(properties);
priorityPathDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/content/sample1"});
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
@@ -93,7 +93,7 @@ public class PriorityPathQueueDistributi
when(properties.get("priority.paths")).thenReturn(new String[]{"/content", "/apps"});
when(context.getProperties()).thenReturn(properties);
priorityPathDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/etc"});
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
@@ -116,7 +116,7 @@ public class PriorityPathQueueDistributi
when(properties.get("priority.paths")).thenReturn(new String[]{"/content", "/apps"});
when(context.getProperties()).thenReturn(properties);
priorityPathDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/content/sample2"});
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
@@ -139,7 +139,7 @@ public class PriorityPathQueueDistributi
when(properties.get("priority.paths")).thenReturn(new String[]{"/content", "/apps"});
when(context.getProperties()).thenReturn(properties);
priorityPathDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/etc"});
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
@@ -158,7 +158,7 @@ public class PriorityPathQueueDistributi
when(properties.get("priority.paths")).thenReturn(new String[]{"/content", "/apps"});
when(context.getProperties()).thenReturn(properties);
priorityPathDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/apps/some/stuff"});
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
@@ -177,7 +177,7 @@ public class PriorityPathQueueDistributi
when(properties.get("priority.paths")).thenReturn(new String[]{"/content", "/apps"});
when(context.getProperties()).thenReturn(properties);
priorityPathDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/etc"});
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
@@ -198,7 +198,7 @@ public class PriorityPathQueueDistributi
when(properties.get("priority.paths")).thenReturn(new String[]{"/content", "/apps"});
when(context.getProperties()).thenReturn(properties);
priorityPathDistributionStrategy.activate(context);
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/apps"});
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/SingleQueueDistributionStrategyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/SingleQueueDistributionStrategyTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/SingleQueueDistributionStrategyTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/SingleQueueDistributionStrategyTest.java Mon Jan 20 17:23:50 2014
@@ -20,9 +20,9 @@ package org.apache.sling.replication.que
import org.apache.sling.replication.agent.ReplicationAgent;
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.ReplicationQueueProvider;
-import org.apache.sling.replication.serialization.ReplicationPackage;
import org.junit.Test;
import static org.junit.Assert.assertFalse;
@@ -40,7 +40,7 @@ public class SingleQueueDistributionStra
@Test
public void testPackageAdditionWithSucceedingItemDelivery() throws Exception {
SingleQueueDistributionStrategy singleQueueDistributionStrategy = new SingleQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
@@ -57,7 +57,7 @@ public class SingleQueueDistributionStra
@Test
public void testPackageAdditionWithFailingItemDelivery() throws Exception {
SingleQueueDistributionStrategy singleQueueDistributionStrategy = new SingleQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
@@ -74,7 +74,7 @@ public class SingleQueueDistributionStra
@Test
public void testPackageAdditionWithNullItemStateFromTheQueue() throws Exception {
SingleQueueDistributionStrategy singleQueueDistributionStrategy = new SingleQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
@@ -87,7 +87,7 @@ public class SingleQueueDistributionStra
@Test
public void testPackageAdditionWithNotNullItemStateFromTheQueue() throws Exception {
SingleQueueDistributionStrategy singleQueueDistributionStrategy = new SingleQueueDistributionStrategy();
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueueProvider queueProvider = mock(ReplicationQueueProvider.class);
ReplicationQueue queue = mock(ReplicationQueue.class);
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingReplicationQueueTest.java Mon Jan 20 17:23:50 2014
@@ -18,17 +18,15 @@
*/
package org.apache.sling.replication.queue.impl.jobhandling;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.util.Collections;
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.replication.serialization.ReplicationPackage;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -54,9 +52,7 @@ public class JobHandlingReplicationQueue
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);
- ReplicationPackage pkg = mock(ReplicationPackage.class);
- InputStream stream = new ByteArrayInputStream("rep".getBytes());
- when(pkg.createInputStream()).thenReturn(stream);
+ ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
assertTrue(queue.add(pkg));
}
@@ -70,9 +66,7 @@ public class JobHandlingReplicationQueue
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);
- ReplicationPackage pkg = mock(ReplicationPackage.class);
- InputStream stream = new ByteArrayInputStream("rep".getBytes());
- when(pkg.createInputStream()).thenReturn(stream);
+ ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
assertTrue(queue.add(pkg));
ReplicationQueueItemState status = queue.getStatus(pkg);
assertNotNull(status);
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtilsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtilsTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtilsTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/jobhandling/JobHandlingUtilsTest.java Mon Jan 20 17:23:50 2014
@@ -21,7 +21,7 @@ package org.apache.sling.replication.que
import java.io.InputStream;
import java.util.Map;
import org.apache.commons.io.IOUtils;
-import org.apache.sling.replication.serialization.ReplicationPackage;
+import org.apache.sling.replication.queue.ReplicationQueueItem;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -35,28 +35,24 @@ import static org.mockito.Mockito.when;
public class JobHandlingUtilsTest {
@Test
public void testFullPropertiesFromPackageCreation() throws Exception {
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
InputStream stream = IOUtils.toInputStream("some text");
- when(replicationPackage.createInputStream()).thenReturn(stream);
when(replicationPackage.getAction()).thenReturn("ADD");
when(replicationPackage.getId()).thenReturn("an-id");
- when(replicationPackage.getLength()).thenReturn(10l);
when(replicationPackage.getPaths()).thenReturn(new String[]{"/content", "/apps"});
when(replicationPackage.getType()).thenReturn("vlt");
Map<String,Object> fullPropertiesFromPackage = JobHandlingUtils.createFullPropertiesFromPackage(replicationPackage);
assertNotNull(fullPropertiesFromPackage);
- assertEquals(6, fullPropertiesFromPackage.size());
+ assertEquals(4, fullPropertiesFromPackage.size());
assertNotNull(fullPropertiesFromPackage.get("replication.package.paths"));
assertNotNull(fullPropertiesFromPackage.get("replication.package.id"));
- assertNotNull(fullPropertiesFromPackage.get("replication.package.length"));
- assertNotNull(fullPropertiesFromPackage.get("replication.package.stream"));
assertNotNull(fullPropertiesFromPackage.get("replication.package.type"));
assertNotNull(fullPropertiesFromPackage.get("replication.package.action"));
}
@Test
public void testIdPropertiesFromPackageCreation() throws Exception {
- ReplicationPackage replicationPackage = mock(ReplicationPackage.class);
+ ReplicationQueueItem replicationPackage = mock(ReplicationQueueItem.class);
when(replicationPackage.getId()).thenReturn("an-id");
Map<String,Object> idPropertiesFromPackage = JobHandlingUtils.createIdPropertiesFromPackage(replicationPackage);
assertNotNull(idPropertiesFromPackage);
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/queue/impl/simple/SimpleReplicationQueueTest.java Mon Jan 20 17:23:50 2014
@@ -20,8 +20,8 @@ package org.apache.sling.replication.que
import org.apache.sling.replication.agent.ReplicationAgent;
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.serialization.ReplicationPackage;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -39,7 +39,7 @@ public class SimpleReplicationQueueTest
public void testPackageAddition() throws Exception {
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueue queue = new SimpleReplicationQueue(agent, "default");
- ReplicationPackage pkg = mock(ReplicationPackage.class);
+ ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
assertTrue(queue.add(pkg));
assertFalse(queue.isEmpty());
}
@@ -48,7 +48,7 @@ public class SimpleReplicationQueueTest
public void testPackageAdditionAndRemoval() throws Exception {
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueue queue = new SimpleReplicationQueue(agent, "default");
- ReplicationPackage pkg = mock(ReplicationPackage.class);
+ ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
assertTrue(queue.add(pkg));
assertFalse(queue.isEmpty());
queue.removeHead();
@@ -62,7 +62,7 @@ public class SimpleReplicationQueueTest
public void testPackageAdditionRetrievalAndRemoval() throws Exception {
ReplicationAgent agent = mock(ReplicationAgent.class);
ReplicationQueue queue = new SimpleReplicationQueue(agent, "default");
- ReplicationPackage pkg = mock(ReplicationPackage.class);
+ ReplicationQueueItem pkg = mock(ReplicationQueueItem.class);
assertTrue(queue.add(pkg));
assertFalse(queue.isEmpty());
assertEquals(pkg, queue.getHead());
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/serialization/impl/DefaultReplicationPackageImporterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/serialization/impl/DefaultReplicationPackageImporterTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/serialization/impl/DefaultReplicationPackageImporterTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/serialization/impl/DefaultReplicationPackageImporterTest.java Mon Jan 20 17:23:50 2014
@@ -122,50 +122,50 @@ public class DefaultReplicationPackageIm
assertTrue(importer.importStream(stream, null));
}
- @Test
- public void testAsynchronousImportWithoutServices() throws Exception {
- try {
- DefaultReplicationPackageImporter importer = new DefaultReplicationPackageImporter();
- InputStream stream = new ByteArrayInputStream("something".getBytes());
- importer.scheduleImport(stream, "some-type");
- importer.scheduleImport(stream, null);
- fail("cannot work without a JobManager");
- } catch (Exception e) {
- // expected
- }
- }
-
- @Test
- public void testAsynchronousImportWithTypeParameter() throws Exception {
- DefaultReplicationPackageImporter importer = new DefaultReplicationPackageImporter();
- Field jobManagerField = importer.getClass().getDeclaredField("jobManager");
- jobManagerField.setAccessible(true);
- JobManager jobManager = mock(JobManager.class);
- JobBuilder jobBuilder = mock(JobBuilder.class);
- when(jobBuilder.properties(any(Map.class))).thenReturn(jobBuilder);
- Job job = mock(Job.class);
- when(jobBuilder.add()).thenReturn(job);
- when(jobManager.createJob("org/apache/sling/replication/import")).thenReturn(jobBuilder);
- jobManagerField.set(importer, jobManager);
-
- InputStream stream = new ByteArrayInputStream("something".getBytes());
- importer.scheduleImport(stream, "void");
- }
-
- @Test
- public void testAsynchronousImportWithoutTypeParameter() throws Exception {
- DefaultReplicationPackageImporter importer = new DefaultReplicationPackageImporter();
- Field jobManagerField = importer.getClass().getDeclaredField("jobManager");
- jobManagerField.setAccessible(true);
- JobManager jobManager = mock(JobManager.class);
- JobBuilder jobBuilder = mock(JobBuilder.class);
- when(jobBuilder.properties(any(Map.class))).thenReturn(jobBuilder);
- Job job = mock(Job.class);
- when(jobBuilder.add()).thenReturn(job);
- when(jobManager.createJob("org/apache/sling/replication/import")).thenReturn(jobBuilder);
- jobManagerField.set(importer, jobManager);
-
- InputStream stream = new ByteArrayInputStream("something".getBytes());
- importer.scheduleImport(stream, null);
- }
+// @Test
+// public void testAsynchronousImportWithoutServices() throws Exception {
+// try {
+// DefaultReplicationPackageImporter importer = new DefaultReplicationPackageImporter();
+// InputStream stream = new ByteArrayInputStream("something".getBytes());
+// importer.scheduleImport(stream, "some-type");
+// importer.scheduleImport(stream, null);
+// fail("cannot work without a JobManager");
+// } catch (Exception e) {
+// // expected
+// }
+// }
+//
+// @Test
+// public void testAsynchronousImportWithTypeParameter() throws Exception {
+// DefaultReplicationPackageImporter importer = new DefaultReplicationPackageImporter();
+// Field jobManagerField = importer.getClass().getDeclaredField("jobManager");
+// jobManagerField.setAccessible(true);
+// JobManager jobManager = mock(JobManager.class);
+// JobBuilder jobBuilder = mock(JobBuilder.class);
+// when(jobBuilder.properties(any(Map.class))).thenReturn(jobBuilder);
+// Job job = mock(Job.class);
+// when(jobBuilder.add()).thenReturn(job);
+// when(jobManager.createJob("org/apache/sling/replication/import")).thenReturn(jobBuilder);
+// jobManagerField.set(importer, jobManager);
+//
+// InputStream stream = new ByteArrayInputStream("something".getBytes());
+// importer.scheduleImport(stream, "void");
+// }
+//
+// @Test
+// public void testAsynchronousImportWithoutTypeParameter() throws Exception {
+// DefaultReplicationPackageImporter importer = new DefaultReplicationPackageImporter();
+// Field jobManagerField = importer.getClass().getDeclaredField("jobManager");
+// jobManagerField.setAccessible(true);
+// JobManager jobManager = mock(JobManager.class);
+// JobBuilder jobBuilder = mock(JobBuilder.class);
+// when(jobBuilder.properties(any(Map.class))).thenReturn(jobBuilder);
+// Job job = mock(Job.class);
+// when(jobBuilder.add()).thenReturn(job);
+// when(jobManager.createJob("org/apache/sling/replication/import")).thenReturn(jobBuilder);
+// jobManagerField.set(importer, jobManager);
+//
+// InputStream stream = new ByteArrayInputStream("something".getBytes());
+// importer.scheduleImport(stream, null);
+// }
}
Modified: sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageTest.java?rev=1559782&r1=1559781&r2=1559782&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageTest.java (original)
+++ sling/trunk/contrib/extensions/replication/src/test/java/org/apache/sling/replication/serialization/impl/VoidReplicationPackageTest.java Mon Jan 20 17:23:50 2014
@@ -37,7 +37,7 @@ public class VoidReplicationPackageTest
public void testCreatedAndReadPackagesEquality() throws Exception {
ReplicationRequest request = new ReplicationRequest(123l, ReplicationActionType.DELETE, "/abc");
VoidReplicationPackage createdPackage = new VoidReplicationPackage(request, "VOID");
- VoidReplicationPackage readPackage = VoidReplicationPackage.fromStream(new ByteArrayInputStream("DELETE:[/abc]:123".getBytes()));
+ VoidReplicationPackage readPackage = VoidReplicationPackage.fromStream(new ByteArrayInputStream("DELETE:[/abc]:123:VOID".getBytes()));
assertEquals(createdPackage.getId(), readPackage.getId());
assertEquals(createdPackage.getAction(), readPackage.getAction());
assertEquals(createdPackage.getType(), readPackage.getType());