Repository: camel Updated Branches: refs/heads/master e095075b0 -> 7fe487c68
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7fe487c6 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7fe487c6 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7fe487c6 Branch: refs/heads/master Commit: 7fe487c68229a7f5cd297cf7b7db53466373621e Parents: 8c2fa73 Author: Claus Ibsen <davscl...@apache.org> Authored: Sat Mar 12 10:30:40 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sat Mar 12 10:31:26 2016 +0100 ---------------------------------------------------------------------- .../camel/itest/karaf/AbstractFeatureTest.java | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7fe487c6/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java ---------------------------------------------------------------------- diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java index 60218ec..63f1688 100644 --- a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java +++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/AbstractFeatureTest.java @@ -60,14 +60,13 @@ public abstract class AbstractFeatureTest { @Before public void setUp() throws Exception { - LOG.info("Calling the setUp method "); - LOG.info("The BundleContext is " + bundleContext); + LOG.info("setUp() using BundleContext: {}", bundleContext); Thread.sleep(3000); } @After public void tearDown() throws Exception { - LOG.info("Calling the tearDown method "); + LOG.info("tearDown()"); } protected void testComponent(String component) throws Exception { @@ -162,15 +161,6 @@ public abstract class AbstractFeatureTest { versionAsInProject().type("xml/features"); } - public static UrlReference getKarafFeatureUrl() { - String karafVersion = System.getProperty("karafVersion"); - LOG.info("*** The karaf version is " + karafVersion + " ***"); - - String type = "xml/features"; - return mavenBundle().groupId("org.apache.karaf.assemblies.features"). - artifactId("standard").version(karafVersion).type(type); - } - private static void switchPlatformEncodingToUTF8() { try { System.setProperty("file.encoding", "UTF-8"); @@ -188,7 +178,7 @@ public abstract class AbstractFeatureTest { try { p.load(ins); } catch (Throwable t) { - // + // ignore } String karafVersion = p.getProperty("org.apache.karaf/apache-karaf/version"); if (karafVersion == null) { @@ -210,7 +200,7 @@ public abstract class AbstractFeatureTest { public static Option[] configure(String mainFeature, String... extraFeatures) { switchPlatformEncodingToUTF8(); String karafVersion = getKarafVersion(); - LOG.info("*** The karaf version is " + karafVersion + " ***"); + LOG.info("*** Apache Karaf version is " + karafVersion + " ***"); List<String> list = new ArrayList<String>(); list.add("camel-core"); @@ -243,7 +233,7 @@ public abstract class AbstractFeatureTest { vmOption("-Dfile.encoding=UTF-8"), - // install the unit test + // install junit getJUnitBundle(), // install the features
