You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by mp...@apache.org on 2015/08/24 14:06:15 UTC
svn commit: r1697359 [2/2] - in
/sling/trunk/contrib/extensions/distribution/core/src:
main/java/org/apache/sling/distribution/agent/impl/
main/java/org/apache/sling/distribution/monitor/
main/java/org/apache/sling/distribution/packaging/impl/exporter/...
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=1697359&r1=1697358&r2=1697359&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 Mon Aug 24 12:06:14 2015
@@ -22,6 +22,7 @@ import java.util.Iterator;
import org.apache.sling.distribution.packaging.DistributionPackage;
import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
import org.apache.sling.distribution.queue.DistributionQueueProvider;
@@ -47,7 +48,7 @@ public class SingleQueueDistributionStra
when(queueProvider.getQueue(DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
when(queue.add(any(DistributionQueueItem.class))).thenReturn(true);
DistributionQueueItemStatus state = mock(DistributionQueueItemStatus.class);
- when(queue.getStatus(any(DistributionQueueItem.class))).thenReturn(state);
+ when(queue.getItem(any(String.class))).thenReturn(new DistributionQueueEntry(null, state));
Iterable<DistributionQueueItemStatus> returnedStates = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
assertNotNull(returnedStates);
@@ -67,8 +68,7 @@ public class SingleQueueDistributionStra
when(queueProvider.getQueue(DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
when(queue.add(queueItem)).thenReturn(true);
DistributionQueueItemStatus state = mock(DistributionQueueItemStatus.class);
- when(state.isSuccessful()).thenReturn(false);
- when(queue.getStatus(queueItem)).thenReturn(state);
+ when(queue.getItem(any(String.class))).thenReturn(new DistributionQueueEntry(queueItem, state));
Iterable<DistributionQueueItemStatus> returnedStates = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
assertNotNull(returnedStates);
Iterator<DistributionQueueItemStatus> iterator = returnedStates.iterator();
@@ -86,7 +86,7 @@ public class SingleQueueDistributionStra
when(queueProvider.getQueue(DistributionQueueDispatchingStrategy.DEFAULT_QUEUE_NAME)).thenReturn(queue);
when(queue.add(any(DistributionQueueItem.class))).thenReturn(true);
DistributionQueueItemStatus state = mock(DistributionQueueItemStatus.class);
- when(queue.getStatus(any(DistributionQueueItem.class))).thenReturn(state);
+ when(queue.getItem(any(String.class))).thenReturn(new DistributionQueueEntry(null, state));
Iterable<DistributionQueueItemStatus> returnedStates = singleQueueDistributionStrategy.add(distributionPackage, queueProvider);
assertNotNull(returnedStates);
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.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?rev=1697359&r1=1697358&r2=1697359&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/DistributionAgentJobConsumerTest.java Mon Aug 24 12:06:14 2015
@@ -18,6 +18,7 @@
*/
package org.apache.sling.distribution.queue.impl.jobhandling;
+import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueProcessor;
import org.apache.sling.event.jobs.Job;
@@ -38,7 +39,7 @@ public class DistributionAgentJobConsume
@Test
public void testJobWithSuccessfulAgent() throws Exception {
DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
- when(queueProcessor.process(anyString(), any(DistributionQueueItem.class))).thenReturn(true);
+ when(queueProcessor.process(anyString(), any(DistributionQueueEntry.class))).thenReturn(true);
DistributionAgentJobConsumer distributionAgentJobConsumer = new DistributionAgentJobConsumer(queueProcessor);
Job job = mock(Job.class);
@@ -49,7 +50,7 @@ public class DistributionAgentJobConsume
@Test
public void testJobWithUnsuccessfulAgent() throws Exception {
DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
- when(queueProcessor.process(anyString(), any(DistributionQueueItem.class))).thenReturn(false);
+ when(queueProcessor.process(anyString(), any(DistributionQueueEntry.class))).thenReturn(false);
DistributionAgentJobConsumer distributionAgentJobConsumer = new DistributionAgentJobConsumer(queueProcessor);
Job job = mock(Job.class);
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.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?rev=1697359&r1=1697358&r2=1697359&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/jobhandling/JobHandlingDistributionQueueTest.java Mon Aug 24 12:06:14 2015
@@ -25,18 +25,20 @@ import org.apache.sling.distribution.Dis
import org.apache.sling.distribution.packaging.DistributionPackageInfo;
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.DistributionQueueItemStatus;
-import org.apache.sling.distribution.queue.DistributionQueueItemStatus.ItemState;
import org.apache.sling.event.jobs.Job;
import org.apache.sling.event.jobs.JobBuilder;
import org.apache.sling.event.jobs.JobManager;
import org.junit.Test;
+
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyMap;
+import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -78,7 +80,7 @@ public class JobHandlingDistributionQueu
when(builder.add()).thenReturn(job);
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(jobManager.getJob(anyString(), anyMap())).thenReturn(job);
when(builder.properties(any(Map.class))).thenReturn(builder);
DistributionQueue queue = new JobHandlingDistributionQueue("aname", topic, jobManager, true);
DistributionPackageInfo packageInfo = new DistributionPackageInfo("type");
@@ -86,10 +88,9 @@ public class JobHandlingDistributionQueu
packageInfo.put(DistributionPackageInfo.PROPERTY_REQUEST_TYPE, DistributionRequestType.ADD);
DistributionQueueItem distributionQueueItem = new DistributionQueueItem("an-id", packageInfo);
assertTrue(queue.add(distributionQueueItem));
- DistributionQueueItemStatus status = queue.getStatus(distributionQueueItem);
+ DistributionQueueItemStatus status = queue.getItem(distributionQueueItem.getId()).getStatus();
assertNotNull(status);
- assertFalse(status.isSuccessful());
- assertEquals(ItemState.DROPPED, status.getItemState());
+ assertEquals(DistributionQueueItemState.QUEUED, status.getItemState());
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTaskTest.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?rev=1697359&r1=1697358&r2=1697359&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTaskTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/ScheduledDistributionQueueProcessorTaskTest.java Mon Aug 24 12:06:14 2015
@@ -22,8 +22,10 @@ import java.util.Collection;
import java.util.LinkedList;
import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueProcessor;
+import org.apache.sling.distribution.queue.DistributionQueueStatus;
import org.junit.Test;
import static org.mockito.Mockito.mock;
@@ -48,7 +50,7 @@ public class ScheduledDistributionQueueP
SimpleDistributionQueueProvider queueProvider = mock(SimpleDistributionQueueProvider.class);
Collection<DistributionQueue> queues = new LinkedList<DistributionQueue>();
DistributionQueue queue = mock(DistributionQueue.class);
- when(queue.isEmpty()).thenReturn(true);
+ when(queue.getHead()).thenReturn(null);
queues.add(queue);
when(queueProvider.getQueues()).thenReturn(queues);
DistributionQueueProcessor queueProcessor = mock(DistributionQueueProcessor.class);
@@ -62,9 +64,8 @@ public class ScheduledDistributionQueueP
SimpleDistributionQueueProvider queueProvider = mock(SimpleDistributionQueueProvider.class);
Collection<DistributionQueue> queues = new LinkedList<DistributionQueue>();
DistributionQueue queue = mock(DistributionQueue.class);
- when(queue.isEmpty()).thenReturn(false).thenReturn(true);
DistributionQueueItem item = mock(DistributionQueueItem.class);
- when(queue.getHead()).thenReturn(item);
+ when(queue.getHead()).thenReturn(new DistributionQueueEntry(item, null)).thenReturn(null);
queues.add(queue);
when(queueProvider.getQueues()).thenReturn(queues);
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.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?rev=1697359&r1=1697358&r2=1697359&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/simple/SimpleDistributionQueueTest.java Mon Aug 24 12:06:14 2015
@@ -19,6 +19,7 @@
package org.apache.sling.distribution.queue.impl.simple;
import org.apache.sling.distribution.queue.DistributionQueue;
+import org.apache.sling.distribution.queue.DistributionQueueEntry;
import org.apache.sling.distribution.queue.DistributionQueueItem;
import org.apache.sling.distribution.queue.DistributionQueueItemStatus;
import org.junit.Test;
@@ -26,6 +27,7 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -40,7 +42,7 @@ public class SimpleDistributionQueueTest
DistributionQueue queue = new SimpleDistributionQueue("agentName", "default");
DistributionQueueItem pkg = mock(DistributionQueueItem.class);
assertTrue(queue.add(pkg));
- assertFalse(queue.isEmpty());
+ assertFalse(queue.getStatus().isEmpty());
}
@Test
@@ -49,12 +51,11 @@ public class SimpleDistributionQueueTest
DistributionQueueItem pkg = mock(DistributionQueueItem.class);
when(pkg.getId()).thenReturn("id");
assertTrue(queue.add(pkg));
- assertFalse(queue.isEmpty());
+ assertFalse(queue.getStatus().isEmpty());
assertNotNull(queue.remove(pkg.getId()));
- assertTrue(queue.isEmpty());
- DistributionQueueItemStatus status = queue.getStatus(pkg);
- assertNotNull(status);
- assertTrue(status.isSuccessful());
+ assertTrue(queue.getStatus().isEmpty());
+ DistributionQueueEntry entry = queue.getItem(pkg.getId());
+ assertNull(entry);
}
@Test
@@ -63,14 +64,13 @@ public class SimpleDistributionQueueTest
DistributionQueueItem pkg = mock(DistributionQueueItem.class);
when(pkg.getId()).thenReturn("id");
assertTrue(queue.add(pkg));
- assertFalse(queue.isEmpty());
- assertEquals(pkg, queue.getHead());
- assertFalse(queue.isEmpty());
+ assertFalse(queue.getStatus().isEmpty());
+ assertEquals(pkg, queue.getHead().getItem());
+ assertFalse(queue.getStatus().isEmpty());
+ DistributionQueueItemStatus status = queue.getItem(pkg.getId()).getStatus();
assertNotNull(queue.remove(pkg.getId()));
- assertTrue(queue.isEmpty());
- DistributionQueueItemStatus status = queue.getStatus(pkg);
+ assertTrue(queue.getStatus().isEmpty());
assertNotNull(status);
- assertTrue(status.isSuccessful());
assertEquals(1, status.getAttempts());
}