You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/07/02 10:07:54 UTC
svn commit: r790490 - in /geronimo/sandbox/blueprint: ./ blueprint-itests/
blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/
blueprint-itests/src/test/resources/
Author: gnodet
Date: Thu Jul 2 08:07:54 2009
New Revision: 790490
URL: http://svn.apache.org/viewvc?rev=790490&view=rev
Log:
Fix integration tests (only for equinox 3.5.0)
Removed:
geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/.runner.properties
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=790490&r1=790489&r2=790490&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/pom.xml Thu Jul 2 08:07:54 2009
@@ -59,6 +59,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.ops4j.pax.runner</groupId>
+ <artifactId>pax-runner-no-jcl</artifactId>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
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=790490&r1=790489&r2=790490&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 Thu Jul 2 08:07:54 2009
@@ -37,6 +37,7 @@
import static org.ops4j.pax.exam.CoreOptions.mavenConfiguration;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.customFramework;
import org.ops4j.pax.exam.Option;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.rawPaxRunnerOption;
@@ -127,14 +128,9 @@
mavenBundle("org.apache.geronimo", "blueprint-bundle"),
mavenBundle("org.apache.geronimo", "blueprint-sample").noStart(),
- org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
-// customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/felix-1.9.0-SNAPSHOT.xml" ),
-// customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/equinox-3.5.0.v20090429-1630.xml" ),
-
-// rawPaxRunnerOption("config", "file:" + System.getProperty("basedir") + "/target/test-classes/.runner.properties"),
-// felix().snapshotVersion(),
- equinox().snapshotVersion()
+ equinox().version("3.5.0")
);
return options;
}
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=790490&r1=790489&r2=790490&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 Thu Jul 2 08:07:54 2009
@@ -187,15 +187,8 @@
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/felix-1.9.0-SNAPSHOT.xml" ),
- customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/equinox-3.5.0.v20090429-1630.xml" )
+ equinox().version("3.5.0")
);
-
- // use config generated by the Maven plugin (until PAXEXAM-62/64 get resolved)
- if (TestConfigAdmin.class.getClassLoader().getResource("META-INF/maven/paxexam-config.args") != null) {
- options = OptionUtils.combine(options, mavenConfiguration());
- }
-
return options;
}
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=790490&r1=790489&r2=790490&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 Thu Jul 2 08:07:54 2009
@@ -81,16 +81,17 @@
return "Good morning " + msg + "!";
}
}, props);
- assertNotNull(listener.getA());
- assertNotNull(listener.getReference());
- assertEquals("Good morning world!", a.hello("world"));
- reg2.unregister();
assertNotNull(listener.getA());
assertNotNull(listener.getReference());
assertEquals("Hello world!", a.hello("world"));
reg1.unregister();
+ assertNotNull(listener.getA());
+ assertNotNull(listener.getReference());
+ assertEquals("Good morning world!", a.hello("world"));
+
+ reg2.unregister();
assertNull(listener.getA());
assertNull(listener.getReference());
try {
@@ -148,8 +149,7 @@
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/felix-1.9.0-SNAPSHOT.xml" ),
- customFramework( "file:" + System.getProperty("basedir") + "/target/test-classes/equinox-3.5.0.v20090429-1630.xml" )
+ equinox().version("3.5.0")
);
return options;
}
Modified: geronimo/sandbox/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=790490&r1=790489&r2=790490&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/pom.xml Thu Jul 2 08:07:54 2009
@@ -98,22 +98,27 @@
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit-extender-impl</artifactId>
- <version>0.6.1-SNAPSHOT</version>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.runner</groupId>
+ <artifactId>pax-runner-no-jcl</artifactId>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -133,7 +138,7 @@
<dependency>
<groupId>org.ops4j.pax.url</groupId>
<artifactId>pax-url-mvn</artifactId>
- <version>0.5.2</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -208,9 +213,7 @@
<module>blueprint-cm</module>
<module>blueprint-bundle</module>
<module>blueprint-sample</module>
- <!--
<module>blueprint-itests</module>
- -->
</modules>
</project>