svn commit: r1540045 - /karaf/trunk/main/src/test/java/org/apache/karaf/main/MainStartTest.java

[jbonofre]

Author: jbonofre
Date: Fri Nov  8 14:20:29 2013
New Revision: 1540045

URL: http://svn.apache.org/r1540045
Log:
Removing Stop unit test as surefire doesn't support System.exit()

Modified:
    karaf/trunk/main/src/test/java/org/apache/karaf/main/MainStartTest.java

Modified: 
karaf/trunk/main/src/test/java/org/apache/karaf/main/MainStartTest.java
URL: 
http://svn.apache.org/viewvc/karaf/trunk/main/src/test/java/org/apache/karaf/main/MainStartTest.java?rev=1540045&r1=1540044&r2=1540045&view=diff
==============================================================================
--- karaf/trunk/main/src/test/java/org/apache/karaf/main/MainStartTest.java 
(original)
+++ karaf/trunk/main/src/test/java/org/apache/karaf/main/MainStartTest.java Fri 
Nov  8 14:20:29 2013
@@ -18,8 +18,6 @@
  */
 package org.apache.karaf.main;
 
-import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
-
 import java.io.File;
 
 import junit.framework.Assert;
@@ -27,9 +25,7 @@ import junit.framework.Assert;
 import org.apache.karaf.main.util.Utils;
 import org.junit.After;
 import org.junit.Test;
-import org.ops4j.pax.tinybundles.core.TinyBundles;
 import org.osgi.framework.Bundle;
-import org.osgi.framework.Constants;
 import org.osgi.framework.launch.Framework;
 
 public class MainStartTest {
@@ -71,38 +67,4 @@ public class MainStartTest {
                Assert.assertEquals(Bundle.ACTIVE, bundle2.getState());
        }
 
-    @Test
-    public void testStopWithTimeout() throws Exception {
-        File basedir = new 
File(getClass().getClassLoader().getResource("foo").getPath()).getParentFile();
-        File home = new File(basedir, "test-karaf-home");
-        File data = new File(home, "data");
-
-        Utils.deleteDirectory(data);
-
-               String[] args = new String[0];
-               System.setProperty("karaf.home", home.toString());
-               System.setProperty("karaf.data", data.toString());
-        System.setProperty("karaf.framework.factory", 
"org.apache.felix.framework.FrameworkFactory");
-
-        main = new Main(args);
-        main.launch();
-        Framework framework = main.getFramework();
-        String activatorName = 
TimeoutShutdownActivator.class.getName().replace('.', '/') + ".class";
-        Bundle bundle = framework.getBundleContext().installBundle("foo",
-                TinyBundles.bundle()
-                    .set( Constants.BUNDLE_ACTIVATOR, 
TimeoutShutdownActivator.class.getName() )
-                    .add( activatorName, 
getClass().getClassLoader().getResourceAsStream( activatorName ) )
-                    .build( withBnd() )
-        );
-        bundle.start();
-
-        Thread.sleep(1000);
-
-        long t0 = System.currentTimeMillis();
-        Stop.main(null);
-        main.awaitShutdown();
-        long t1 = System.currentTimeMillis();
-//        System.err.println("Shutdown duration: " + (t1 - t0) + " ms");
-        Assert.assertTrue((t1 - t0) > TimeoutShutdownActivator.TIMEOUT / 2);
-    }
 }