You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by pi...@apache.org on 2012/04/10 10:34:20 UTC
svn commit: r1311633 - in /karaf/trunk/tooling/exam/regression: pom.xml
src/test/java/org/apache/karaf/tooling/exam/regression/BootDelegationOptionTest.java
src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
Author: pieber
Date: Tue Apr 10 08:34:19 2012
New Revision: 1311633
URL: http://svn.apache.org/viewvc?rev=1311633&view=rev
Log:
Fixed various minor itest errors added up over the time...
Signed-off-by: Andreas Pieber <an...@gmail.com>
Modified:
karaf/trunk/tooling/exam/regression/pom.xml
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/BootDelegationOptionTest.java
karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
Modified: karaf/trunk/tooling/exam/regression/pom.xml
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/pom.xml?rev=1311633&r1=1311632&r2=1311633&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/pom.xml (original)
+++ karaf/trunk/tooling/exam/regression/pom.xml Tue Apr 10 08:34:19 2012
@@ -63,6 +63,13 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
+ <artifactId>standard</artifactId>
+ <type>xml</type>
+ <classifier>features</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf.features</groupId>
<artifactId>org.apache.karaf.features.core</artifactId>
<version>${project.version}</version>
</dependency>
Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/BootDelegationOptionTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/BootDelegationOptionTest.java?rev=1311633&r1=1311632&r2=1311633&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/BootDelegationOptionTest.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/BootDelegationOptionTest.java Tue Apr 10 08:34:19 2012
@@ -50,8 +50,16 @@ public class BootDelegationOptionTest {
Properties prop = new Properties();
prop.load(new FileInputStream("etc/config.properties"));
String delegation = prop.get("org.osgi.framework.bootdelegation").toString();
- assertEquals(
- "org.apache.karaf.jaas.boot,sun.*,com.sun.*,javax.transaction,javax.transaction.*,sun.*,com.sun.*",
+ assertEquals(new StringBuilder()
+ .append("org.apache.karaf.jaas.boot,")
+ .append("org.apache.karaf.jaas.boot.principal,")
+ .append("sun.*,")
+ .append("com.sun.*,")
+ .append("javax.transaction,")
+ .append("javax.transaction.*,")
+ .append("sun.*,")
+ .append("com.sun.*")
+ .toString(),
delegation);
}
Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java?rev=1311633&r1=1311632&r2=1311633&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/FeaturesScannerProvisionTest.java Tue Apr 10 08:34:19 2012
@@ -48,12 +48,12 @@ public class FeaturesScannerProvisionTes
.versionAsInProject()),
scanFeatures(
maven().groupId("org.apache.karaf.features").artifactId("standard").type("xml")
- .classifier("features").version("2.2.4"), "deployers", "wrapper").start() };
+ .classifier("features").versionAsInProject(), "scheduler", "wrapper").start() };
}
@Test
public void test() throws Exception {
- assertTrue(featuresService.isInstalled(featuresService.getFeature("deployers")));
+ assertTrue(featuresService.isInstalled(featuresService.getFeature("scheduler")));
assertTrue(featuresService.isInstalled(featuresService.getFeature("wrapper")));
}