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.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1523923 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java b/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
index 3386a36..f832d13 100644
--- a/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
+++ b/ipojo/manipulator/manipulator-it/ipojo-manipulator-manipulation-test/src/test/java/org/apache/felix/ipojo/runtime/core/TestNativeMethod.java
@@ -116,7 +116,11 @@
}
}
- 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 @@
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)