felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1523923 - /felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
Date Tue, 17 Sep 2013 06:23:36 GMT
Author: clement
Date: Tue Sep 17 06:23:36 2013
New Revision: 1523923

URL: http://svn.apache.org/r1523923
Log:
Fix the native method test when the test probe is requiring implementation classes. 
This requirement depends on the test order, which depends on the platform. 

Modified:
    felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java

Modified: felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java?rev=1523923&r1=1523922&r2=1523923&view=diff
==============================================================================
--- felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
(original)
+++ felix/trunk/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
Tue Sep 17 06:23:36 2013
@@ -116,7 +116,11 @@ public class TestNativeMethod extends Ba
             }
         }
 
-        String clause = "";
+        // Depending on the the order, the probe bundle may already have detected requirements
on components.
+        String clause = "" +
+                "org.apache.felix.ipojo.runtime.core.components, " +
+                "org.apache.felix.ipojo.runtime.core.services, " +
+                "org.apache.felix.ipojo.runtime.core.services.A123";
         for (String export : exports) {
             if (export.length() > 0) { export += ", "; }
             clause += export;
@@ -125,7 +129,7 @@ public class TestNativeMethod extends Ba
         System.out.println("Exported packages : " + clause);
 
         InputStream inputStream = tested
-                .set(Constants.BUNDLE_SYMBOLICNAME, BaseTest.TEST_BUNDLE_SYMBOLIC_NAME)
+                .set(Constants.BUNDLE_SYMBOLICNAME, BaseTest.TEST_BUNDLE_SYMBOLIC_NAME +
"-with-native")
                 .set(Constants.IMPORT_PACKAGE, "*")
                 .set(Constants.EXPORT_PACKAGE, clause)
                 .set(Constants.BUNDLE_NATIVECODE, NATIVE_CLAUSE)



Mime
View raw message