sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tma...@apache.org
Subject [sling-org-apache-sling-distribution-core] branch master updated: SLING-7462 - DistributionEventDistributeDistributionTriggerTest fails sporadically
Date Thu, 01 Feb 2018 15:23:22 GMT
This is an automated email from the ASF dual-hosted git repository.

tmaret pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-distribution-core.git


The following commit(s) were added to refs/heads/master by this push:
     new d50eac3  SLING-7462 - DistributionEventDistributeDistributionTriggerTest fails sporadically
d50eac3 is described below

commit d50eac320d7aaabad14c76f754a54de85b2a415d
Author: tmaret <tmaret@adobe.com>
AuthorDate: Thu Feb 1 16:23:07 2018 +0100

    SLING-7462 - DistributionEventDistributeDistributionTriggerTest fails sporadically
---
 .../sling/distribution/queue/package-info.java     | 24 +++++++++
 ...tionEventDistributeDistributionTriggerTest.java | 62 +++++++++-------------
 2 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/src/main/java/org/apache/sling/distribution/queue/package-info.java b/src/main/java/org/apache/sling/distribution/queue/package-info.java
new file mode 100644
index 0000000..70795e9
--- /dev/null
+++ b/src/main/java/org/apache/sling/distribution/queue/package-info.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+@Version("0.1.0")
+package org.apache.sling.distribution.queue;
+
+import aQute.bnd.annotation.Version;
+
diff --git a/src/test/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerTest.java
b/src/test/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerTest.java
index a9b95d8..a43d380 100644
--- a/src/test/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerTest.java
+++ b/src/test/java/org/apache/sling/distribution/trigger/impl/DistributionEventDistributeDistributionTriggerTest.java
@@ -21,7 +21,6 @@ package org.apache.sling.distribution.trigger.impl;
 import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.distribution.DistributionRequest;
 import org.apache.sling.distribution.DistributionRequestType;
-import org.apache.sling.distribution.common.DistributionException;
 import org.apache.sling.distribution.component.impl.DistributionComponentKind;
 import org.apache.sling.distribution.event.DistributionEventTopics;
 import org.apache.sling.distribution.event.impl.DefaultDistributionEventFactory;
@@ -32,16 +31,12 @@ import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
 import org.junit.Rule;
 import org.junit.Test;
 import org.osgi.framework.BundleContext;
-import org.osgi.service.event.Event;
-import org.osgi.service.event.EventHandler;
 
 import static org.mockito.Mockito.mock;
 import static org.junit.Assert.*;
-import static org.mockito.Mockito.spy;
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -81,46 +76,39 @@ public class DistributionEventDistributeDistributionTriggerTest {
 
     @Test
     public void testDistributionLoop() throws Exception {
-        final Thread self = Thread.currentThread();
 
         final AtomicInteger handled = new AtomicInteger(0);
         final Map<String, Object> infoData = new HashMap<String, Object>();
         infoData.put(DistributionPackageInfo.PROPERTY_REQUEST_PATHS, new String[] { "/foo/bar"
});
         infoData.put(DistributionPackageInfo.PROPERTY_REQUEST_TYPE, DistributionRequestType.ADD);
         final DistributionPackageInfo info = new DistributionPackageInfo("any", infoData);
+        final DistributionEventDistributeDistributionTrigger trigger = new DistributionEventDistributeDistributionTrigger("/foo",
+                osgiContext.bundleContext());
+        final DistributionEventFactory eventFactory = new DefaultDistributionEventFactory();
+        osgiContext.registerInjectActivateService(eventFactory);
+        DistributionRequestHandler testHandler = new DistributionRequestHandler() {
+            public String getName() {
+                return "test";
+            }
+
+            public DistributionComponentKind getComponentKind() {
+                return DistributionComponentKind.AGENT;
+            }
+
+            public void handle(ResourceResolver resourceResolver, DistributionRequest request)
{
+                // we simple fire an event, to cause the loop
+                eventFactory.generatePackageEvent(DistributionEventTopics.AGENT_PACKAGE_DISTRIBUTED,
+                        DistributionComponentKind.AGENT, "test", info);
+                handled.addAndGet(1);
+            }
+        };
+
+        trigger.register(testHandler);
 
         Thread testExecution = new Thread() {
             @Override public void run() {
-                try {
-                    final DistributionEventFactory eventFactory = new DefaultDistributionEventFactory();
-                    osgiContext.registerInjectActivateService(eventFactory);
-
-                    DistributionEventDistributeDistributionTrigger trigger = new DistributionEventDistributeDistributionTrigger("/foo",
-                            osgiContext.bundleContext());
-                    DistributionRequestHandler testHandler = new DistributionRequestHandler()
{
-                        public String getName() {
-                            return "test";
-                        }
-
-                        public DistributionComponentKind getComponentKind() {
-                            return DistributionComponentKind.AGENT;
-                        }
-
-                        public void handle(ResourceResolver resourceResolver, DistributionRequest
request) {
-                            // we simple fire an event, to cause the loop
-                            eventFactory.generatePackageEvent(DistributionEventTopics.AGENT_PACKAGE_DISTRIBUTED,
-                                    DistributionComponentKind.AGENT, "test", info);
-                            handled.addAndGet(1);
-                        }
-                    };
-
-                    trigger.register(testHandler);
-                    eventFactory.generatePackageEvent(DistributionEventTopics.AGENT_PACKAGE_DISTRIBUTED,
DistributionComponentKind.AGENT,
-                            "origin", info);
-                    trigger.unregister(testHandler);
-                } catch (DistributionException ex) {
-                    throw new AssertionError(ex);
-                }
+                eventFactory.generatePackageEvent(DistributionEventTopics.AGENT_PACKAGE_DISTRIBUTED,
DistributionComponentKind.AGENT,
+                        "origin", info);
             }
         };
 
@@ -130,6 +118,8 @@ public class DistributionEventDistributeDistributionTriggerTest {
         Thread.sleep(1000);
 
         testExecution.interrupt();
+        trigger.unregister(testHandler);
+
         assertEquals(1, handled.get());
     }
 }
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
tmaret@apache.org.

Mime
View raw message