svn commit: r1451268 - /felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/

Thu, 28 Feb 2013 09:58:54 -0800 

Author: clement
Date: Thu Feb 28 17:58:29 2013
New Revision: 1451268

URL: http://svn.apache.org/r1451268
Log:
make composite tests more robust against slow startup time

Modified:
    
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestMultipleImport.java
    
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalImport.java
    
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalMultipleImport.java
    
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestSimpleImport.java

Modified: 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestMultipleImport.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestMultipleImport.java?rev=1451268&r1=1451267&r2=1451268&view=diff
==============================================================================
--- 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestMultipleImport.java
 (original)
+++ 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestMultipleImport.java
 Thu Feb 28 17:58:29 2013
@@ -39,6 +39,7 @@ public class TestMultipleImport extends 
 
     @Before
     public void setUp() {
+        osgiHelper.waitForService(Factory.class, 
"(factory.name=COMPO-FooProviderType-1)", 1000);
         fooProvider = ipojoHelper.getFactory("COMPO-FooProviderType-1");
         assertNotNull("Check fooProvider availability", fooProvider);
 

Modified: 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalImport.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalImport.java?rev=1451268&r1=1451267&r2=1451268&view=diff
==============================================================================
--- 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalImport.java
 (original)
+++ 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalImport.java
 Thu Feb 28 17:58:29 2013
@@ -39,6 +39,7 @@ public class TestOptionalImport extends 
 
     @Before
     public void setUp() {
+        osgiHelper.waitForService(Factory.class, 
"(factory.name=COMPO-FooProviderType-1)", 1000);
         fooProvider = ipojoHelper.getFactory("COMPO-FooProviderType-1");
         assertNotNull("Check fooProvider availability", fooProvider);
 

Modified: 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalMultipleImport.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalMultipleImport.java?rev=1451268&r1=1451267&r2=1451268&view=diff
==============================================================================
--- 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalMultipleImport.java
 (original)
+++ 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestOptionalMultipleImport.java
 Thu Feb 28 17:58:29 2013
@@ -39,6 +39,7 @@ public class TestOptionalMultipleImport 
 
     @Before
     public void setUp() {
+        osgiHelper.waitForService(Factory.class, 
"(factory.name=COMPO-FooProviderType-1)", 1000);
         fooProvider = ipojoHelper.getFactory("COMPO-FooProviderType-1");
         assertNotNull("Check fooProvider availability", fooProvider);
 

Modified: 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestSimpleImport.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestSimpleImport.java?rev=1451268&r1=1451267&r2=1451268&view=diff
==============================================================================
--- 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestSimpleImport.java
 (original)
+++ 
felix/trunk/ipojo/runtime/composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/ipojo/runtime/core/importer/TestSimpleImport.java
 Thu Feb 28 17:58:29 2013
@@ -39,6 +39,7 @@ public class TestSimpleImport extends Co
 
     @Before
     public void setUp() {
+        osgiHelper.waitForService(Factory.class, 
"(factory.name=COMPO-FooProviderType-1)", 1000);
         fooProvider = ipojoHelper.getFactory("COMPO-FooProviderType-1");
         assertNotNull("Check fooProvider availability", fooProvider);

Reply via email to