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/07/29 11:57:43 UTC
svn commit: r1754497 - in /sling/trunk/contrib/extensions/distribution/core:
./ src/test/java/org/apache/sling/distribution/agent/impl/
src/test/java/org/apache/sling/distribution/packaging/impl/
src/test/java/org/apache/sling/distribution/packaging/im...
Author: tommaso
Date: Fri Jul 29 11:57:43 2016
New Revision: 1754497
URL: http://svn.apache.org/viewvc?rev=1754497&view=rev
Log:
SLING-5913 - testcode cleanup, applying patch by Simone Tripodi
Modified:
sling/trunk/contrib/extensions/distribution/core/pom.xml
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/ReferencePackageTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java
sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java
Modified: sling/trunk/contrib/extensions/distribution/core/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/pom.xml?rev=1754497&r1=1754496&r2=1754497&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/pom.xml (original)
+++ sling/trunk/contrib/extensions/distribution/core/pom.xml Fri Jul 29 11:57:43 2016
@@ -68,7 +68,9 @@
<instructions>
<Bundle-SymbolicName>org.apache.sling.distribution.core</Bundle-SymbolicName>
<Export-Package>
- org.apache.sling.distribution.util
+ org.apache.sling.distribution.util,
+ org.apache.sling.distribution.common,
+ org.apache.sling.distribution.serialization
</Export-Package>
<Import-Package>
org.apache.sling.event.jobs;version="[1.5.0,3.0)",org.apache.sling.event.jobs.consumer;version="[1.1,2)",org.apache.sling.jcr.api;version="2.2.0",*
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyTest.java?rev=1754497&r1=1754496&r2=1754497&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/agent/impl/PrivilegeDistributionRequestAuthorizationStrategyTest.java Fri Jul 29 11:57:43 2016
@@ -18,6 +18,9 @@
*/
package org.apache.sling.distribution.agent.impl;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import javax.jcr.Session;
import javax.jcr.security.AccessControlManager;
import javax.jcr.security.Privilege;
@@ -28,27 +31,18 @@ import org.apache.sling.distribution.Dis
import org.apache.sling.distribution.common.DistributionException;
import org.junit.Test;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
/**
* Tests for {@link PrivilegeDistributionRequestAuthorizationStrategy}
*/
public class PrivilegeDistributionRequestAuthorizationStrategyTest {
- @Test
+ @Test(expected = DistributionException.class)
public void testCheckPermissionWithoutSession() throws Exception {
String jcrPrivilege = "foo";
PrivilegeDistributionRequestAuthorizationStrategy strategy = new PrivilegeDistributionRequestAuthorizationStrategy(jcrPrivilege);
DistributionRequest distributionRequest = mock(DistributionRequest.class);
ResourceResolver resourceResolver = mock(ResourceResolver.class);
- try {
- strategy.checkPermission(resourceResolver, distributionRequest);
- fail("permission check should fail without a Session");
- } catch (DistributionException e) {
- // expected
- }
+ strategy.checkPermission(resourceResolver, distributionRequest);
}
@Test
@@ -62,7 +56,7 @@ public class PrivilegeDistributionReques
strategy.checkPermission(resourceResolver, distributionRequest);
}
- @Test
+ @Test(expected = DistributionException.class)
public void testNoPermissionOnAdd() throws Exception {
String jcrPrivilege = "somePermission";
PrivilegeDistributionRequestAuthorizationStrategy strategy = new PrivilegeDistributionRequestAuthorizationStrategy(jcrPrivilege);
@@ -82,12 +76,8 @@ public class PrivilegeDistributionReques
when(distributionRequest.getPaths()).thenReturn(paths);
when(distributionRequest.getRequestType()).thenReturn(DistributionRequestType.ADD);
- try {
- strategy.checkPermission(resourceResolver, distributionRequest);
- fail("should throw an exception when ACM privilege check fails");
- } catch (DistributionException e) {
- // expected
- }
+
+ strategy.checkPermission(resourceResolver, distributionRequest);
}
@Test
@@ -115,7 +105,7 @@ public class PrivilegeDistributionReques
strategy.checkPermission(resourceResolver, distributionRequest);
}
- @Test
+ @Test(expected = DistributionException.class)
public void testNoPermissionOnDelete() throws Exception {
String jcrPrivilege = "somePermission";
PrivilegeDistributionRequestAuthorizationStrategy strategy = new PrivilegeDistributionRequestAuthorizationStrategy(jcrPrivilege);
@@ -136,12 +126,8 @@ public class PrivilegeDistributionReques
when(distributionRequest.getPaths()).thenReturn(paths);
when(distributionRequest.getRequestType()).thenReturn(DistributionRequestType.DELETE);
- try {
- strategy.checkPermission(resourceResolver, distributionRequest);
- fail("should throw an exception when ACM privilege check fails");
- } catch (DistributionException e) {
- // expected
- }
+
+ strategy.checkPermission(resourceResolver, distributionRequest);
}
@Test
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/ReferencePackageTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/ReferencePackageTest.java?rev=1754497&r1=1754496&r2=1754497&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/ReferencePackageTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/ReferencePackageTest.java Fri Jul 29 11:57:43 2016
@@ -82,7 +82,9 @@ public class ReferencePackageTest {
ReferencePackage referencePackage = new ReferencePackage(distributionPackage);
assertNotNull(referencePackage);
long size = referencePackage.getSize();
- assertTrue(referencePackage.getSize() == size);
+ // failing assertion with assertEquals shows more details in the message
+ // TODO don't we already know the expetced size? this assertion is not accurate...
+ assertEquals(size, referencePackage.getSize());
}
@Test
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java?rev=1754497&r1=1754496&r2=1754497&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/packaging/impl/importer/RepositoryDistributionPackageImporterTest.java Fri Jul 29 11:57:43 2016
@@ -18,7 +18,12 @@
*/
package org.apache.sling.distribution.packaging.impl.importer;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.io.InputStream;
+
import javax.jcr.Node;
import javax.jcr.Session;
import javax.jcr.ValueFactory;
@@ -33,58 +38,43 @@ import org.apache.sling.distribution.pac
import org.apache.sling.jcr.api.SlingRepository;
import org.junit.Test;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
/**
* Testcase for {@link org.apache.sling.distribution.packaging.impl.importer.RepositoryDistributionPackageImporter}
*/
public class RepositoryDistributionPackageImporterTest {
- @Test
+ @Test(expected = DistributionException.class)
public void testImportPackageWithUnauthorizedServiceUser() throws Exception {
- try {
- SlingRepository repository = mock(SlingRepository.class);
- String serviceName = "admin";
- String path = "/var/something";
- String privilegeName = "jcr:read";
- RepositoryDistributionPackageImporter repositoryDistributionPackageImporter =
- new RepositoryDistributionPackageImporter(repository, serviceName, path, privilegeName);
- ResourceResolver resourceResolver = mock(ResourceResolver.class);
- DistributionPackage distributionPackage = mock(DistributionPackage.class);
- when(distributionPackage.getId()).thenReturn("someid");
- repositoryDistributionPackageImporter.importPackage(resourceResolver, distributionPackage);
- fail("import cannot succeed if service is user is unable to obtain a session");
- } catch (DistributionException e) {
- // expected to fail
- }
+ SlingRepository repository = mock(SlingRepository.class);
+ String serviceName = "admin";
+ String path = "/var/something";
+ String privilegeName = "jcr:read";
+ RepositoryDistributionPackageImporter repositoryDistributionPackageImporter =
+ new RepositoryDistributionPackageImporter(repository, serviceName, path, privilegeName);
+ ResourceResolver resourceResolver = mock(ResourceResolver.class);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ when(distributionPackage.getId()).thenReturn("someid");
+ repositoryDistributionPackageImporter.importPackage(resourceResolver, distributionPackage);
}
- @Test
+ @Test(expected = DistributionException.class)
public void testImportPackageWithoutRequiredPrivileges() throws Exception {
- try {
- SlingRepository repository = mock(SlingRepository.class);
- String serviceName = "admin";
- Session session = mock(Session.class);
- AccessControlManager acm = mock(AccessControlManager.class);
- String privilegeName = "jcr:read";
- Privilege privilege = mock(Privilege.class);
- when(acm.privilegeFromName(privilegeName)).thenReturn(privilege);
- when(session.getAccessControlManager()).thenReturn(acm);
- when(repository.loginService(serviceName, null)).thenReturn(session);
- String path = "/var/something";
- RepositoryDistributionPackageImporter repositoryDistributionPackageImporter =
- new RepositoryDistributionPackageImporter(repository, serviceName, path, privilegeName);
- ResourceResolver resourceResolver = mock(ResourceResolver.class);
- DistributionPackage distributionPackage = mock(DistributionPackage.class);
- when(distributionPackage.getId()).thenReturn("someid");
- repositoryDistributionPackageImporter.importPackage(resourceResolver, distributionPackage);
- fail("import cannot succeed if privileges are not sufficient");
- } catch (DistributionException e) {
- // expected to fail
- }
+ SlingRepository repository = mock(SlingRepository.class);
+ String serviceName = "admin";
+ Session session = mock(Session.class);
+ AccessControlManager acm = mock(AccessControlManager.class);
+ String privilegeName = "jcr:read";
+ Privilege privilege = mock(Privilege.class);
+ when(acm.privilegeFromName(privilegeName)).thenReturn(privilege);
+ when(session.getAccessControlManager()).thenReturn(acm);
+ when(repository.loginService(serviceName, null)).thenReturn(session);
+ String path = "/var/something";
+ RepositoryDistributionPackageImporter repositoryDistributionPackageImporter =
+ new RepositoryDistributionPackageImporter(repository, serviceName, path, privilegeName);
+ ResourceResolver resourceResolver = mock(ResourceResolver.class);
+ DistributionPackage distributionPackage = mock(DistributionPackage.class);
+ when(distributionPackage.getId()).thenReturn("someid");
+ repositoryDistributionPackageImporter.importPackage(resourceResolver, distributionPackage);
}
@Test
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java?rev=1754497&r1=1754496&r2=1754497&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/queue/impl/AsyncDeliveryDispatchingStrategyTest.java Fri Jul 29 11:57:43 2016
@@ -18,6 +18,13 @@
*/
package org.apache.sling.distribution.queue.impl;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -35,17 +42,12 @@ import org.apache.sling.distribution.que
import org.apache.sling.distribution.queue.DistributionQueueStatus;
import org.junit.Test;
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
/**
* Tests for {@link AsyncDeliveryDispatchingStrategy}
*/
public class AsyncDeliveryDispatchingStrategyTest {
- @Test
+ @Test(expected = DistributionException.class)
public void testAddWithNotSharedPackage() throws Exception {
Map<String, String> deliveryMappings = new HashMap<String, String>();
deliveryMappings.put("queue1", "delivery1");
@@ -53,12 +55,7 @@ public class AsyncDeliveryDispatchingStr
AsyncDeliveryDispatchingStrategy asyncDeliveryDispatchingStrategy = new AsyncDeliveryDispatchingStrategy(deliveryMappings);
DistributionPackage distributionPackage = mock(DistributionPackage.class);
DistributionQueueProvider queueProvider = mock(DistributionQueueProvider.class);
- try {
- asyncDeliveryDispatchingStrategy.add(distributionPackage, queueProvider);
- fail("should not be able to pass not shared packages");
- } catch (DistributionException e) {
- // expected
- }
+ asyncDeliveryDispatchingStrategy.add(distributionPackage, queueProvider);
}
@Test
Modified: sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java?rev=1754497&r1=1754496&r2=1754497&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java (original)
+++ sling/trunk/contrib/extensions/distribution/core/src/test/java/org/apache/sling/distribution/trigger/impl/ScheduledDistributionTriggerTest.java Fri Jul 29 11:57:43 2016
@@ -18,45 +18,66 @@
*/
package org.apache.sling.distribution.trigger.impl;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Collection;
+import java.util.LinkedList;
+import java.util.List;
+
import org.apache.sling.api.resource.ResourceResolverFactory;
import org.apache.sling.commons.scheduler.ScheduleOptions;
import org.apache.sling.commons.scheduler.Scheduler;
import org.apache.sling.distribution.DistributionRequestType;
import org.apache.sling.distribution.trigger.DistributionRequestHandler;
import org.junit.Test;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
/**
* Testcase for {@link ScheduledDistributionTrigger}
*/
+@RunWith(Parameterized.class)
public class ScheduledDistributionTriggerTest {
- @Test
- public void testRegister() throws Exception {
+ @Parameters
+ public static Collection<Object[]> data() {
+ List<Object[]> data = new LinkedList<Object[]>();
+
for (DistributionRequestType action : DistributionRequestType.values()) {
- String path = "/path/to/somewhere";
- int interval = 10;
- DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
- Scheduler scheduler = mock(Scheduler.class);
- ScheduleOptions options = mock(ScheduleOptions.class);
- when(scheduler.NOW(-1, interval)).thenReturn(options);
- when(options.name(handler.toString())).thenReturn(options);
- ScheduledDistributionTrigger scheduleddistributionTrigger = new ScheduledDistributionTrigger(action.name(), path, interval, null, scheduler, mock(ResourceResolverFactory.class));
- scheduleddistributionTrigger.register(handler);
+ data.add(new Object[]{ action });
}
+
+ return data;
+ }
+
+ private final DistributionRequestType action;
+
+ public ScheduledDistributionTriggerTest(DistributionRequestType action) {
+ this.action = action;
+ }
+
+ @Test
+ public void testRegister() throws Exception {
+ String path = "/path/to/somewhere";
+ int interval = 10;
+ DistributionRequestHandler handler = mock(DistributionRequestHandler.class);
+ Scheduler scheduler = mock(Scheduler.class);
+ ScheduleOptions options = mock(ScheduleOptions.class);
+ when(scheduler.NOW(-1, interval)).thenReturn(options);
+ when(options.name(handler.toString())).thenReturn(options);
+ ScheduledDistributionTrigger scheduleddistributionTrigger = new ScheduledDistributionTrigger(action.name(), path, interval, null, scheduler, mock(ResourceResolverFactory.class));
+ scheduleddistributionTrigger.register(handler);
}
@Test
public void testUnregister() throws Exception {
- for (DistributionRequestType action : DistributionRequestType.values()) {
- String path = "/path/to/somewhere";
- int interval = 10;
- Scheduler scheduler = mock(Scheduler.class);
- ScheduledDistributionTrigger scheduleddistributionTrigger = new ScheduledDistributionTrigger(action.name(), path, interval, null, scheduler, mock(ResourceResolverFactory.class));
- DistributionRequestHandler handlerId = mock(DistributionRequestHandler.class);
- scheduleddistributionTrigger.unregister(handlerId);
- }
+ String path = "/path/to/somewhere";
+ int interval = 10;
+ Scheduler scheduler = mock(Scheduler.class);
+ ScheduledDistributionTrigger scheduleddistributionTrigger = new ScheduledDistributionTrigger(action.name(), path, interval, null, scheduler, mock(ResourceResolverFactory.class));
+ DistributionRequestHandler handlerId = mock(DistributionRequestHandler.class);
+ scheduleddistributionTrigger.unregister(handlerId);
}
}
\ No newline at end of file