You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by cz...@apache.org on 2015/03/15 14:53:25 UTC

svn commit: r1666800 - /sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java

Author: cziegeler
Date: Sun Mar 15 13:53:25 2015
New Revision: 1666800

URL: http://svn.apache.org/r1666800
Log:
Try to fix test case with jdk 1.6

Modified:
    sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java

Modified: sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java?rev=1666800&r1=1666799&r2=1666800&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java (original)
+++ sling/trunk/launchpad/base/src/test/java/org/apache/sling/launchpad/app/ControlListenerTest.java Sun Mar 15 13:53:25 2015
@@ -214,9 +214,11 @@ public class ControlListenerTest extends
 
         TestCase.assertEquals(0, new ControlListener(main1, null).statusServer());
         TestCase.assertEquals(0, new ControlListener(main1, null).shutdownServer());
+        delay(); // wait for sever to start
 
         TestCase.assertEquals(0, new ControlListener(main2, null).statusServer());
         TestCase.assertEquals(0, new ControlListener(main2, null).shutdownServer());
+        delay(); // wait for sever to start
 
         TestCase.assertTrue(main1.stopCalled);
         TestCase.assertTrue(main2.stopCalled);
@@ -361,6 +363,7 @@ public class ControlListenerTest extends
             });
         }
 
+        @Override
         protected void doStop() {
             this.stopCalled = true;
         }