commit 1a4d3496608bc1525e911bb1a01741a064c7a292
author Bertrand Delacretaz <bdelacretaz@apache.org> Wed Oct 15 15:24:22 2014 +0000
committer Bertrand Delacretaz <bdelacretaz@apache.org> Wed Oct 15 15:24:22 2014 +0000
tree 253478b73f8144fe4ad6df8d9b03ebc1ff44c714
parent 35330466fa2175186bc90bf9976fe61cbf54f470

SLING-4061 - fail all following tests upon even timeout, to fail the overall test faster

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1632084 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java

diff --git a/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java b/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
index 488801b..312b06b 100644
--- a/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
+++ b/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
@@ -47,6 +47,7 @@
 import org.apache.sling.launchpad.testservices.exported.FakeSlingHttpServletRequest;
 import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -69,6 +70,7 @@
     private String [] vanity;
     private static List<String> toDelete = new ArrayList<String>();
     private static ResourceResolverFactory cleanupResolverFactory;
+    private static String eventTimeoutTopic;
     
     @TestReference
     private EventsCounter eventsCounter;
@@ -88,6 +90,11 @@
      *  that signals that mappings have been updated.
      */
     private void saveMappings(Session session) throws Exception {
+        if(eventTimeoutTopic != null) {
+            // Avoid wasting a lot of time if events are not detected in timely fashion
+            fail("Event timeout (" + eventTimeoutTopic + ") detected in previous tests, failing saveMappings()");
+        }
+        
         final int oldEventsCount = eventsCounter.getEventsCount(MAPPING_EVENT_TOPIC);
         session.save();
         final long timeout = System.currentTimeMillis() + updateTimeout;
@@ -103,6 +110,7 @@
             } catch(InterruptedException ignore) {
             }
         }
+        eventTimeoutTopic = MAPPING_EVENT_TOPIC;
         fail("Timeout waiting for " + MAPPING_EVENT_TOPIC + " event, after " + updateTimeout + " msec");
     }
     
@@ -161,6 +169,12 @@
     }
 
     @AfterClass
+    @BeforeClass
+    public static void clearTimeouts() {
+        eventTimeoutTopic = null;
+    }
+    
+    @AfterClass
     public static void deleteTestNodes() throws Exception {
         final ResourceResolver resolver = cleanupResolverFactory.getAdministrativeResourceResolver(null);
         final Session session = resolver.adaptTo(Session.class);