Updated Branches: refs/heads/camel-2.10.x 24b266018 -> 606dccfe2 refs/heads/camel-2.11.x f27b776b5 -> 08fae0739 refs/heads/master 40d788766 -> 0d17ff78e
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8db19229 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8db19229 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8db19229 Branch: refs/heads/master Commit: 8db1922935396d96108c87952f82ab30990c3dcf Parents: 40d7887 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Aug 7 08:31:08 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Aug 7 08:31:08 2013 +0200 ---------------------------------------------------------------------- .../camel/test/junit4/CamelTestSupport.java | 4 ++-- .../org/apache/camel/test/junit4/TestSupport.java | 18 ++++++++++++++---- 2 files changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/8db19229/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java index a373488..24e6deb 100644 --- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java +++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java @@ -229,7 +229,7 @@ public abstract class CamelTestSupport extends TestSupport { } /** - * Strategy to perform any post setup after {@link CamelContext} is createt. + * Strategy to perform any post setup after {@link CamelContext} is created */ protected void doPostSetup() throws Exception { // noop @@ -254,7 +254,7 @@ public abstract class CamelTestSupport extends TestSupport { // set debugger if enabled if (isUseDebugger()) { if (context.getStatus().equals(ServiceStatus.Started)) { - log.info("Cannot setting the Debugger to the starting CamelConetxt, stop the CamelContext now."); + log.info("Cannot setting the Debugger to the starting CamelContext, stop the CamelContext now."); // we need to stop the context first to setup the debugger context.stop(); } http://git-wip-us.apache.org/repos/asf/camel/blob/8db19229/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java index 942d42e..c7a7468 100644 --- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java +++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java @@ -38,11 +38,9 @@ import org.apache.camel.impl.DefaultCamelContext; import org.apache.camel.impl.DefaultExchange; import org.apache.camel.processor.DelegateProcessor; import org.apache.camel.util.PredicateAssertHelper; - import org.junit.Assert; import org.junit.Rule; import org.junit.rules.TestName; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -152,7 +150,7 @@ public abstract class TestSupport extends Assert { public static void assertEndpointUri(Endpoint endpoint, String uri) { assertNotNull("Endpoint is null when expecting endpoint for: " + uri, endpoint); - assertEquals("Endoint uri for: " + endpoint, uri, endpoint.getEndpointUri()); + assertEquals("Endpoint uri for: " + endpoint, uri, endpoint.getEndpointUri()); } /** @@ -368,6 +366,7 @@ public abstract class TestSupport extends Assert { * If a processor is wrapped with a bunch of DelegateProcessor or DelegateAsyncProcessor objects * this call will drill through them and return the wrapped Processor. */ + @Deprecated public static Processor unwrap(Processor processor) { while (true) { if (processor instanceof DelegateProcessor) { @@ -384,6 +383,7 @@ public abstract class TestSupport extends Assert { * <p/> * Returns null if no channel is found. */ + @Deprecated public static Channel unwrapChannel(Processor processor) { while (true) { if (processor instanceof Channel) { @@ -549,7 +549,7 @@ public abstract class TestSupport extends Assert { /** * Is this Java 1.7 * - * @return <tt>true</tt> if its Java 1.7, <tt>false</tt> if its not (for example Java 1.8 or better) + * @return <tt>true</tt> if its Java 1.7, <tt>false</tt> if its not (for example Java 1.6 or older) */ public static boolean isJava17() { String javaVersion = System.getProperty("java.version").toLowerCase(Locale.US); @@ -557,6 +557,16 @@ public abstract class TestSupport extends Assert { } /** + * Is this Java 1.8 + * + * @return <tt>true</tt> if its Java 1.8, <tt>false</tt> if its not (for example Java 1.7 or older) + */ + public static boolean isJava18() { + String javaVersion = System.getProperty("java.version").toLowerCase(Locale.US); + return javaVersion.startsWith("1.8"); + } + + /** * Gets the current test method name * * @return the method name
