svn commit: r1364959 - /aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java

[gnodet]

Author: gnodet
Date: Tue Jul 24 10:10:43 2012
New Revision: 1364959

URL: http://svn.apache.org/viewvc?rev=1364959&view=rev
Log:
Fix integration tests.  ManagedServiceFactories now create services 
asynchronously, so the test needs to wait a bit before checking for services

Modified:
    
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java

Modified: 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
URL: 
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java?rev=1364959&r1=1364958&r2=1364959&view=diff
==============================================================================
--- 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
 (original)
+++ 
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/TestConfigAdmin.java
 Tue Jul 24 10:10:43 2012
@@ -18,9 +18,6 @@
  */
 package org.apache.aries.blueprint.itests;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
 import java.util.Currency;
 import java.util.Hashtable;
 
@@ -36,7 +33,12 @@ import org.osgi.service.blueprint.contai
 import org.osgi.service.cm.Configuration;
 import org.osgi.service.cm.ConfigurationAdmin;
 
-import static org.apache.aries.itest.ExtraOptions.*;
+import static org.apache.aries.itest.ExtraOptions.mavenBundle;
+import static org.apache.aries.itest.ExtraOptions.paxLogging;
+import static org.apache.aries.itest.ExtraOptions.testOptions;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
 
 @RunWith(JUnit4TestRunner.class)
 public class TestConfigAdmin extends AbstractIntegrationTest {
@@ -160,7 +162,9 @@ public class TestConfigAdmin extends Abs
         
         BlueprintContainer blueprintContainer = 
Helper.getBlueprintContainerForBundle(context(), 
"org.apache.aries.blueprint.sample");
         assertNotNull(blueprintContainer);
-        
+
+//        Thread.sleep(100);
+
         // Make sure only one service is registered
         // Ask the service registry, not the container, since the container 
might have got it wrong :)
         ServiceReference[] refs = 
context().getAllServiceReferences(Foo.class.getName(), 
"(service.pid=blueprint-sample-managed-service-factory.*)");