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/10/04 15:01:45 UTC
svn commit: r1529152 - in /felix/trunk/ipojo/runtime/core-it: ./
ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/
Author: clement
Date: Fri Oct 4 13:01:45 2013
New Revision: 1529152
URL: http://svn.apache.org/r1529152
Log:
Fix equinox detection in the compatibility tests.
Modified:
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/TestBeingConsumedByFelixSCR1_6_2.java
felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestConsumingProviderUsingEquinoxSCR1_4_100.java
felix/trunk/ipojo/runtime/core-it/pom.xml
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=1529152&r1=1529151&r2=1529152&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 Fri Oct 4 13:01:45 2013
@@ -61,7 +61,7 @@ public class TestBeingConsumedByEquinoxS
System.out.println("Test executed on Equinox only");
return;
}
- CheckService checker = osgiHelper.getServiceObject(CheckService.class);
+ CheckService checker = osgiHelper.waitForService(CheckService.class, null, 1000);
assertThat(checker).isNotNull();
assertThat(checker.data().get("result")).isEqualTo("hello john doe");
}
Modified: felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByFelixSCR1_6_2.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/TestBeingConsumedByFelixSCR1_6_2.java?rev=1529152&r1=1529151&r2=1529152&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByFelixSCR1_6_2.java (original)
+++ felix/trunk/ipojo/runtime/core-it/ipojo-compatibility-test/src/test/java/org/apache/felix/ipojo/test/compatibility/TestBeingConsumedByFelixSCR1_6_2.java Fri Oct 4 13:01:45 2013
@@ -50,7 +50,7 @@ public class TestBeingConsumedByFelixSCR
@Test
public void test() {
- CheckService checker = osgiHelper.getServiceObject(CheckService.class);
+ CheckService checker = osgiHelper.waitForService(CheckService.class, null, 1000);
assertThat(checker).isNotNull();
assertThat(checker.data().get("result")).isEqualTo("hello john doe");
}
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=1529152&r1=1529151&r2=1529152&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 Fri Oct 4 13:01:45 2013
@@ -22,6 +22,8 @@ package org.apache.felix.ipojo.test.comp
import org.apache.felix.ipojo.test.compatibility.service.CheckService;
import org.junit.Test;
import org.ops4j.pax.exam.Option;
+import org.osgi.framework.Bundle;
+import org.ow2.chameleon.testing.helpers.Dumps;
import static org.fest.assertions.Assertions.assertThat;
import static org.ops4j.pax.exam.CoreOptions.bundle;
@@ -61,7 +63,7 @@ public class TestConsumingProviderUsingE
System.out.println("Test executed on Equinox only");
return;
}
- CheckService checker = osgiHelper.getServiceObject(CheckService.class);
+ CheckService checker = osgiHelper.waitForService(CheckService.class, null, 1000);
assertThat(checker).isNotNull();
assertThat(checker.data().get("result")).isEqualTo("hello john doe");
}
Modified: felix/trunk/ipojo/runtime/core-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/pom.xml?rev=1529152&r1=1529151&r2=1529152&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/core-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/core-it/pom.xml Fri Oct 4 13:01:45 2013
@@ -80,6 +80,8 @@
<systemPropertyVariables>
<!-- TIME_FACTOR can be set from the command line with -DTIME_FACTOR=9-->
<TIME_FACTOR>${TIME_FACTOR}</TIME_FACTOR>
+ <!-- Defined by the profiles -->
+ <pax.exam.framework>${pax.exam.framework}</pax.exam.framework>
</systemPropertyVariables>
<skipTests>${skipTestExecution}</skipTests>
</configuration>
@@ -316,6 +318,9 @@
<activation>
<activeByDefault>true</activeByDefault>
</activation>
+ <properties>
+ <pax.exam.framework>none</pax.exam.framework>
+ </properties>
<dependencies>
<dependency>
<groupId>org.osgi</groupId>