svn commit: r1053903 - /incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java

[reto]

Author: reto
Date: Thu Dec 30 14:55:31 2010
New Revision: 1053903

URL: http://svn.apache.org/viewvc?rev=1053903&view=rev
Log:
CLEREZZA-361: waiting for service if not yet available

Modified:
    
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java

Modified: 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
URL: 
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java?rev=1053903&r1=1053902&r2=1053903&view=diff
==============================================================================
--- 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
 (original)
+++ 
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
 Thu Dec 30 14:55:31 2010
@@ -277,8 +277,7 @@ public class FelixClerezzaPlatformTest {
                }
                
bundleContext.registerService(SomeContentWebRenderingService.class.getName(),
                                new SomeContentWebRenderingService(), 
webRenderingServiceProperty);
-               ServiceReference serviceReference = 
bundleContext.getServiceReference(RenderletManager.class.getName());
-               RenderletManager renderletManager = (RenderletManager) 
bundleContext.getService(serviceReference);
+               RenderletManager renderletManager = 
waitFor(RenderletManager.class, 20000);
                
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
                                new 
UriRef(getClass().getResource("renderingServiceTest.ssp").toString()),
                                RDFListRootResource.testType, null, 
MediaType.TEXT_PLAIN_TYPE, false);
@@ -295,12 +294,12 @@ public class FelixClerezzaPlatformTest {
 
        }
 
-       private Object waitFor(Class<?> aClass, long timeout)
+       private <T> T waitFor(Class<T> aClass, long timeout)
                        throws InterruptedException {
                ServiceTracker tracker = new ServiceTracker(bundleContext,
                                aClass.getName(), null);
                tracker.open();
-               Object service = tracker.waitForService(timeout);
+               T service = (T)tracker.waitForService(timeout);
                return service;
        }