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/21 15:51:52 UTC
svn commit: r1640924 [2/2] - in /sling/trunk/contrib/extensions/distribution:
api/src/main/java/org/apache/sling/distribution/agent/
api/src/main/java/org/apache/sling/distribution/communication/
api/src/main/java/org/apache/sling/distribution/componen...
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/exporter/RemoteDistributionPackageExporterTest.java Fri Nov 21 14:51:51 2014
@@ -21,6 +21,7 @@ package org.apache.sling.distribution.pa
import java.util.List;
import org.apache.sling.api.resource.ResourceResolver;
+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.DistributionPackageBuilder;
@@ -46,7 +47,7 @@ public class RemoteDistributionPackageEx
RemoteDistributionPackageExporter remotedistributionPackageExporter = new RemoteDistributionPackageExporter(
packageBuilder, authProvider, endpoints, strategy.name(), 1);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- DistributionRequest distributionRequest = mock(DistributionRequest.class);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, "/");
List<DistributionPackage> distributionPackages = remotedistributionPackageExporter.exportPackages(resourceResolver, distributionRequest);
assertNotNull(distributionPackages);
assertTrue(distributionPackages.isEmpty());
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageBuilderTest.java Fri Nov 21 14:51:51 2014
@@ -33,7 +33,6 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
/**
* Testcase for {@link VoidDistributionPackageBuilder}
@@ -46,11 +45,8 @@ public class VoidDistributionPackageBuil
ResourceResolver resourceResolver = mock(ResourceResolver.class);
String[] paths = new String[0];
for (DistributionActionType action : DistributionActionType.values()) {
- DistributionRequest request = mock(DistributionRequest.class);
- when(request.getActionType()).thenReturn(action);
- when(request.getPaths()).thenReturn(paths);
- when(request.getTime()).thenReturn(System.currentTimeMillis());
- DistributionPackage distributionPackage = voiddistributionPackageBuilder.createPackage(resourceResolver, request);
+ DistributionRequest distributionRequest = new DistributionRequest(action, paths);
+ DistributionPackage distributionPackage = voiddistributionPackageBuilder.createPackage(resourceResolver, distributionRequest);
assertNotNull(distributionPackage);
}
}
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/VoidDistributionPackageTest.java Fri Nov 21 14:51:51 2014
@@ -41,7 +41,7 @@ public class VoidDistributionPackageTest
VoidDistributionPackage createdPackage = new VoidDistributionPackage(request);
VoidDistributionPackage readPackage = VoidDistributionPackage.fromStream(new ByteArrayInputStream(("DELETE:/abc:" + time + ":VOID").getBytes()));
assertEquals(createdPackage.getId(), readPackage.getId());
- assertEquals(createdPackage.getAction(), readPackage.getAction());
+ assertEquals(createdPackage.getActionType(), readPackage.getActionType());
assertEquals(createdPackage.getType(), readPackage.getType());
assertEquals(createdPackage.getLength(), readPackage.getLength());
assertEquals(Arrays.toString(createdPackage.getPaths()), Arrays.toString(readPackage.getPaths()));
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.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?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageBuilderTest.java Fri Nov 21 14:51:51 2014
@@ -137,7 +137,7 @@ public class FileVaultDistributionPackag
when(resourceResolver.adaptTo(Session.class)).thenReturn(session);
DistributionPackage distributionPackage = mock(DistributionPackage.class);
when(distributionPackage.getId()).thenReturn(tempFile.getAbsolutePath());
- when(distributionPackage.getAction()).thenReturn(DistributionActionType.ADD.name());
+ when(distributionPackage.getActionType()).thenReturn(DistributionActionType.ADD.name());
when(distributionPackage.getPaths()).thenReturn(new String[]{"/something"});
boolean success = fileVaultdistributionPackageBuilder.installPackage(resourceResolver, distributionPackage);
@@ -166,7 +166,7 @@ public class FileVaultDistributionPackag
when(resourceResolver.adaptTo(Session.class)).thenReturn(session);
DistributionPackage distributionPackage = mock(DistributionPackage.class);
when(distributionPackage.getId()).thenReturn(tempFile.getAbsolutePath());
- when(distributionPackage.getAction()).thenReturn(DistributionActionType.ADD.name());
+ when(distributionPackage.getActionType()).thenReturn(DistributionActionType.ADD.name());
when(distributionPackage.getPaths()).thenReturn(new String[]{"/something"});
boolean success = fileVaultdistributionPackageBuilder.installPackage(resourceResolver, distributionPackage);
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageTest.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?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/serialization/impl/vlt/FileVaultDistributionPackageTest.java Fri Nov 21 14:51:51 2014
@@ -88,7 +88,7 @@ public class FileVaultDistributionPackag
when(file.getAbsolutePath()).thenReturn("/path/to/file.txt");
when(vaultPackage.getFile()).thenReturn(file);
FileVaultDistributionPackage fileVaultdistributionPackage = new FileVaultDistributionPackage(vaultPackage);
- assertNotNull(fileVaultdistributionPackage.getAction());
+ assertNotNull(fileVaultdistributionPackage.getActionType());
}
@Test
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/MultipleEndpointDistributionTransportHandlerTest.java Fri Nov 21 14:51:51 2014
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.sling.api.resource.ResourceResolver;
+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.transport.DistributionTransportHandler;
@@ -54,7 +55,7 @@ public class MultipleEndpointDistributio
public void testRetrievePackagesWithoutSubHandlers() throws Exception {
List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- DistributionRequest distributionRequest = mock(DistributionRequest.class);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, "/");
for (TransportEndpointStrategyType strategy : TransportEndpointStrategyType.values()) {
MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(subHandlers, strategy);
List<DistributionPackage> distributionPackages = multipleEndpointdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
@@ -82,7 +83,7 @@ public class MultipleEndpointDistributio
subHandlers.add(mock(DistributionTransportHandler.class));
subHandlers.add(mock(DistributionTransportHandler.class));
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- DistributionRequest distributionRequest = mock(DistributionRequest.class);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, "/");
for (TransportEndpointStrategyType strategy : TransportEndpointStrategyType.values()) {
MultipleEndpointDistributionTransportHandler multipleEndpointdistributionTransportHandler = new MultipleEndpointDistributionTransportHandler(subHandlers, strategy);
List<DistributionPackage> distributionPackages = multipleEndpointdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
@@ -93,7 +94,7 @@ public class MultipleEndpointDistributio
@Test
public void testRetrievePackagesWithOneReturningSubHandlerAndAllStrategy() throws Exception {
- DistributionRequest distributionRequest = mock(DistributionRequest.class);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, "/");
ResourceResolver resourceResolver = mock(ResourceResolver.class);
List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
DistributionTransportHandler handler1 = mock(DistributionTransportHandler.class);
@@ -113,7 +114,7 @@ public class MultipleEndpointDistributio
@Test
public void testRetrievePackagesWithOneEmptyOneReturningSubHandlerAndOneStrategy() throws Exception {
- DistributionRequest distributionRequest = mock(DistributionRequest.class);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, "/");
ResourceResolver resourceResolver = mock(ResourceResolver.class);
List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
subHandlers.add(mock(DistributionTransportHandler.class));
@@ -132,7 +133,7 @@ public class MultipleEndpointDistributio
@Test
public void testRetrievePackagesWithTwoReturningSubHandlersAndAllStrategy() throws Exception {
- DistributionRequest distributionRequest = mock(DistributionRequest.class);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, "/");
ResourceResolver resourceResolver = mock(ResourceResolver.class);
List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
DistributionTransportHandler handler1 = mock(DistributionTransportHandler.class);
@@ -160,7 +161,7 @@ public class MultipleEndpointDistributio
@Test
public void testRetrievePackagesWithTwoReturningSubHandlersAndOneStrategy() throws Exception {
- DistributionRequest distributionRequest = mock(DistributionRequest.class);
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, "/");
ResourceResolver resourceResolver = mock(ResourceResolver.class);
List<DistributionTransportHandler> subHandlers = new ArrayList<DistributionTransportHandler>();
DistributionTransportHandler handler1 = mock(DistributionTransportHandler.class);
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportHandlerTest.java Fri Nov 21 14:51:51 2014
@@ -66,7 +66,7 @@ public class SimpleHttpDistributionTrans
authProvider, endpoint, packageBuilder, maxNoOfPackages);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
DistributionPackage distributionPackage = mock(DistributionPackage.class);
- when(distributionPackage.getInfo()).thenReturn(mock(DistributionPackageInfo.class));
+ when(distributionPackage.getInfo()).thenReturn(new DistributionPackageInfo());
InputStream stream = mock(InputStream.class);
when(distributionPackage.createInputStream()).thenReturn(stream);
simpleHttpdistributionTransportHandler.deliverPackage(resourceResolver, distributionPackage);
@@ -117,13 +117,13 @@ public class SimpleHttpDistributionTrans
DistributionEndpoint endpoint = new DistributionEndpoint("http://127.0.0.1:8080/some/resource");
DistributionPackageBuilder packageBuilder = mock(DistributionPackageBuilder.class);
DistributionPackage distributionPackage = mock(DistributionPackage.class);
- when(distributionPackage.getInfo()).thenReturn(mock(DistributionPackageInfo.class));
+ when(distributionPackage.getInfo()).thenReturn(new DistributionPackageInfo());
when(packageBuilder.readPackage(any(ResourceResolver.class), any(InputStream.class))).thenReturn(distributionPackage);
int maxNoOfPackages = 1;
SimpleHttpDistributionTransportHandler simpleHttpdistributionTransportHandler = new SimpleHttpDistributionTransportHandler(
authProvider, endpoint, packageBuilder, maxNoOfPackages);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, new String[]{"/"});
+ DistributionRequest distributionRequest = new DistributionRequest(DistributionActionType.ADD, "/");
List<DistributionPackage> packages = simpleHttpdistributionTransportHandler.retrievePackages(resourceResolver, distributionRequest);
assertNotNull(packages);
assertFalse(packages.isEmpty());
Modified: sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-scheduled-event.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-scheduled-event.json?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-scheduled-event.json (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/main/resources/SLING-CONTENT/libs/test/install.author/org.apache.sling.distribution.component.impl.GenericDistributionComponentFactory-trigger-test-scheduled-event.json Fri Nov 21 14:51:51 2014
@@ -6,7 +6,7 @@
"properties": [
"type=scheduledEvent",
- "action=poll",
+ "action=pull",
"seconds=30"
]
}
\ No newline at end of file
Modified: sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/it/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java Fri Nov 21 14:51:51 2014
@@ -29,6 +29,6 @@ public class ScheduledDistributionTrigge
@Test
public void testTestTriggersOnAuthor() throws Exception {
- assertResponseContains(author, triggerEventUrl("test-scheduled-event"), "POLL");
+ assertResponseContains(author, triggerEventUrl("test-scheduled-event"), "PULL");
}
}
Modified: sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json?rev=1640924&r1=1640923&r2=1640924&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json (original)
+++ sling/trunk/contrib/extensions/distribution/sample/src/main/resources/SLING-CONTENT/libs/sling/distribution/install.author/org.apache.sling.distribution.agent.impl.SimpleDistributionAgentFactory-publish-reverse.json Fri Nov 21 14:51:51 2014
@@ -26,7 +26,7 @@
"trigger": [
"scheduledTrigger/type=scheduledEvent",
- "scheduledTrigger/action=poll",
+ "scheduledTrigger/action=pull",
"scheduledTrigger/seconds=30",
"remoteTrigger/type=remoteEvent",