You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cl...@apache.org on 2013/09/22 20:04:21 UTC
svn commit: r1525408 - in
/felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility:
Common.java TestBeingConsumedByEquinoxSCR1_4_100.java
TestConsumingProviderUsingEquinoxSCR1_4_100.java
Author: clement
Date: Sun Sep 22 18:04:21 2013
New Revision: 1525408
URL: http://svn.apache.org/r1525408
Log:
Fix exclusion of some tests on Felix and KF (Equinox SCR works only on Equinox)
Modified:
felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java
felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java
felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java?rev=1525408&r1=1525407&r2=1525408&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/Common.java Sun Sep 22 18:04:21 2013
@@ -297,6 +297,11 @@ public abstract class Common extends Bas
}
public boolean isEquinox() {
- return FrameworkHelper.isEquinox(context) || context.toString().contains("eclipse");
+ if (context != null) {
+ return FrameworkHelper.isEquinox(context) || context.toString().contains("eclipse");
+ } else {
+ String pf = System.getProperty("pax.exam.framework");
+ return pf != null && pf.equalsIgnoreCase("equinox");
+ }
}
}
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java?rev=1525408&r1=1525407&r2=1525408&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByEquinoxSCR1_4_100.java Sun Sep 22 18:04:21 2013
@@ -43,6 +43,10 @@ public class TestBeingConsumedByEquinoxS
@Override
public Option[] bundles() {
+ // We must not deploy the Equinox DS on Felix and KF
+ if (! isEquinox()) {
+ return new Option[0];
+ }
return new Option[] {
bundle(DS_URL),
bundle(UTILS_URL),
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java?rev=1525408&r1=1525407&r2=1525408&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java Sun Sep 22 18:04:21 2013
@@ -44,6 +44,9 @@ public class TestConsumingProviderUsingE
@Override
public Option[] bundles() {
+ if (! isEquinox()) {
+ return new Option[0];
+ }
return new Option[] {
bundle(DS_URL),
bundle(UTILS_URL),