You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ma...@apache.org on 2010/01/17 16:24:36 UTC

svn commit: r900157 - /incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java

Author: mahrwald
Date: Sun Jan 17 15:24:35 2010
New Revision: 900157

URL: http://svn.apache.org/viewvc?rev=900157&view=rev
Log:
ARIES-115 Add wait for the blueprint container to register URL handler

Modified:
    incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java

Modified: incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java?rev=900157&r1=900156&r2=900157&view=diff
==============================================================================
--- incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java (original)
+++ incubator/aries/trunk/web/web-itests/src/test/java/org/apache/aries/web/converter/itest/WabConverterITest.java Sun Jan 17 15:24:35 2010
@@ -47,7 +47,9 @@
 import org.osgi.framework.Filter;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.InvalidSyntaxException;
+import org.osgi.framework.ServiceReference;
 import org.osgi.framework.Version;
+import org.osgi.service.url.URLStreamHandlerService;
 import org.osgi.util.tracker.ServiceTracker;
 
 @RunWith(JUnit4TestRunner.class)
@@ -74,10 +76,21 @@
 
   
   @Test
-  public void getStarted() throws Exception {    
+  public void getStarted() throws Exception {
     Bundle warConverter = getBundle("org.apache.aries.web.urlhandler");
     assertEquals(Bundle.ACTIVE, warConverter.getState());
     
+    // wait for the blueprint container to do its work
+    int maxRepetition = 100;
+    while (maxRepetition-- > 0) {
+      ServiceReference[] ref = bundleContext.getServiceReferences(URLStreamHandlerService.class.getName(),
+          "(url.handler.protocol=webbundle)");
+      if (ref != null)
+        break;
+      
+      Thread.sleep(100);
+    }
+    
     File testWar = new File("test.war");
     Bundle converted = bundleContext.installBundle("webbundle:"+testWar.toURL().toExternalForm() 
         + "?Bundle-SymbolicName=test.war.bundle");