Author: anierbeck
Date: Tue May 21 12:16:53 2013
New Revision: 1484772
URL: http://svn.apache.org/r1484772
Log:
fix minor test issues
Modified:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java
Modified:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java?rev=1484772&r1=1484771&r2=1484772&view=diff
==============================================================================
---
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
(original)
+++
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConditionalFeaturesTest.java
Tue May 21 12:16:53 2013
@@ -16,14 +16,12 @@
*/
package org.apache.karaf.itests;
-import junit.framework.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.ops4j.pax.exam.spi.reactors.EagerSingleStagedReactorFactory;
-import org.osgi.framework.Bundle;
@RunWith(JUnit4TestRunner.class)
@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
@@ -92,21 +90,4 @@ public class ConditionalFeaturesTest ext
}
assertBundleInstalled("org.apache.felix.webconsole.plugins.event");
}
-
- private void assertBundleInstalled(String name) {
- Assert.assertTrue("Bundle " + name + " should be installed",
isBundleInstalled(name));
- }
-
- private void assertBundleNotInstalled(String name) {
- Assert.assertFalse("Bundle " + name + " should not be installed",
isBundleInstalled(name));
- }
-
- private boolean isBundleInstalled(String symbolicName) {
- for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getSymbolicName().equals(symbolicName)) {
- return true;
- }
- }
- return false;
- }
}
Modified:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java?rev=1484772&r1=1484771&r2=1484772&view=diff
==============================================================================
---
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
(original)
+++
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
Tue May 21 12:16:53 2013
@@ -54,6 +54,7 @@ import org.ops4j.pax.exam.TestProbeBuild
import org.ops4j.pax.exam.junit.Configuration;
import org.ops4j.pax.exam.junit.ProbeBuilder;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
+import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
import org.osgi.framework.Filter;
@@ -271,4 +272,21 @@ public class KarafTestSupport {
public void assertContainsNot(String expectedPart, String actual) {
Assert.assertFalse("Should not contain '" + expectedPart + "' but was
: " + actual, actual.contains(expectedPart));
}
+
+ protected void assertBundleInstalled(String name) {
+ Assert.assertTrue("Bundle " + name + " should be installed",
isBundleInstalled(name));
+ }
+
+ protected void assertBundleNotInstalled(String name) {
+ Assert.assertFalse("Bundle " + name + " should not be installed",
isBundleInstalled(name));
+ }
+
+ private boolean isBundleInstalled(String symbolicName) {
+ for (Bundle bundle : bundleContext.getBundles()) {
+ if (bundle.getSymbolicName().equals(symbolicName)) {
+ return true;
+ }
+ }
+ return false;
+ }
}
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java
URL:
http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java?rev=1484772&r1=1484771&r2=1484772&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java
(original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java Tue
May 21 12:16:53 2013
@@ -34,7 +34,11 @@ public class WebTest extends KarafTestSu
@Before
public void installWarFeature() throws Exception {
- System.out.println(executeCommand("feature:install war"));
+ featureService.installFeature("war");
+ assertFeatureInstalled("war");
+ assertBundleInstalled("org.apache.karaf.web.command");
+ //just sleep for a while so blueprint is able to pick up the new
commands.
+ Thread.sleep(2000);
}
@Test
