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 2016/05/31 10:56:06 UTC
svn commit: r1746263 - in
/sling/trunk/contrib/extensions/distribution/core/src:
main/java/org/apache/sling/distribution/transport/impl/
test/java/org/apache/sling/distribution/transport/impl/
Author: tommaso
Date: Tue May 31 10:56:06 2016
New Revision: 1746263
URL: http://svn.apache.org/viewvc?rev=1746263&view=rev
Log:
SLING-5752 - re-enabled SimpleHttpDistributionTransportTest
Modified:
sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java
Modified: sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java?rev=1746263&r1=1746262&r2=1746263&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/main/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransport.java Tue May 31 10:56:06 2016
@@ -124,18 +124,12 @@ public class SimpleHttpDistributionTrans
@Nullable
public RemoteDistributionPackage retrievePackage(@Nonnull ResourceResolver resourceResolver, @Nonnull DistributionRequest distributionRequest, @Nonnull DistributionTransportContext distributionContext) throws DistributionException {
log.debug("pulling from {}", distributionEndpoint.getUri());
- List<DistributionPackage> result = new ArrayList<DistributionPackage>();
-
try {
URI distributionURI = RequestUtils.appendDistributionRequest(distributionEndpoint.getUri(), distributionRequest);
- // TODO : executor should be cached and reused
-
Executor executor = getExecutor(distributionContext);
-// Request req = Request.Post(distributionURI).useExpectContinue();
-
// TODO : add queue parameter
InputStream inputStream = HttpTransportUtils.fetchNextPackage(executor, distributionURI);
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java?rev=1746263&r1=1746262&r2=1746263&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/transport/impl/SimpleHttpDistributionTransportTest.java Tue May 31 10:56:06 2016
@@ -36,11 +36,10 @@ import org.apache.sling.distribution.Dis
import org.apache.sling.distribution.SimpleDistributionRequest;
import org.apache.sling.distribution.log.impl.DefaultDistributionLog;
import org.apache.sling.distribution.serialization.DistributionPackage;
-import org.apache.sling.distribution.serialization.DistributionPackageInfo;
import org.apache.sling.distribution.serialization.DistributionPackageBuilder;
+import org.apache.sling.distribution.serialization.DistributionPackageInfo;
import org.apache.sling.distribution.transport.DistributionTransportSecret;
import org.apache.sling.distribution.transport.DistributionTransportSecretProvider;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.assertNotNull;
@@ -52,7 +51,6 @@ import static org.mockito.Mockito.when;
/**
* Testcase for {@link SimpleHttpDistributionTransport}
*/
-@Ignore
public class SimpleHttpDistributionTransportTest {
@Test
@@ -77,7 +75,10 @@ public class SimpleHttpDistributionTrans
when(distributionPackage.getInfo()).thenReturn(new DistributionPackageInfo("type"));
InputStream stream = mock(InputStream.class);
when(distributionPackage.createInputStream()).thenReturn(stream);
- simpleHttpDistributionTransport.deliverPackage(resourceResolver, distributionPackage, new DistributionTransportContext());
+ DistributionTransportContext distributionContext = mock(DistributionTransportContext.class);
+ when(distributionContext.get(any(String.class), any(Class.class))).thenReturn(executor);
+ when(distributionContext.containsKey(any(String.class))).thenReturn(true);
+ simpleHttpDistributionTransport.deliverPackage(resourceResolver, distributionPackage, distributionContext);
}
@Test
@@ -139,7 +140,11 @@ public class SimpleHttpDistributionTrans
endpoint, packageBuilder, secretProvider);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
DistributionRequest distributionRequest = new SimpleDistributionRequest(DistributionRequestType.ADD, "/");
- RemoteDistributionPackage retrievedPackage = simpleHttpDistributionTransport.retrievePackage(resourceResolver, distributionRequest, new DistributionTransportContext());
+ DistributionTransportContext distributionContext = mock(DistributionTransportContext.class);
+ when(distributionContext.get(any(String.class), any(Class.class))).thenReturn(executor);
+ when(distributionContext.containsKey(any(String.class))).thenReturn(true);
+
+ RemoteDistributionPackage retrievedPackage = simpleHttpDistributionTransport.retrievePackage(resourceResolver, distributionRequest, distributionContext);
assertNotNull(retrievedPackage);
}
}
\ No newline at end of file