Author: gnodet
Date: Tue Jun 10 07:25:50 2014
New Revision: 1601562
URL: http://svn.apache.org/r1601562
Log:
Fix subsystems tests
Modified:
aries/trunk/subsystem/subsystem-itests/pom.xml
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ServiceDependencyTest.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/GenericMetadataWrapper.java
Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1601562&r1=1601561&r2=1601562&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Tue Jun 10 07:25:50 2014
@@ -44,6 +44,24 @@
<dependencies>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>5.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>5.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.enterprise</artifactId>
+ <version>5.0.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -308,6 +326,16 @@
<artifactId>org.eclipse.osgi</artifactId>
<version>3.8.0.v20120529-1548</version>
</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/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ServiceDependencyTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ServiceDependencyTest.java?rev=1601562&r1=1601561&r2=1601562&view=diff
==============================================================================
---
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ServiceDependencyTest.java
(original)
+++
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/ServiceDependencyTest.java
Tue Jun 10 07:25:50 2014
@@ -263,7 +263,7 @@ public class ServiceDependencyTest exten
try {
Subsystem child =
installSubsystemFromFile(parent, APPLICATION_A);
try {
-
assertSubsystemImportServiceHeader(child,
"osgi.service;filter:=\"(&(objectClass=bundle.b))\";resolution:=mandatory;cardinality:=single");
+
assertSubsystemImportServiceHeader(child,
"osgi.service;filter:=\"(objectClass=bundle.b)\";resolution:=mandatory;cardinality:=single");
}
finally {
uninstallSubsystemSilently(child);
@@ -300,7 +300,7 @@ public class ServiceDependencyTest exten
try {
Subsystem subsystem =
installSubsystemFromFile(APPLICATION_B);
try {
- assertSubsystemImportServiceHeader(subsystem,
"osgi.service;filter:=\"(&(objectClass=bundle.a))\";resolution:=optional;cardinality:=single");
+ assertSubsystemImportServiceHeader(subsystem,
"osgi.service;filter:=\"(objectClass=bundle.a)\";resolution:=optional;cardinality:=single");
}
finally {
uninstallSubsystemSilently(subsystem);
Modified:
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java?rev=1601562&r1=1601561&r2=1601562&view=diff
==============================================================================
---
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
(original)
+++
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
Tue Jun 10 07:25:50 2014
@@ -237,8 +237,10 @@ public abstract class SubsystemTest exte
mavenBundle("org.eclipse.equinox",
"org.eclipse.equinox.coordinator").version("1.1.0.v20120522-1841"),
mavenBundle("org.eclipse.equinox",
"org.eclipse.equinox.event").versionAsInProject(),
mavenBundle("org.eclipse.equinox",
"org.eclipse.equinox.region").version("1.1.0.v20120522-1841"),
- mavenBundle("org.osgi",
"org.osgi.enterprise").version("5.0.0"),
+ mavenBundle("org.osgi",
"org.osgi.enterprise").versionAsInProject(),
mavenBundle("org.easymock",
"easymock").versionAsInProject(),
+ mavenBundle("org.ops4j.pax.logging",
"pax-logging-api").versionAsInProject(),
+ mavenBundle("org.ops4j.pax.logging",
"pax-logging-service").versionAsInProject(),
//
org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=7777"),
};
}
Modified:
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/GenericMetadataWrapper.java
URL:
http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/GenericMetadataWrapper.java?rev=1601562&r1=1601561&r2=1601562&view=diff
==============================================================================
---
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/GenericMetadataWrapper.java
(original)
+++
aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/util/GenericMetadataWrapper.java
Tue Jun 10 07:25:50 2014
@@ -48,4 +48,13 @@ public class GenericMetadataWrapper {
result = 31 * result + metadata.getDirectives().hashCode();
return result;
}
+
+ @Override
+ public String toString() {
+ return "GenericMetadata[" +
+ "namespace=" + metadata.getNamespace() + ", " +
+ "directives=" + metadata.getDirectives() + "," +
+ "attributes=" + metadata.getAttributes() + "," +
+ "]";
+ }
}
