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 2010/05/01 12:21:52 UTC
svn commit: r939968 [1/3] - in /felix/trunk/ipojo/tests: ./ api/
bundleAsiPOJO/tests/ composite/composite-runtime/ composite/import-export/
composite/service-instance/ composite/service-providing/ core/annotations/
core/bad-configurations/ core/configa...
Author: clement
Date: Sat May 1 10:21:51 2010
New Revision: 939968
URL: http://svn.apache.org/viewvc?rev=939968&view=rev
Log:
Re-structure the test suites, use withiPOJO and OSGi test helpers.
Also update some test to the latest tinybundles.
Removed:
felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/IPOJOHelper.java
felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/OSGiHelper.java
felix/trunk/ipojo/tests/core/service-providing-inheritance/src/test/java/org/apache/felix/ipojo/tests/inheritance/IPOJOHelper.java
felix/trunk/ipojo/tests/core/service-providing-inheritance/src/test/java/org/apache/felix/ipojo/tests/inheritance/OSGiHelper.java
Modified:
felix/trunk/ipojo/tests/api/pom.xml
felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml
felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml
felix/trunk/ipojo/tests/composite/import-export/pom.xml
felix/trunk/ipojo/tests/composite/service-instance/pom.xml
felix/trunk/ipojo/tests/composite/service-providing/pom.xml
felix/trunk/ipojo/tests/core/annotations/pom.xml
felix/trunk/ipojo/tests/core/bad-configurations/pom.xml
felix/trunk/ipojo/tests/core/configadmin/pom.xml
felix/trunk/ipojo/tests/core/configuration/pom.xml
felix/trunk/ipojo/tests/core/external-handlers/pom.xml
felix/trunk/ipojo/tests/core/factories/pom.xml
felix/trunk/ipojo/tests/core/factory-version/pom.xml
felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java
felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java
felix/trunk/ipojo/tests/core/handler/pom.xml
felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java
felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/IgnoreCaseHandlerSelectionTest.java
felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/Tools.java
felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml
felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml
felix/trunk/ipojo/tests/core/logger/pom.xml
felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/BNDManifestLoggerInfoTest.java
felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/ManifestLoggerInfoTest.java
felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerInfoTest.java
felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerWarningTest.java
felix/trunk/ipojo/tests/core/service-dependency-bindingpolicy/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-comparator/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-filter/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-optional/pom.xml
felix/trunk/ipojo/tests/core/service-dependency-optional/src/test/java/org/apache/felix/ipojo/test/optional/NullableTransitiveClassloadingTest.java
felix/trunk/ipojo/tests/core/service-dependency/pom.xml
felix/trunk/ipojo/tests/core/service-providing-inheritance/pom.xml
felix/trunk/ipojo/tests/core/service-providing-inheritance/src/test/java/org/apache/felix/ipojo/tests/inheritance/InheritanceTest.java
felix/trunk/ipojo/tests/core/service-providing-strategies/pom.xml
felix/trunk/ipojo/tests/core/service-providing/pom.xml
felix/trunk/ipojo/tests/handler/eventadmin/pom.xml
felix/trunk/ipojo/tests/handler/temporal/pom.xml
felix/trunk/ipojo/tests/handler/transaction/pom.xml
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestAnnotations.java
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestInstallation.java
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestInvalidation.java
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestMandatory.java
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestNever.java
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestNotSupported.java
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestRequires.java
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestRequiresNew.java
felix/trunk/ipojo/tests/handler/transaction/src/test/java/org/apache/felix/ipojo/transaction/test/TestSupported.java
felix/trunk/ipojo/tests/handler/whiteboard/pom.xml
felix/trunk/ipojo/tests/manipulator/creation/pom.xml
felix/trunk/ipojo/tests/manipulator/manipulation/pom.xml
felix/trunk/ipojo/tests/manipulator/manipulator-java5/pom.xml
felix/trunk/ipojo/tests/manipulator/metadata/pom.xml
felix/trunk/ipojo/tests/manipulator/primitives/pom.xml
felix/trunk/ipojo/tests/online-manipulator/pom.xml
felix/trunk/ipojo/tests/online-manipulator/src/test/java/org/apache/felix/org/apache/felix/ipojo/online/manipulator/test/OnlineManipulatorTest.java
felix/trunk/ipojo/tests/pom.xml
Modified: felix/trunk/ipojo/tests/api/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/api/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/api/pom.xml (original)
+++ felix/trunk/ipojo/tests/api/pom.xml Sat May 1 10:21:51 2010
@@ -1,6 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<groupId>ipojo.tests</groupId>
<artifactId>org.apache.felix.ipojo.tests.api</artifactId>
<packaging>jar</packaging>
@@ -20,6 +27,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -29,24 +37,6 @@
</execution>
</executions>
</plugin>
-
- <!-- <plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>maven-paxexam-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-paxexam-config</id>
- <goals>
- <goal>generate-paxexam-config</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <settings>
- <platform>felix</platform>
- </settings>
- </configuration>
- </plugin> -->
</plugins>
</build>
@@ -54,7 +44,6 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -69,19 +58,16 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.composite</artifactId>
- <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
- <version>1.6.0</version>
</dependency>
<!-- For external handler management -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.handler.whiteboard</artifactId>
- <version>1.4.0</version>
</dependency>
<!--
Modified: felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml (original)
+++ felix/trunk/ipojo/tests/bundleAsiPOJO/tests/pom.xml Sat May 1 10:21:51 2010
@@ -20,6 +20,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
Modified: felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/composite-runtime/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Composite Test Suite</name>
@@ -37,12 +44,15 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -60,7 +70,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -82,7 +91,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/composite/import-export/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/import-export/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/import-export/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/import-export/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Composite (Service Import/Export) Test Suite</name>
@@ -35,14 +42,17 @@
<version>1.7.0-SNAPSHOT</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -65,7 +75,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -84,7 +93,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>${pom.version}</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/composite/service-instance/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-instance/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-instance/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-instance/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Composite (Service Instance) Test Suite</name>
@@ -37,14 +44,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -65,7 +75,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -85,7 +94,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/composite/service-providing/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/composite/service-providing/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/composite/service-providing/pom.xml (original)
+++ felix/trunk/ipojo/tests/composite/service-providing/pom.xml Sat May 1 10:21:51 2010
@@ -16,8 +16,15 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Composite (Service Providing) Test Suite</name>
<artifactId>tests.composite.service.providing</artifactId>
@@ -37,12 +44,15 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -65,7 +75,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -84,7 +93,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/annotations/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/annotations/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/annotations/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Annotations Test Suite</name>
@@ -31,16 +38,18 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.metadata
- </artifactId>
- <version>1.4.0</version>
+ <artifactId>org.apache.felix.ipojo.metadata</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -83,7 +92,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -105,7 +113,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/bad-configurations/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/bad-configurations/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/bad-configurations/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/bad-configurations/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Bad Configurations Test Suite</name>
@@ -32,12 +39,15 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -55,7 +65,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,7 +86,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/configadmin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/configadmin/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/configadmin/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/configadmin/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Configuration Admin Management Test Suite</name>
@@ -32,12 +39,15 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -55,7 +65,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,7 +86,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/configuration/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/configuration/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/configuration/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/configuration/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Configuration Management Test Suite</name>
@@ -32,14 +39,17 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
@@ -55,7 +65,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,7 +86,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/external-handlers/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/external-handlers/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/external-handlers/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/external-handlers/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO External Handler Mechanism Test Suite</name>
@@ -32,12 +39,10 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -49,13 +54,17 @@
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,7 +86,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/factories/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factories/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factories/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/factories/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Factories Test Suite</name>
@@ -32,12 +39,10 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -49,13 +54,17 @@
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,7 +86,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/factory-version/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factory-version/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factory-version/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/factory-version/pom.xml Sat May 1 10:21:51 2010
@@ -1,5 +1,29 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>ipojo.tests</groupId>
<artifactId>tests.core.factory-version</artifactId>
@@ -20,6 +44,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -91,15 +116,13 @@
<version>1.2.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.tinybundles.bundleAsiPOJO</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.ow2.chameleon.testing</groupId>
+ <artifactId>tinybundles-ipojo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.test.helpers</artifactId>
- <version>${pom.version}</version>
+ <groupId>org.ow2.chameleon.testing</groupId>
+ <artifactId>osgi-helpers</artifactId>
</dependency>
<dependency>
Modified: felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java (original)
+++ felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/FactoryVersionTest.java Sat May 1 10:21:51 2010
@@ -1,6 +1,5 @@
package org.apache.felix.ipojo.tests.core;
-import static org.apache.felix.ipojo.tinybundles.BundleAsiPOJO.asiPOJOBundle;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
@@ -10,12 +9,11 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.MavenUtils.asInProject;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
+import static org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOBuilder.withiPOJO;
import java.io.File;
import org.apache.felix.ipojo.architecture.Architecture;
-import org.apache.felix.ipojo.test.helpers.IPOJOHelper;
-import org.apache.felix.ipojo.test.helpers.OSGiHelper;
import org.apache.felix.ipojo.tests.core.component.MyComponent;
import org.apache.felix.ipojo.tests.core.service.MyService;
import org.junit.After;
@@ -32,6 +30,8 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.IPOJOHelper;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
@RunWith( JUnit4TestRunner.class )
public class FactoryVersionTest {
@@ -68,7 +68,7 @@ public class FactoryVersionTest {
provision(
// Runtime.
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.test.helpers").version(asInProject())
+ mavenBundle().groupId("org.ow2.chameleon.testing").artifactId("osgi-helpers").versionAsInProject()
// mavenBundle().groupId( "org.ops4j.pax.swissbox" ).artifactId( "pax-swissbox-tinybundles" ).version(asInProject())
),
provision(
@@ -84,18 +84,18 @@ public class FactoryVersionTest {
.add(MyComponent.class)
.set(Constants.BUNDLE_SYMBOLICNAME,"ProviderV1")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service")
- .build( asiPOJOBundle(new File(tmp, "provider-v1.jar"), new File("provider-v1.xml"))),
+ .build( withiPOJO(new File(tmp, "provider-v1.jar"), new File("provider-v1.xml"))),
// Component V1.1 (Bundle Version)
newBundle()
.add(MyComponent.class)
.set(Constants.BUNDLE_SYMBOLICNAME,"ProviderV1.1")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service")
.set(Constants.BUNDLE_VERSION, "1.1")
- .build( asiPOJOBundle(new File(tmp, "provider-v1.1.jar"), new File("provider-v1.1.xml"))),
+ .build( withiPOJO(new File(tmp, "provider-v1.1.jar"), new File("provider-v1.1.xml"))),
// Instance declaration
newBundle()
.set(Constants.BUNDLE_SYMBOLICNAME,"Instances")
- .build( asiPOJOBundle(new File(tmp, "instances.jar"), new File("instances.xml")))
+ .build( withiPOJO(new File(tmp, "instances.jar"), new File("instances.xml")))
)
);
return opt;
@@ -147,7 +147,7 @@ public class FactoryVersionTest {
@Test
public void testServiceProperty() throws InvalidSyntaxException {
-
+
// Version 1.0
//ServiceReference refv1 = ipojo.getServiceReferenceByName(MyService.class.getName(), "instance-v1");
ServiceReference[] refv1 = context.getAllServiceReferences(MyService.class.getName(), "(instance.name=instance-v1)");
@@ -156,7 +156,7 @@ public class FactoryVersionTest {
Assert.assertEquals("1.0", version);
// Version 1.1
- ServiceReference[] refv11 = context.getAllServiceReferences(MyService.class.getName(), "(instance.name=instance-v1.1)");
+ ServiceReference[] refv11 = context.getAllServiceReferences(MyService.class.getName(), "(instance.name=instance-v1.1)");
//ServiceReference refv11 = ipojo.getServiceReferenceByName(MyService.class.getName(), "instance-v1.1");
Assert.assertNotNull(refv11);
String version11 = (String) refv11[0].getProperty("factory.version");
@@ -164,7 +164,7 @@ public class FactoryVersionTest {
Assert.assertEquals("1.1", version11);
// No Version
- ServiceReference[] refany = context.getAllServiceReferences(MyService.class.getName(), "(instance.name=instance-any)");
+ ServiceReference[] refany = context.getAllServiceReferences(MyService.class.getName(), "(instance.name=instance-any)");
// ServiceReference refany = ipojo.getServiceReferenceByName(MyService.class.getName(), "instance-any");
Assert.assertNotNull(refany);
@@ -172,7 +172,7 @@ public class FactoryVersionTest {
Assert.assertNotNull(any);
// No version set in the factory, so no version.
- ServiceReference[] refmci = context.getAllServiceReferences(MyService.class.getName(), "(instance.name=MyComponentInstance)");
+ ServiceReference[] refmci = context.getAllServiceReferences(MyService.class.getName(), "(instance.name=MyComponentInstance)");
//ServiceReference refmci = ipojo.getServiceReferenceByName(MyService.class.getName(), "MyComponentInstance");
Assert.assertNotNull(refmci);
String mci = (String) refmci[0].getProperty("factory.version");
Modified: felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java (original)
+++ felix/trunk/ipojo/tests/core/factory-version/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java Sat May 1 10:21:51 2010
@@ -1,6 +1,5 @@
package org.apache.felix.ipojo.tests.core;
-import static org.apache.felix.ipojo.tinybundles.BundleAsiPOJO.asiPOJOBundle;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
@@ -11,6 +10,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.MavenUtils.asInProject;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
+import static org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOBuilder.withiPOJO;
import java.io.File;
import java.io.FileNotFoundException;
@@ -23,8 +23,6 @@ import org.apache.felix.ipojo.architectu
import org.apache.felix.ipojo.handlers.dependency.Dependency;
import org.apache.felix.ipojo.handlers.dependency.DependencyDescription;
import org.apache.felix.ipojo.handlers.dependency.DependencyHandlerDescription;
-import org.apache.felix.ipojo.test.helpers.IPOJOHelper;
-import org.apache.felix.ipojo.test.helpers.OSGiHelper;
import org.apache.felix.ipojo.tests.core.component.MyComponent;
import org.apache.felix.ipojo.tests.core.component.MyCons;
import org.apache.felix.ipojo.tests.core.service.MyService;
@@ -47,6 +45,8 @@ import org.osgi.framework.InvalidSyntaxE
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.service.packageadmin.PackageAdmin;
+import org.ow2.chameleon.testing.helpers.IPOJOHelper;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
@RunWith( JUnit4TestRunner.class )
public class VersionConflictTest {
@@ -87,7 +87,7 @@ public class VersionConflictTest {
.build( withBnd()),
new FileOutputStream(f1),
true);
-
+
File f2 = new File(tmp, "service-interface-v2.jar");
StreamUtils.copyStream(
newBundle()
@@ -98,14 +98,14 @@ public class VersionConflictTest {
.build( withBnd()),
new FileOutputStream(f2),
true);
-
+
File c1 = new File(tmp, "component-v1.jar");
StreamUtils.copyStream(
newBundle()
.add(MyComponent.class)
.set(Constants.BUNDLE_SYMBOLICNAME,"ProviderV1")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service; version=\"[1.0.0, 1.0.0]\"")
- .build( asiPOJOBundle(new File("vprovider-v1.xml"))),
+ .build( withiPOJO(new File("vprovider-v1.xml"))),
new FileOutputStream(c1),
true);
@@ -115,7 +115,7 @@ public class VersionConflictTest {
.add(MyComponent.class)
.set(Constants.BUNDLE_SYMBOLICNAME,"ProviderV2")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service; version=\"[2.0.0, 2.0.0]\"")
- .build( asiPOJOBundle(new File("vprovider-v2.xml"))),
+ .build( withiPOJO(new File("vprovider-v2.xml"))),
new FileOutputStream(c2),
true);
@@ -126,10 +126,10 @@ public class VersionConflictTest {
.set(Constants.BUNDLE_SYMBOLICNAME,"MyCons")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service; version=\"[2.0.0, 2.0.0]\"")
.set(Constants.BUNDLE_VERSION, "2.0")
- .build(asiPOJOBundle(new File("cons.xml"))),
+ .build(withiPOJO(new File("cons.xml"))),
new FileOutputStream(cons),
true);
-
+
File consV1 = new File(tmp, "cons-v1.jar");
StreamUtils.copyStream(
newBundle()
@@ -137,10 +137,10 @@ public class VersionConflictTest {
.set(Constants.BUNDLE_SYMBOLICNAME,"MyCons")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service; version=\"[1.0.0, 1.0.0]\"")
.set(Constants.BUNDLE_VERSION, "1.0")
- .build(asiPOJOBundle(new File("cons.xml"))),
+ .build(withiPOJO(new File("cons.xml"))),
new FileOutputStream(consV1),
true);
-
+
Option[] opt = options(
felix(),
equinox(),
@@ -148,8 +148,7 @@ public class VersionConflictTest {
provision(
// Runtime.
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.test.helpers").version(asInProject()),
- mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").versionAsInProject()
+ mavenBundle().groupId("org.ow2.chameleon.testing").artifactId("osgi-helpers").versionAsInProject(), mavenBundle().groupId("org.ops4j.base").artifactId("ops4j-base-lang").versionAsInProject()
// mavenBundle().groupId( "org.ops4j.pax.swissbox" ).artifactId( "pax-swissbox-tinybundles" ).version(asInProject())
),
systemProperty( "url1" ).value( f1.toURI().toURL().toExternalForm() ),
Modified: felix/trunk/ipojo/tests/core/handler/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/handler/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/handler/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/handler/pom.xml Sat May 1 10:21:51 2010
@@ -1,4 +1,28 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
<modelVersion>4.0.0</modelVersion>
<groupId>ipojo.tests</groupId>
<artifactId>tests.core.handler</artifactId>
@@ -19,6 +43,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -104,18 +129,13 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.tinybundles.bundleAsiPOJO
- </artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <scope>test</scope>
+ <dependency>
+ <groupId>org.ow2.chameleon.testing</groupId>
+ <artifactId>tinybundles-ipojo</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.test.helpers</artifactId>
- <version>1.5.0-SNAPSHOT</version>
- <scope>test</scope>
+ <groupId>org.ow2.chameleon.testing</groupId>
+ <artifactId>osgi-helpers</artifactId>
</dependency>
</dependencies>
Modified: felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java (original)
+++ felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/DummyHandlerTest.java Sat May 1 10:21:51 2010
@@ -1,12 +1,13 @@
package org.apache.felix.ipojo.tests.core;
-import static org.apache.felix.ipojo.tinybundles.BundleAsiPOJO.asiPOJOBundle;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
+import static org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOBuilder.withiPOJO;
+
import java.io.File;
import java.util.HashMap;
@@ -19,7 +20,6 @@ import org.apache.felix.ipojo.Configurat
import org.apache.felix.ipojo.Factory;
import org.apache.felix.ipojo.MissingHandlerException;
import org.apache.felix.ipojo.UnacceptableConfiguration;
-import org.apache.felix.ipojo.test.helpers.OSGiHelper;
import org.apache.felix.ipojo.tests.core.component.DummyImpl;
import org.apache.felix.ipojo.tests.core.handler.DummyHandler;
import org.apache.felix.ipojo.tests.core.service.Dummy;
@@ -38,6 +38,7 @@ import org.ops4j.pax.exam.junit.JUnitOpt
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.useradmin.User;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
import aQute.lib.osgi.Constants;
@@ -51,7 +52,7 @@ public class DummyHandlerTest {
*/
private static final int NB_MOCK = 10;
-
+
@Inject
private BundleContext context;
@@ -71,19 +72,19 @@ public class DummyHandlerTest {
public static Option[] configure() {
Option[] platform = options(CoreOptions.felix());
- Option[] bundles =
+ Option[] bundles =
options(
provision(
newBundle()
- .add(DummyHandler.class)
- .build(asiPOJOBundle(new File("src/test/resources/dummy-handler.xml")))
+ .add(DummyHandler.class)
+ .build(withiPOJO(new File("src/test/resources/dummy-handler.xml")))
),
provision(
newBundle()
.add(Dummy.class)
.add(DummyImpl.class)
.set(Constants.EXPORT_PACKAGE, "org.apache.felix.ipojo.handler.dummy.test")
- .build(asiPOJOBundle(new File("src/test/resources/dummy-component.xml")))
+ .build(withiPOJO(new File("src/test/resources/dummy-component.xml")))
),
provision(
mavenBundle().groupId("org.apache.felix").artifactId("org.osgi.compendium").version("1.4.0")
@@ -100,8 +101,8 @@ public class DummyHandlerTest {
@Configuration
public static Option[] configAdminBundle() {
return options(
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").versionAsInProject(),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.test.helpers").versionAsInProject());
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").versionAsInProject(),
+ mavenBundle().groupId("org.ow2.chameleon.testing").artifactId("osgi-helpers").versionAsInProject());
}
/**
@@ -173,24 +174,24 @@ public class DummyHandlerTest {
ServiceRegistration sr = context.registerService(User.class.getName(), service, null);
registrations.put(service, sr);
}
-
+
//verify that the bind method of the handler has been called
for (User user : registrations.keySet()) {
verify(user).getName();
}
-
+
//verify that the unbind has been called
for (User user : registrations.keySet()) {
registrations.get(user).unregister();
verify(user).getType();
}
-
+
//verify no more interaction
for (User user : registrations.keySet()) {
Mockito.verifyNoMoreInteractions(user);
}
}
-
+
/**
* Test if the bind and unbind methods when the bind services are registered before the instance creation
@@ -198,7 +199,7 @@ public class DummyHandlerTest {
@Test
public void testDummyTestBindBeforeStart() {
ComponentInstance instance = null;
-
+
Map<User, ServiceRegistration> registrations = new HashMap<User, ServiceRegistration>();
for (int i = 0; i < NB_MOCK; i++) {
@@ -217,18 +218,18 @@ public class DummyHandlerTest {
} catch (MissingHandlerException e) {
} catch (ConfigurationException e) {
}
-
+
//verify that the bind method of the handler has been called
for (User user : registrations.keySet()) {
verify(user).getName();
}
-
+
//verify that the unbind has been called
for (User user : registrations.keySet()) {
registrations.get(user).unregister();
verify(user).getType();
}
-
+
//verify no more interaction
for (User user : registrations.keySet()) {
Mockito.verifyNoMoreInteractions(user);
Modified: felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/IgnoreCaseHandlerSelectionTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/IgnoreCaseHandlerSelectionTest.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/IgnoreCaseHandlerSelectionTest.java (original)
+++ felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/IgnoreCaseHandlerSelectionTest.java Sat May 1 10:21:51 2010
@@ -1,6 +1,5 @@
package org.apache.felix.ipojo.tests.core;
-import static org.apache.felix.ipojo.tinybundles.BundleAsiPOJO.asiPOJOBundle;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.knopflerfish;
@@ -9,6 +8,8 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.MavenUtils.asInProject;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
+import static org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOBuilder.withiPOJO;
+
import java.io.File;
@@ -17,8 +18,6 @@ import org.apache.felix.ipojo.Factory;
import org.apache.felix.ipojo.HandlerFactory;
import org.apache.felix.ipojo.architecture.Architecture;
import org.apache.felix.ipojo.architecture.HandlerDescription;
-import org.apache.felix.ipojo.test.helpers.IPOJOHelper;
-import org.apache.felix.ipojo.test.helpers.OSGiHelper;
import org.apache.felix.ipojo.tests.core.component.MyComponent;
import org.apache.felix.ipojo.tests.core.handler.EmptyHandler;
import org.apache.felix.ipojo.tests.core.service.MyService;
@@ -36,6 +35,8 @@ import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.IPOJOHelper;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
/**
* Check that the handler selection ignore case.
@@ -73,7 +74,7 @@ public class IgnoreCaseHandlerSelectionT
File tmp = new File("target/tmp");
tmp.mkdirs();
-
+
Option[] opt = options(
felix(),
equinox(),
@@ -81,14 +82,14 @@ public class IgnoreCaseHandlerSelectionT
provision(
// Runtime.
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo.test.helpers").versionAsInProject()
+ mavenBundle().groupId("org.ow2.chameleon.testing").artifactId("osgi-helpers").versionAsInProject()
),
provision(
newBundle()
.add( MyService.class )
.set( Constants.BUNDLE_SYMBOLICNAME, "ServiceInterface" )
.set( Constants.EXPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service" )
- .build( TinyBundles.withBnd() )
+ .build( TinyBundles.withBnd() )
),
provision(
// Components and the handler
@@ -96,11 +97,11 @@ public class IgnoreCaseHandlerSelectionT
.add(MyComponent.class) // Component Implementation
.add(EmptyHandler.class) // Handler.
.set(Constants.BUNDLE_SYMBOLICNAME,"IgnoreCase")
- .set(Constants.IMPORT_PACKAGE,
+ .set(Constants.IMPORT_PACKAGE,
"org.apache.felix.ipojo.tests.core.service, " +
"org.apache.felix.ipojo, " +
"org.apache.felix.ipojo.metadata")
- .build(asiPOJOBundle(new File(tmp, "ignorecase.jar"), new File("src/test/resources/ignorecase.xml")))));
+ .build(withiPOJO(new File(tmp, "ignorecase.jar"), new File("src/test/resources/ignorecase.xml")))));
return opt;
}
@@ -149,7 +150,7 @@ public class IgnoreCaseHandlerSelectionT
HandlerDescription desc = arch.getInstanceDescription()
.getHandlerDescription("orG.apAche.feliX.iPOJO.tests.CORE.hAnDlEr:EmPtY"); // Check with the declared name.
-
+
Assert.assertNotNull(desc);
Assert.assertTrue(desc.isValid());
}
Modified: felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/Tools.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/Tools.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/Tools.java (original)
+++ felix/trunk/ipojo/tests/core/handler/src/test/java/org/apache/felix/ipojo/tests/core/Tools.java Sat May 1 10:21:51 2010
@@ -1,8 +1,8 @@
package org.apache.felix.ipojo.tests.core;
import org.apache.felix.ipojo.Factory;
-import org.apache.felix.ipojo.test.helpers.OSGiHelper;
import org.osgi.framework.ServiceReference;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
public class Tools {
Modified: felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/lifecycle-callback/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Lifecycle callback Test Suite</name>
@@ -32,12 +39,10 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -49,13 +54,17 @@
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,7 +86,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/lifecycle-controller/pom.xml Sat May 1 10:21:51 2010
@@ -16,7 +16,14 @@
specific language governing permissions and limitations
under the License.
-->
-<project>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>iPOJO Lifecycle controller Test Suite</name>
@@ -32,12 +39,10 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.ipojo.metadata</artifactId>
- <version>1.4.0</version>
</dependency>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>1.0.1</version>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -49,13 +54,17 @@
<artifactId>org.apache.felix.ipojo.junit4osgi</artifactId>
<version>1.1.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>4.0.0</version>
+ </dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -77,7 +86,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-ipojo-plugin</artifactId>
- <version>1.6.0</version>
<executions>
<execution>
<goals>
Modified: felix/trunk/ipojo/tests/core/logger/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/logger/pom.xml?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/logger/pom.xml (original)
+++ felix/trunk/ipojo/tests/core/logger/pom.xml Sat May 1 10:21:51 2010
@@ -1,4 +1,29 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>ipojo.tests</groupId>
+ <artifactId>ipojo.tests</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>ipojo.tests</groupId>
<artifactId>tests.core.logger</artifactId>
@@ -19,6 +44,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
@@ -28,92 +54,77 @@
</execution>
</executions>
</plugin>
-
- <!-- <plugin>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>maven-paxexam-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-paxexam-config</id>
- <goals>
- <goal>generate-paxexam-config</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <settings>
- <platform>felix</platform>
- </settings>
- </configuration>
- </plugin> -->
</plugins>
</build>
<dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>4.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>1.0.0</version>
- </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.ipojo</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>1.0.0</version>
+ </dependency>
- <!--
+ <!--
Pax Exam API:
-->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam</artifactId>
- <version>1.2.0</version>
- </dependency>
- <!--
- During runtime Pax Exam will discover the OSGi container to use by
- searching metadata available into classpath. Pax Exam comes with a
- default container that uses [Pax Runner] for implementing the
- container requirements:
- -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-container-default
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <!--
+ During runtime Pax Exam will discover the OSGi container to use by
+ searching metadata available into classpath. Pax Exam comes with a
+ default container that uses [Pax Runner] for implementing the
+ container requirements:
+ -->
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-container-default
</artifactId>
- <version>1.2.0</version>
- </dependency>
- <!--
- If your test code is based on JUnit you will have to have the Junit
- support artifact:
- -->
- <dependency>
- <groupId>org.ops4j.pax.exam</groupId>
- <artifactId>pax-exam-junit</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
- <!-- Tinybundles -->
- <dependency>
- <groupId>org.ops4j.pax.swissbox</groupId>
- <artifactId>pax-swissbox-tinybundles</artifactId>
- <version>1.2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.ipojo.tinybundles.bundleAsiPOJO</artifactId>
- <version>${pom.version}</version>
- </dependency>
- </dependencies>
+ <version>1.2.0</version>
+ </dependency>
+ <!--
+ If your test code is based on JUnit you will have to have the Junit
+ support artifact:
+ -->
+ <dependency>
+ <groupId>org.ops4j.pax.exam</groupId>
+ <artifactId>pax-exam-junit</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+ <!-- Tinybundles -->
+ <dependency>
+ <groupId>org.ops4j.pax.swissbox</groupId>
+ <artifactId>pax-swissbox-tinybundles</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ow2.chameleon.testing</groupId>
+ <artifactId>tinybundles-ipojo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.chameleon.testing</groupId>
+ <artifactId>osgi-helpers</artifactId>
+ </dependency>
+</dependencies>
<repositories>
<repository>
Modified: felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/BNDManifestLoggerInfoTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/BNDManifestLoggerInfoTest.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/BNDManifestLoggerInfoTest.java (original)
+++ felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/BNDManifestLoggerInfoTest.java Sat May 1 10:21:51 2010
@@ -1,6 +1,5 @@
package org.apache.felix.ipojo.tests.core;
-import static org.apache.felix.ipojo.tinybundles.BundleAsiPOJO.asiPOJOBundle;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -9,6 +8,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.MavenUtils.asInProject;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
+import static org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOBuilder.withiPOJO;
import java.io.File;
import java.util.ArrayList;
@@ -31,6 +31,8 @@ import org.osgi.framework.Constants;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogReaderService;
import org.osgi.service.log.LogService;
+import org.ow2.chameleon.testing.helpers.IPOJOHelper;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
@RunWith( JUnit4TestRunner.class )
public class BNDManifestLoggerInfoTest {
@@ -43,17 +45,17 @@ public class BNDManifestLoggerInfoTest {
private IPOJOHelper ipojo;
private LogReaderService log;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
-
+
log = (LogReaderService) osgi.getServiceObject(LogReaderService.class.getName(), null);
if (log == null) {
throw new RuntimeException("No Log Service !");
}
-
+
LogService logs = (LogService) osgi.getServiceObject(LogService.class.getName(), null);
logs.log(LogService.LOG_WARNING, "Ready");
}
@@ -77,8 +79,8 @@ public class BNDManifestLoggerInfoTest {
provision(
// Runtime.
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
- mavenBundle().groupId( "org.ops4j.pax.swissbox" ).artifactId( "pax-swissbox-tinybundles" ).version(asInProject()),
- mavenBundle().groupId( "org.apache.felix" ).artifactId( "org.apache.felix.log" ).version(asInProject())
+ mavenBundle().groupId( "org.apache.felix" ).artifactId( "org.apache.felix.log" ).version(asInProject()),
+ mavenBundle().groupId("org.ow2.chameleon.testing").artifactId("osgi-helpers").versionAsInProject()
),
provision(
newBundle()
@@ -94,12 +96,12 @@ public class BNDManifestLoggerInfoTest {
.set(Constants.BUNDLE_SYMBOLICNAME,"MyComponent")
.set(Constants.IMPORT_PACKAGE, "*")
.set("IPOJO-log-level", "info")
- .build( asiPOJOBundle(new File(tmp, "provider-with-level-in-manifest.jar"), new File("component.xml")))
+ .build( withiPOJO(new File(tmp, "provider-with-level-in-manifest.jar"), new File("component.xml")))
)
);
return opt;
}
-
+
@Test
public void testMessages() throws InterruptedException {
List<String> messages = getMessages(log.getLog());
Modified: felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/ManifestLoggerInfoTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/ManifestLoggerInfoTest.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/ManifestLoggerInfoTest.java (original)
+++ felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/ManifestLoggerInfoTest.java Sat May 1 10:21:51 2010
@@ -1,12 +1,12 @@
package org.apache.felix.ipojo.tests.core;
-import static org.apache.felix.ipojo.tinybundles.BundleAsiPOJO.asiPOJOBundle;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.provision;
import static org.ops4j.pax.exam.MavenUtils.asInProject;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
+import static org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOBuilder.withiPOJO;
import java.io.File;
import java.util.ArrayList;
@@ -35,6 +35,8 @@ import org.osgi.framework.ServiceReferen
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogReaderService;
import org.osgi.service.log.LogService;
+import org.ow2.chameleon.testing.helpers.IPOJOHelper;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
@RunWith( JUnit4TestRunner.class )
public class ManifestLoggerInfoTest {
@@ -47,17 +49,17 @@ public class ManifestLoggerInfoTest {
private IPOJOHelper ipojo;
private LogReaderService log;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
-
+
log = (LogReaderService) osgi.getServiceObject(LogReaderService.class.getName(), null);
if (log == null) {
throw new RuntimeException("No Log Service !");
}
-
+
LogService logs = (LogService) osgi.getServiceObject(LogService.class.getName(), null);
logs.log(LogService.LOG_WARNING, "Ready");
}
@@ -80,7 +82,8 @@ public class ManifestLoggerInfoTest {
provision(
// Runtime.
mavenBundle().groupId( "org.apache.felix" ).artifactId( "org.apache.felix.log" ).version(asInProject()),
- mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject())
+ mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
+ mavenBundle().groupId("org.ow2.chameleon.testing").artifactId("osgi-helpers").versionAsInProject()
),
provision(
newBundle()
@@ -96,32 +99,32 @@ public class ManifestLoggerInfoTest {
.set(Constants.BUNDLE_SYMBOLICNAME,"MyComponent")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service")
.set("ipojo-log-level", "info")
- .build( asiPOJOBundle(new File(tmp, "provider-with-level-in-manifest.jar"), new File("component.xml")))
+ .build( withiPOJO(new File(tmp, "provider-with-level-in-manifest.jar"), new File("component.xml")))
)
);
return opt;
}
-
+
@Test
@Ignore //TODO Why we have a classloading issue here ?
public void testMessages() throws InterruptedException, InvalidSyntaxException {
Bundle bundle = osgi.getBundle("MyComponent");
Assert.assertNotNull(bundle);
Assert.assertEquals(Bundle.ACTIVE, bundle.getState());
-
+
ServiceReference r = ipojo.getServiceReferenceByName(Architecture.class.getName(), "org.apache.felix.ipojo.tests.core.component.MyComponent-0");
Assert.assertNotNull(r);
System.out.println(((Architecture) osgi.getServiceObject(r)).getInstanceDescription().getDescription());
-
+
ServiceReference[] refs = context.getAllServiceReferences(null, null);
for (ServiceReference ref : refs) {
System.out.println(ref.getBundle().getBundleId() + " -> " + Arrays.asList((String[]) ref.getProperty(Constants.OBJECTCLASS)));
}
-
-
-
+
+
+
// Assert.assertNotNull(osgi.getServiceObject(MyService.class.getName(), null));
-
+
// osgi.waitForService("org.apache.felix.ipojo.tests.core.service.MyService", null, 5000);
List<String> messages = getMessages(log.getLog());
System.out.println(messages);
Modified: felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerInfoTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerInfoTest.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerInfoTest.java (original)
+++ felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerInfoTest.java Sat May 1 10:21:51 2010
@@ -1,6 +1,5 @@
package org.apache.felix.ipojo.tests.core;
-import static org.apache.felix.ipojo.tinybundles.BundleAsiPOJO.asiPOJOBundle;
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
@@ -10,6 +9,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.MavenUtils.asInProject;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
+import static org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOBuilder.withiPOJO;
import java.io.File;
import java.util.ArrayList;
@@ -32,6 +32,8 @@ import org.osgi.framework.Constants;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogReaderService;
import org.osgi.service.log.LogService;
+import org.ow2.chameleon.testing.helpers.IPOJOHelper;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
@RunWith( JUnit4TestRunner.class )
public class SystemLoggerInfoTest {
@@ -44,17 +46,17 @@ public class SystemLoggerInfoTest {
private IPOJOHelper ipojo;
private LogReaderService log;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
-
+
log = (LogReaderService) osgi.getServiceObject(LogReaderService.class.getName(), null);
if (log == null) {
throw new RuntimeException("No Log Service !");
}
-
+
LogService logs = (LogService) osgi.getServiceObject(LogService.class.getName(), null);
logs.log(LogService.LOG_WARNING, "Ready");
}
@@ -77,7 +79,7 @@ public class SystemLoggerInfoTest {
provision(
// Runtime.
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
- mavenBundle().groupId( "org.ops4j.pax.swissbox" ).artifactId( "pax-swissbox-tinybundles" ).version(asInProject()),
+ mavenBundle().groupId("org.ow2.chameleon.testing").artifactId("osgi-helpers").versionAsInProject(),
mavenBundle().groupId( "org.apache.felix" ).artifactId( "org.apache.felix.log" ).version(asInProject())
),
provision(
@@ -93,13 +95,13 @@ public class SystemLoggerInfoTest {
.add(MyComponent.class)
.set(Constants.BUNDLE_SYMBOLICNAME,"MyComponent")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service")
- .build( asiPOJOBundle(new File(tmp, "provider.jar"), new File("component.xml")))
+ .build( withiPOJO(new File(tmp, "provider.jar"), new File("component.xml")))
),
systemProperty( "ipojo.log.level" ).value( "info" )
);
return opt;
}
-
+
@Test
public void testMessages() throws InterruptedException {
List<String> messages = getMessages(log.getLog());
Modified: felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerWarningTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerWarningTest.java?rev=939968&r1=939967&r2=939968&view=diff
==============================================================================
--- felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerWarningTest.java (original)
+++ felix/trunk/ipojo/tests/core/logger/src/test/java/org/apache/felix/ipojo/tests/core/SystemLoggerWarningTest.java Sat May 1 10:21:51 2010
@@ -1,6 +1,5 @@
package org.apache.felix.ipojo.tests.core;
-import static org.apache.felix.ipojo.tinybundles.BundleAsiPOJO.asiPOJOBundle;
import static org.ops4j.pax.exam.CoreOptions.felix;
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.options;
@@ -9,6 +8,7 @@ import static org.ops4j.pax.exam.CoreOpt
import static org.ops4j.pax.exam.MavenUtils.asInProject;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd;
+import static org.ow2.chameleon.testing.tinybundles.ipojo.IPOJOBuilder.withiPOJO;
import java.io.File;
import java.util.ArrayList;
@@ -31,6 +31,8 @@ import org.osgi.framework.Constants;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogReaderService;
import org.osgi.service.log.LogService;
+import org.ow2.chameleon.testing.helpers.IPOJOHelper;
+import org.ow2.chameleon.testing.helpers.OSGiHelper;
@RunWith( JUnit4TestRunner.class )
public class SystemLoggerWarningTest {
@@ -43,17 +45,17 @@ public class SystemLoggerWarningTest {
private IPOJOHelper ipojo;
private LogReaderService log;
-
+
@Before
public void init() {
osgi = new OSGiHelper(context);
ipojo = new IPOJOHelper(context);
-
+
log = (LogReaderService) osgi.getServiceObject(LogReaderService.class.getName(), null);
if (log == null) {
throw new RuntimeException("No Log Service !");
}
-
+
LogService logs = (LogService) osgi.getServiceObject(LogService.class.getName(), null);
logs.log(LogService.LOG_WARNING, "Ready");
}
@@ -77,7 +79,8 @@ public class SystemLoggerWarningTest {
provision(
// Runtime.
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.ipojo").version(asInProject()),
- mavenBundle().groupId( "org.apache.felix" ).artifactId( "org.apache.felix.log" ).version(asInProject())
+ mavenBundle().groupId( "org.apache.felix" ).artifactId( "org.apache.felix.log" ).version(asInProject()),
+ mavenBundle().groupId("org.ow2.chameleon.testing").artifactId("osgi-helpers").versionAsInProject()
),
provision(
newBundle()
@@ -92,13 +95,13 @@ public class SystemLoggerWarningTest {
.add(MyComponent.class)
.set(Constants.BUNDLE_SYMBOLICNAME,"MyComponent")
.set(Constants.IMPORT_PACKAGE, "org.apache.felix.ipojo.tests.core.service")
- .build( asiPOJOBundle(new File(tmp, "provider.jar"), new File("component.xml")))
+ .build( withiPOJO(new File(tmp, "provider.jar"), new File("component.xml")))
),
systemProperty( "ipojo.log.level" ).value( "warning" )
);
return opt;
}
-
+
@Test
public void testMessages() throws InterruptedException {
List<String> messages = getMessages(log.getLog());