sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject svn commit: r1592966 - /sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
Date Wed, 07 May 2014 10:36:40 GMT
Author: rombert
Date: Wed May  7 10:36:40 2014
New Revision: 1592966

URL: http://svn.apache.org/r1592966
Log:
SLING-3544 - Integration tests running against a live Sling Launchpad
instance

Update the ConnectionTest to wait for an externally started launchpad.

Modified:
    sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java

Modified: sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java?rev=1592966&r1=1592965&r2=1592966&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
(original)
+++ sling/trunk/tooling/ide/eclipse-test/src/org/apache/sling/ide/test/impl/ConnectionTest.java
Wed May  7 10:36:40 2014
@@ -23,12 +23,16 @@ import org.eclipse.debug.core.DebugPlugi
 import org.eclipse.debug.internal.core.IInternalDebugCoreConstants;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.rules.TestRule;
 import org.osgi.service.prefs.BackingStoreException;
 
 public class ConnectionTest {
 
+    private final SlingWstServer server = new SlingWstServer();
+
     @Rule
-    public SlingWstServer serverRule = new SlingWstServer();
+    public TestRule chain = RuleChain.outerRule(new ExternalSlingLaunchpad()).around(server);
 
     @Test
     public void deployBundleOnServer() throws CoreException, InterruptedException, BackingStoreException
{
@@ -39,6 +43,6 @@ public class ConnectionTest {
         debugPrefs.putBoolean(IInternalDebugCoreConstants.PREF_ENABLE_STATUS_HANDLERS, false);
         debugPrefs.flush();
 
-        serverRule.waitForServerToStart();
+        server.waitForServerToStart();
     }
 }



Mime
View raw message