Repository: karaf Updated Branches: refs/heads/karaf-2.3.x 1b5fb8f48 -> 5bc3303b8
[KARAF-2374] Re-enable the testStopWithTimeout test Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/5bc3303b Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/5bc3303b Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/5bc3303b Branch: refs/heads/karaf-2.3.x Commit: 5bc3303b801844e0d807541a2f11b7250ac13e96 Parents: 1b5fb8f Author: Jean-Baptiste Onofré <[email protected]> Authored: Wed Jul 23 11:31:56 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Wed Jul 23 11:31:56 2014 +0200 ---------------------------------------------------------------------- .../org/apache/karaf/main/MainStartTest.java | 31 -------------------- 1 file changed, 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/5bc3303b/main/src/test/java/org/apache/karaf/main/MainStartTest.java ---------------------------------------------------------------------- diff --git a/main/src/test/java/org/apache/karaf/main/MainStartTest.java b/main/src/test/java/org/apache/karaf/main/MainStartTest.java index 34d8ed8..7cc02ba 100644 --- a/main/src/test/java/org/apache/karaf/main/MainStartTest.java +++ b/main/src/test/java/org/apache/karaf/main/MainStartTest.java @@ -33,38 +33,7 @@ import org.osgi.framework.launch.Framework; public class MainStartTest { - @Test - @Ignore("Unit test for KARAF-334 disabled for now") - public void testAutoStart() throws Exception { - File basedir = new File(getClass().getClassLoader().getResource("foo").getPath()).getParentFile(); - File home = new File(basedir, "test-karaf-home"); - // create an unique data folder to avoid conflict with other unit tests (KARAF-2558) - File data = new File(home, "data" + System.currentTimeMillis()); - - String[] args = new String[0]; - String fileMVNbundle = new File(home, "bundles/pax-url-mvn.jar").toURI().toURL().toExternalForm(); - String mvnUrl = "mvn:org.osgi/org.osgi.compendium/4.2.0"; - System.setProperty("karaf.home", home.toString()); - System.setProperty("karaf.data", data.toString()); - System.setProperty("karaf.auto.start.1", "\""+fileMVNbundle+"|unused\""); - System.setProperty("karaf.auto.start.2", "\""+mvnUrl+"|unused\""); - System.setProperty("karaf.maven.convert", "false"); - - Main main = new Main(args); - main.launch(); - Thread.sleep(1000); - Framework framework = main.getFramework(); - Bundle[] bundles = framework.getBundleContext().getBundles(); - Assert.assertEquals(3, bundles.length); - Assert.assertEquals(fileMVNbundle, bundles[1].getLocation()); - Assert.assertEquals(mvnUrl, bundles[2].getLocation()); - Assert.assertEquals(Bundle.ACTIVE, bundles[1].getState()); - Assert.assertEquals(Bundle.ACTIVE, bundles[2].getState()); - main.destroy(); - } - @Test - @Ignore("Unit test for testStopWithTimeout disabled for now") public void testStopWithTimeout() throws Exception { File basedir = new File(getClass().getClassLoader().getResource("foo").getPath()).getParentFile(); File home = new File(basedir, "test-karaf-home");
