You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/10/11 19:01:32 UTC
svn commit: r1397165 - in
/karaf/trunk/itests/src/test/java/org/apache/karaf/itests: ./ features/
Author: cschneider
Date: Thu Oct 11 17:01:31 2012
New Revision: 1397165
URL: http://svn.apache.org/viewvc?rev=1397165&view=rev
Log:
KARAF-1916 Speed up tests y using EagerSingleStagedReactorFactory
Added:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java (with props)
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java
- copied, changed from r1396984, karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BootFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java
- copied, changed from r1396984, karaf/trunk/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java
- copied, changed from r1396984, karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java
- copied, changed from r1396984, karaf/trunk/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java
Removed:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BootFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java
Modified:
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarafTestSupport.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WebTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BundleTests.java Thu Oct 11 17:01:31 2012
@@ -13,22 +13,22 @@
*/
package org.apache.karaf.itests;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.openmbean.TabularDataSupport;
import javax.management.remote.JMXConnector;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class BundleTests extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ConfigTest.java Thu Oct 11 17:01:31 2012
@@ -13,24 +13,24 @@
*/
package org.apache.karaf.itests;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+import java.util.Map;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
-import java.util.List;
-import java.util.Map;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class ConfigTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/DiagnosticTest.java Thu Oct 11 17:01:31 2012
@@ -17,7 +17,7 @@ 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.AllConfinedStagedReactorFactory;
+import org.ops4j.pax.exam.spi.reactors.EagerSingleStagedReactorFactory;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
@@ -26,7 +26,7 @@ import javax.management.remote.JMXConnec
import static org.junit.Assert.assertTrue;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class DiagnosticTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/FeatureTest.java Thu Oct 11 17:01:31 2012
@@ -25,10 +25,10 @@ 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.AllConfinedStagedReactorFactory;
+import org.ops4j.pax.exam.spi.reactors.EagerSingleStagedReactorFactory;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class FeatureTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/HttpTest.java Thu Oct 11 17:01:31 2012
@@ -13,23 +13,23 @@
*/
package org.apache.karaf.itests;
-import org.junit.Before;
-import org.junit.Ignore;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertTrue;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
import javax.management.remote.JMXConnector;
-import static org.junit.Assert.assertTrue;
+import org.junit.Before;
+import org.junit.Ignore;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class HttpTest extends KarafTestSupport {
@Before
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/JaasTest.java Thu Oct 11 17:01:31 2012
@@ -13,16 +13,16 @@
*/
package org.apache.karaf.itests;
+import static org.junit.Assert.assertTrue;
+
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.AllConfinedStagedReactorFactory;
-
-import static org.junit.Assert.assertTrue;
+import org.ops4j.pax.exam.spi.reactors.EagerSingleStagedReactorFactory;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class JaasTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/KarTest.java Thu Oct 11 17:01:31 2012
@@ -13,21 +13,22 @@
*/
package org.apache.karaf.itests;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
-import java.util.List;
-import static org.junit.Assert.assertEquals;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class KarTest extends KarafTestSupport {
@Test
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=1397165&r1=1397164&r2=1397165&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 Thu Oct 11 17:01:31 2012
@@ -76,7 +76,7 @@ public class KarafTestSupport {
protected BundleContext bundleContext;
@Inject
- FeaturesService featureService;
+ protected FeaturesService featureService;
/**
* To make sure the tests run only when the boot features are fully installed
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ObrTest.java Thu Oct 11 17:01:31 2012
@@ -13,23 +13,24 @@
*/
package org.apache.karaf.itests;
-import org.junit.Before;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
import javax.management.remote.JMXConnector;
-import java.util.List;
-import static org.junit.Assert.assertEquals;
+import org.junit.Before;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class ObrTest extends KarafTestSupport {
@Before
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/PackageTest.java Thu Oct 11 17:01:31 2012
@@ -13,22 +13,22 @@
*/
package org.apache.karaf.itests;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
import javax.management.remote.JMXConnector;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class PackageTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/RegionTest.java Thu Oct 11 17:01:31 2012
@@ -19,10 +19,10 @@ 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.AllConfinedStagedReactorFactory;
+import org.ops4j.pax.exam.spi.reactors.EagerSingleStagedReactorFactory;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class RegionTest extends KarafTestSupport {
@Test
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/ServiceTest.java Thu Oct 11 17:01:31 2012
@@ -13,22 +13,22 @@
*/
package org.apache.karaf.itests;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
import javax.management.remote.JMXConnector;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class ServiceTest extends KarafTestSupport {
@Test
Added: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java?rev=1397165&view=auto
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java (added)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java Thu Oct 11 17:01:31 2012
@@ -0,0 +1,49 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.karaf.itests;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+
+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.AllConfinedStagedReactorFactory;
+
+@RunWith(JUnit4TestRunner.class)
+@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+public class SystemShutdownTest extends KarafTestSupport {
+
+ @Test
+ public void shutdownCommand() throws Exception {
+ System.out.println(executeCommand("system:shutdown -f"));
+ }
+
+ @Test
+ public void shutdownViaMBean() throws Exception {
+ JMXConnector connector = null;
+ try {
+ connector = this.getJMXConnector();
+ MBeanServerConnection connection = connector.getMBeanServerConnection();
+ ObjectName name = new ObjectName("org.apache.karaf:type=system,name=root");
+ connection.invoke(name, "halt", new Object[]{}, new String[]{});
+ } finally {
+ if (connector != null)
+ connector.close();
+ }
+ }
+
+}
Propchange: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemTest.java Thu Oct 11 17:01:31 2012
@@ -13,21 +13,21 @@
*/
package org.apache.karaf.itests;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class SystemTest extends KarafTestSupport {
@Test
@@ -118,23 +118,4 @@ public class SystemTest extends KarafTes
}
}
- @Test
- public void shutdownCommand() throws Exception {
- System.out.println(executeCommand("system:shutdown -f"));
- }
-
- @Test
- public void shutdownViaMBean() throws Exception {
- JMXConnector connector = null;
- try {
- connector = this.getJMXConnector();
- MBeanServerConnection connection = connector.getMBeanServerConnection();
- ObjectName name = new ObjectName("org.apache.karaf:type=system,name=root");
- connection.invoke(name, "halt", new Object[]{}, new String[]{});
- } finally {
- if (connector != null)
- connector.close();
- }
- }
-
}
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=1397165&r1=1397164&r2=1397165&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 Thu Oct 11 17:01:31 2012
@@ -13,23 +13,23 @@
*/
package org.apache.karaf.itests;
-import org.junit.Before;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.openmbean.TabularData;
import javax.management.remote.JMXConnector;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
+import org.junit.Before;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class WebTest extends KarafTestSupport {
@Before
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java?rev=1397165&r1=1397164&r2=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/WrapperTest.java Thu Oct 11 17:01:31 2012
@@ -13,21 +13,21 @@
*/
package org.apache.karaf.itests;
-import org.junit.Before;
-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.AllConfinedStagedReactorFactory;
+import static org.junit.Assert.assertFalse;
import javax.management.MBeanServerConnection;
import javax.management.ObjectName;
import javax.management.remote.JMXConnector;
-import static org.junit.Assert.assertFalse;
+import org.junit.Before;
+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;
@RunWith(JUnit4TestRunner.class)
-@ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
+@ExamReactorStrategy(EagerSingleStagedReactorFactory.class)
public class WrapperTest extends KarafTestSupport {
@Before
Copied: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java (from r1396984, karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BootFeaturesTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java?p2=karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java&p1=karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BootFeaturesTest.java&r1=1396984&r2=1397165&rev=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/BootFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/BootFeaturesTest.java Thu Oct 11 17:01:31 2012
@@ -1,5 +1,6 @@
-package org.apache.karaf.itests;
+package org.apache.karaf.itests.features;
+import org.apache.karaf.itests.KarafTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
Copied: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java (from r1396984, karaf/trunk/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java?p2=karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java&p1=karaf/trunk/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java&r1=1396984&r2=1397165&rev=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/EnterpriseFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/EnterpriseFeaturesTest.java Thu Oct 11 17:01:31 2012
@@ -11,8 +11,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.itests;
+package org.apache.karaf.itests.features;
+import org.apache.karaf.itests.KarafTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;
Copied: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java (from r1396984, karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java?p2=karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java&p1=karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java&r1=1396984&r2=1397165&rev=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SpringFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/SpringFeaturesTest.java Thu Oct 11 17:01:31 2012
@@ -11,8 +11,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.itests;
+package org.apache.karaf.itests.features;
+import org.apache.karaf.itests.KarafTestSupport;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
Copied: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java (from r1396984, karaf/trunk/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java)
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java?p2=karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java&p1=karaf/trunk/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java&r1=1396984&r2=1397165&rev=1397165&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/StandardFeaturesTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/features/StandardFeaturesTest.java Thu Oct 11 17:01:31 2012
@@ -11,8 +11,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.karaf.itests;
+package org.apache.karaf.itests.features;
+import org.apache.karaf.itests.KarafTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.ExamReactorStrategy;