Author: gnodet
Date: Tue Jun 3 07:25:27 2014
New Revision: 1599437
URL: http://svn.apache.org/r1599437
Log:
Fix blueprint integration tests
Modified:
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java
aries/trunk/blueprint/blueprint-itests/pom.xml
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java
Modified:
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java?rev=1599437&r1=1599436&r2=1599437&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java
(original)
+++
aries/trunk/blueprint/blueprint-cm/src/test/java/org/apache/aries/blueprint/compendium/cm/Helper.java
Tue Jun 3 07:25:27 2014
@@ -97,11 +97,14 @@ public final class Helper {
// get the bundles
List<BundleDescriptor> bundles = getBundleDescriptors(bundleFilter);
+ // Add the test bundles at the beginning of the list so that they get
started first.
+ // The reason is that the bundle tracker used by blueprint does not
work well
+ // with pojosr because it does not support bundle hooks, so events are
lost.
if (testBundles != null) {
for (TinyBundle bundle : testBundles) {
File tmp = File.createTempFile("test-", ".jar", new
File("target/bundles/"));
tmp.delete();
- bundles.add(getBundleDescriptor(tmp.getPath(), bundle));
+ bundles.add(0, getBundleDescriptor(tmp.getPath(), bundle));
}
}
Modified: aries/trunk/blueprint/blueprint-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/pom.xml?rev=1599437&r1=1599436&r2=1599437&view=diff
==============================================================================
--- aries/trunk/blueprint/blueprint-itests/pom.xml (original)
+++ aries/trunk/blueprint/blueprint-itests/pom.xml Tue Jun 3 07:25:27 2014
@@ -52,10 +52,14 @@
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.osgi</artifactId>
- <version>3.8.0.v20120529-1548</version>
+ <version>3.8.2.v20130124-134944</version>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId>
<version>1.4.1-SNAPSHOT</version>
@@ -63,7 +67,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>blueprint-parser</artifactId>
- <version>1.1.1-SNAPSHOT</version>
+ <version>1.2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.aries.proxy</groupId>
@@ -80,7 +84,7 @@
<dependency>
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.cm</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<type>bundle</type>
<scope>compile</scope>
<exclusions>
@@ -94,7 +98,7 @@
<groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.jexl.evaluator</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.apache.aries.blueprint</groupId>
@@ -270,6 +274,16 @@
<version>1.0.0</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.ops4j.pax.logging</groupId>
+ <artifactId>pax-logging-service</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java?rev=1599437&r1=1599436&r2=1599437&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/ASMMultiBundleTest.java
Tue Jun 3 07:25:27 2014
@@ -199,8 +199,8 @@ public class ASMMultiBundleTest extends
return new Option[] {
baseOptions(),
Helper.blueprintBundles(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea").noStart(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb").noStart()
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea").versionAsInProject().noStart(),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb").versionAsInProject().noStart()
};
}
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java?rev=1599437&r1=1599436&r2=1599437&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/AbstractBlueprintIntegrationTest.java
Tue Jun 3 07:25:27 2014
@@ -21,6 +21,7 @@ package org.apache.aries.blueprint.itest
import static org.junit.Assert.assertNotNull;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.junitBundles;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.CoreOptions.systemProperty;
import static org.ops4j.pax.exam.CoreOptions.vmOption;
import static org.ops4j.pax.exam.CoreOptions.when;
@@ -62,7 +63,9 @@ public abstract class AbstractBlueprintI
return composite(
junitBundles(),
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- when(localRepo !=
null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" +
localRepo))
+ when(localRepo !=
null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" +
localRepo)),
+ mavenBundle("org.ops4j.pax.logging",
"pax-logging-api").versionAsInProject(),
+ mavenBundle("org.ops4j.pax.logging",
"pax-logging-service").versionAsInProject()
);
}
}
Modified:
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java?rev=1599437&r1=1599436&r2=1599437&view=diff
==============================================================================
---
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java
(original)
+++
aries/trunk/blueprint/blueprint-itests/src/test/java/org/apache/aries/blueprint/itests/MultiInterfacesTest.java
Tue Jun 3 07:25:27 2014
@@ -77,8 +77,8 @@ public class MultiInterfacesTest extends
return new Option[] {
baseOptions(),
Helper.blueprintBundles(),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea"),
- mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb")
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundlea").versionAsInProject(),
+ mavenBundle("org.apache.aries.blueprint",
"org.apache.aries.blueprint.testbundleb").versionAsInProject()
};
}
}
