You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2010/03/11 14:28:55 UTC
svn commit: r921841 - in
/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests:
BlueprintContainer2BTCustomizerTest.java
BlueprintContainerBTCustomizerTest.java
Author: not
Date: Thu Mar 11 13:28:54 2010
New Revision: 921841
URL: http://svn.apache.org/viewvc?rev=921841&view=rev
Log:
ARIES-245 Fix the blueprint itests
Modified:
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java?rev=921841&r1=921840&r2=921841&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainer2BTCustomizerTest.java Thu Mar 11 13:28:54 2010
@@ -77,7 +77,7 @@ public class BlueprintContainer2BTCustom
compositeManifest.put(Constants.BUNDLE_SYMBOLICNAME, "test-composite");
compositeManifest.put(Constants.BUNDLE_VERSION, "1.0.0");
// this import-package is used by the blueprint.sample
- compositeManifest.put(Constants.IMPORT_PACKAGE, "org.osgi.service.blueprint.container");
+ compositeManifest.put(Constants.IMPORT_PACKAGE, "org.osgi.service.blueprint;version=\"[1.0.0,2.0.0)\", org.osgi.service.blueprint.container;version=1.0");
// this export-package is used by pax junit runner as it needs to see the blueprint sample package
// for the test after the blueprint sample is started.
compositeManifest.put(Constants.EXPORT_PACKAGE, "org.apache.aries.blueprint.sample");
Modified: incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java?rev=921841&r1=921840&r2=921841&view=diff
==============================================================================
--- incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java (original)
+++ incubator/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/BlueprintContainerBTCustomizerTest.java Thu Mar 11 13:28:54 2010
@@ -22,6 +22,8 @@ import static org.junit.Assert.assertNot
import static org.ops4j.pax.exam.CoreOptions.equinox;
import static org.ops4j.pax.exam.CoreOptions.options;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
import java.io.InputStream;
import java.net.URL;
@@ -78,7 +80,7 @@ public class BlueprintContainerBTCustomi
compositeManifest.put(Constants.BUNDLE_SYMBOLICNAME, "test-composite");
compositeManifest.put(Constants.BUNDLE_VERSION, "1.0.0");
// this import-package is used by the blueprint.sample
- compositeManifest.put(Constants.IMPORT_PACKAGE, "org.osgi.service.blueprint.container");
+ compositeManifest.put(Constants.IMPORT_PACKAGE, "org.osgi.service.blueprint;version=\"[1.0.0,2.0.0)\", org.osgi.service.blueprint.container;version=1.0");
// this export-package is used by pax junit runner as it needs to see the blueprint sample package
// for the test after the blueprint sample is started.
compositeManifest.put(Constants.EXPORT_PACKAGE, "org.apache.aries.blueprint.sample");
@@ -87,8 +89,7 @@ public class BlueprintContainerBTCustomi
BundleContext compositeBundleContext = cb.getCompositeFramework().getBundleContext();
// install the blueprint sample onto the framework associated with the composite bundle
- MavenArtifactProvisionOption mapo = mavenBundleInTest("org.apache.aries.blueprint", "org.apache.aries.blueprint.sample");
-// MavenArtifactProvisionOption mapo = CoreOptions.mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint.sample").version( "0.1-incubating-SNAPSHOT");
+ MavenArtifactProvisionOption mapo = CoreOptions.mavenBundle().groupId("org.apache.aries.blueprint").artifactId("org.apache.aries.blueprint.sample").version( "0.1-incubating-SNAPSHOT");
// let's use input stream to avoid invoking mvn url handler which isn't avail in the child framework.
InputStream is = new URL(mapo.getURL()).openStream();
Bundle bundle = compositeBundleContext.installBundle(mapo.getURL(), is);
@@ -130,7 +131,16 @@ public class BlueprintContainerBTCustomi
mavenBundle("org.osgi", "org.osgi.compendium"),
// org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
- equinox().version("3.5.0")
+ /* For debugging, uncomment the next two lines */
+// vmOption ("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
+// waitForFrameworkStartup(),
+
+ /* For debugging, uncomment the next two lines
+ and add these imports:
+ import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
+ import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+ */
+ equinox().version("3.5.1")
);
options = updateOptions(options);
return options;