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 2013/11/12 09:25:23 UTC
svn commit: r1540966 -
/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/
Author: cschneider
Date: Tue Nov 12 08:25:22 2013
New Revision: 1540966
URL: http://svn.apache.org/r1540966
Log:
Refactoring in test to make jmx handling a little simpler
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/InstanceTest.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/LogTest.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/ServiceTest.java
karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -48,8 +48,7 @@ public class BundleTests extends KarafTe
TabularDataSupport value = (TabularDataSupport) connection.getAttribute(name, "Bundles");
assertTrue(value.size() > 0);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -57,8 +57,7 @@ public class ConfigTest extends KarafTes
Map<String, String> properties = (Map<String, String>) connection.invoke(name, "listProperties", new Object[]{ "org.apache.karaf.features" }, new String[]{ "java.lang.String" });
assertTrue(properties.keySet().size() > 0);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -41,8 +41,7 @@ public class DiagnosticTest extends Kara
ObjectName name = new ObjectName("org.apache.karaf:type=diagnostic,name=root");
connection.invoke(name, "createDump", new Object[]{ "itest" }, new String[]{ "java.lang.String" });
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -56,8 +56,7 @@ public class FeatureTest extends KarafTe
TabularData features = (TabularData) connection.getAttribute(name, "Features");
assertTrue(features.size() > 0);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
@@ -85,8 +84,7 @@ public class FeatureTest extends KarafTe
connection.invoke(name, "installFeature", new Object[] { "eventadmin" }, new String[]{ "java.lang.String" });
connection.invoke(name, "uninstallFeature", new Object[] { "eventadmin" }, new String[]{ "java.lang.String" });
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
@@ -108,8 +106,7 @@ public class FeatureTest extends KarafTe
connection.invoke(name, "addRepository", new Object[] { "mvn:org.apache.karaf.cellar/apache-karaf-cellar/2.2.4/xml/features" }, new String[]{ "java.lang.String" });
connection.invoke(name, "removeRepository", new Object[] { "mvn:org.apache.karaf.cellar/apache-karaf-cellar/2.2.4/xml/features" }, new String[]{ "java.lang.String" });
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -51,8 +51,7 @@ public class HttpTest extends KarafTestS
TabularData servlets = (TabularData) connection.getAttribute(name, "Servlets");
assertTrue(servlets.size() > 0);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java?rev=1540966&r1=1540965&r2=1540966&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/InstanceTest.java Tue Nov 12 08:25:22 2013
@@ -53,8 +53,7 @@ public class InstanceTest extends KarafT
connection.invoke(name, "destroyInstance", new Object[]{ "itest2" }, new String[]{ "java.lang.String" });
Assert.assertEquals(oldNum, getInstancesNum(connection, name));
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -47,8 +47,7 @@ public class KarTest extends KarafTestSu
List<String> kars = (List<String>) connection.getAttribute(name, "Kars");
assertEquals(0, kars.size());
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Nov 12 08:25:22 2013
@@ -20,7 +20,9 @@ import static org.ops4j.pax.exam.karaf.o
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
import java.io.File;
+import java.io.IOException;
import java.io.PrintStream;
import java.util.Arrays;
import java.util.Collection;
@@ -349,5 +351,15 @@ public class KarafTestSupport {
assertFeatureInstalled(feature);
featureService.uninstallFeature(feature);
}
+
+ protected void close(Closeable closeAble) {
+ if (closeAble != null) {
+ try {
+ closeAble.close();
+ } catch (IOException e) {
+ throw new RuntimeException(e.getMessage(), e);
+ }
+ }
+ }
}
Modified: karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java?rev=1540966&r1=1540965&r2=1540966&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/LogTest.java Tue Nov 12 08:25:22 2013
@@ -54,8 +54,7 @@ public class LogTest extends KarafTestSu
String logLevel = (String) connection.getAttribute(name, "Level");
assertEquals("DEBUG", logLevel);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -57,8 +57,7 @@ public class ObrTest extends KarafTestSu
TabularData bundles = (TabularData) connection.getAttribute(name, "Bundles");
assertEquals(0, bundles.size());
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -48,8 +48,7 @@ public class PackageTest extends KarafTe
TabularData exports = (TabularData) connection.getAttribute(name, "Exports");
assertTrue(exports.size() > 0);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
@@ -70,8 +69,7 @@ public class PackageTest extends KarafTe
TabularData imports = (TabularData) connection.getAttribute(name, "Imports");
assertTrue(imports.size() > 0);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -48,8 +48,7 @@ public class ServiceTest extends KarafTe
TabularData services = (TabularData) connection.getAttribute(name, "Services");
assertTrue(services.size() > 0);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
Modified: 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=1540966&r1=1540965&r2=1540966&view=diff
==============================================================================
--- karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java (original)
+++ karaf/trunk/itests/src/test/java/org/apache/karaf/itests/SystemShutdownTest.java Tue Nov 12 08:25:22 2013
@@ -41,8 +41,7 @@ public class SystemShutdownTest extends
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();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -48,8 +48,7 @@ public class SystemTest extends KarafTes
String currentName = (String) connection.getAttribute(name, "Name");
assertEquals("root", currentName);
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Nov 12 08:25:22 2013
@@ -57,8 +57,7 @@ public class WebTest extends KarafTestSu
TabularData webBundles = (TabularData) connection.getAttribute(name, "WebBundles");
assertEquals(0, webBundles.size());
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}
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=1540966&r1=1540965&r2=1540966&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 Tue Nov 12 08:25:22 2013
@@ -51,8 +51,7 @@ public class WrapperTest extends KarafTe
ObjectName name = new ObjectName("org.apache.karaf:type=wrapper,name=root");
connection.invoke(name, "install", new Object[]{}, new String[]{});
} finally {
- if (connector != null)
- connector.close();
+ close(connector);
}
}