Author: fmeschbe
Date: Fri Feb 14 07:41:59 2014
New Revision: 1568208
URL: http://svn.apache.org/r1568208
Log:
SLING-3391 Don't get stuck if event does not arrive
Timeout is specified in seconds not milliseconds. So asking for 5000 essentially
waits 5000 seconds or almost 1.5h for an event to not arrive
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/EventsCounterUtil.java
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java?rev=1568208r1=1568207r2=1568208view=diff
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
Fri Feb 14 07:41:59 2014
@@ -39,7 +39,7 @@ public class VanityPathTest extends Http
private String vanityUrl;
private int mappingEventCount;
public static final String MAPPING_UPDATE_TOPIC =
org/apache/sling/api/resource/ResourceResolverMapping/CHANGED;
-
+
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -168,7 +168,7 @@ public class VanityPathTest extends Http
waitForMapReload();
resetMappingEventCount();
-
+
String pathWithExtension = removeHttpBase(createdNodeUrl) + .ext;
ListNameValuePair moveParams = Arrays.asList(
new NameValuePair(:dest, pathWithExtension),
@@ -200,6 +200,6 @@ public class VanityPathTest extends Http
* before making the corresponding content changes.
*/
private void waitForMapReload() {
-EventsCounterUtil.waitForEvent(this, MAPPING_UPDATE_TOPIC, 5000,
mappingEventCount);
+EventsCounterUtil.waitForEvent(this, MAPPING_UPDATE_TOPIC, 5,
mappingEventCount);
}
}
Modified:
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/EventsCounterUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/EventsCounterUtil.java?rev=1568208r1=1568207r2=1568208view=diff
==
---
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/EventsCounterUtil.java
(original)
+++
sling/trunk/launchpad/integration-tests/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/EventsCounterUtil.java
Fri Feb 14 07:41:59 2014
@@ -33,11 +33,11 @@ public class EventsCounterUtil {
final JSONObject json = new
JSONObject(b.getContent(HttpTest.HTTP_BASE_URL + /testing/EventsCounter.json,
HttpTest.CONTENT_TYPE_JSON));
return json.has(topic) ? json.getInt(topic) : 0;
}
-
-public static void waitForEvent(final HttpTestBase b, final String topic,
int timeoutMsec, final int previousCount) {
+
+public static void waitForEvent(final HttpTestBase b, final String topic,
int timeoutSeconds, final int previousCount) {
final Condition c = new Condition() {
public String getDescription() {
-return Wait for OSGi event on topic + topic;
+return Wait for OSGi event on topic + topic;
}
public boolean isTrue() throws Exception {