geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r785172 - in /geronimo/sandbox/blueprint: ./ blueprint-itests/ blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/ blueprint-itests/src/test/resources/
Date Tue, 16 Jun 2009 12:09:19 GMT
Author: gnodet
Date: Tue Jun 16 12:09:18 2009
New Revision: 785172

URL: http://svn.apache.org/viewvc?rev=785172&view=rev
Log:
Re-enable integration tests for felix, but they require felix snapshots

Added:
    geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml
    geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml
Modified:
    geronimo/sandbox/blueprint/blueprint-itests/pom.xml
    geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
    geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
    geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
    geronimo/sandbox/blueprint/pom.xml

Modified: geronimo/sandbox/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/pom.xml?rev=785172&r1=785171&r2=785172&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/pom.xml Tue Jun 16 12:09:18 2009
@@ -83,12 +83,15 @@
             <artifactId>pax-url-mvn</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- Frameworks -->
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.main</artifactId>
-            <version>1.6.0</version>
-            <scope>test</scope>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse</groupId>
+            <artifactId>osgi</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -101,6 +104,10 @@
             <id>ops4j.snapshots</id>
             <url>http://repository.ops4j.org/mvn-snapshots</url>
         </repository>
+        <repository>
+            <id>servicemix-repo</id>
+            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>

Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java?rev=785172&r1=785171&r2=785172&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
Tue Jun 16 12:09:18 2009
@@ -131,7 +131,9 @@
 
 //            org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
 
-//            felix().snapshotVersion(),
+                rawPaxRunnerOption("", ""),
+
+            felix().snapshotVersion(),
             equinox().snapshotVersion()
         );
 

Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java?rev=785172&r1=785171&r2=785172&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
Tue Jun 16 12:09:18 2009
@@ -186,7 +186,7 @@
 
 //            org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
 
-//            felix().snapshotVersion(),
+            felix().snapshotVersion(),
             equinox().snapshotVersion()
         );
 

Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java?rev=785172&r1=785171&r2=785172&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
Tue Jun 16 12:09:18 2009
@@ -35,10 +35,9 @@
 import static org.ops4j.pax.exam.CoreOptions.options;
 import static org.ops4j.pax.exam.CoreOptions.systemProperty;
 import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.customFramework;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.OptionUtils;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.rawPaxRunnerOption;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.osgi.framework.Constants;
@@ -149,15 +148,9 @@
 
 //            org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
 
-//            felix().snapshotVersion(),
-            equinox().snapshotVersion()
+            customFramework( "file:target/test-classes/felix-1.9.0-SNAPSHOT.xml" ),
+            customFramework( "file:target/test-classes/equinox-3.5.0-v20090429-1630.xml"
)
         );
-
-        // use config generated by the Maven plugin (until PAXEXAM-62/64 get resolved)
-        if (BlueprintContainerTest.class.getClassLoader().getResource("META-INF/maven/paxexam-config.args")
!= null) {
-            options = OptionUtils.combine(options, mavenConfiguration());
-        }
-
         return options;
     }
 

Added: geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml?rev=785172&view=auto
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml
(added)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/equinox-3.5.0.v20090429-1630.xml
Tue Jun 16 12:09:18 2009
@@ -0,0 +1,6 @@
+<platform>
+
+  <name>Equinox 3.5.0-v20090429-1630</name>
+  <system>mvn:org.eclipse/osgi/3.5.0-v20090429-1630</system>
+
+</platform>

Added: geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml?rev=785172&view=auto
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml
(added)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/felix-1.9.0-SNAPSHOT.xml
Tue Jun 16 12:09:18 2009
@@ -0,0 +1,15 @@
+<platform>
+
+  <name>Felix 1.9.0-SNAPSHOT</name>
+  <system>mvn:org.apache.felix/org.apache.felix.main/1.9.0-SNAPSHOT</system>
+
+  <packages>
+      org.osgi.framework; version=1.5.0,
+      org.osgi.framework.hooks.service; version=1.0.0,
+      org.osgi.service.packageadmin; version=1.2.0,
+      org.osgi.service.startlevel; version=1.1.0,
+      org.osgi.service.url; version=1.0.0,
+      org.osgi.util.tracker; version=1.3.3
+  </packages>
+
+</platform>

Modified: geronimo/sandbox/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=785172&r1=785171&r2=785172&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/pom.xml Tue Jun 16 12:09:18 2009
@@ -98,22 +98,22 @@
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam</artifactId>
-                <version>0.6.0</version>
+                <version>0.6.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam-junit</artifactId>
-                <version>0.6.0</version>
+                <version>0.6.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam-container-default</artifactId>
-                <version>0.6.0</version>
+                <version>0.6.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam-junit-extender-impl</artifactId>
-                <version>0.6.0</version>
+                <version>0.6.1-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
@@ -135,6 +135,16 @@
                 <artifactId>pax-url-mvn</artifactId>
                 <version>0.5.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.main</artifactId>
+                <version>1.9.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse</groupId>
+                <artifactId>osgi</artifactId>
+                <version>3.5.0.v20090429-1630</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 



Mime
View raw message