Updated Branches: refs/heads/master 3ec75ec79 -> 792dfb2ec
Skip test on java 1.6 which cannot run Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/792dfb2e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/792dfb2e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/792dfb2e Branch: refs/heads/master Commit: 792dfb2ecef2fda30c15557eee8144804abe42a8 Parents: 3ec75ec Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Jun 11 06:41:00 2013 -0400 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Jun 11 06:41:00 2013 -0400 ---------------------------------------------------------------------- camel-core/src/test/java/org/apache/camel/TestSupport.java | 8 ++++---- .../org/apache/camel/component/ComponentDiscoveryTest.java | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/792dfb2e/camel-core/src/test/java/org/apache/camel/TestSupport.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/TestSupport.java b/camel-core/src/test/java/org/apache/camel/TestSupport.java index e8f24e2..68e5889 100644 --- a/camel-core/src/test/java/org/apache/camel/TestSupport.java +++ b/camel-core/src/test/java/org/apache/camel/TestSupport.java @@ -490,7 +490,7 @@ public abstract class TestSupport extends TestCase { */ public static boolean isPlatform(String platform) { String osName = System.getProperty("os.name").toLowerCase(Locale.US); - return osName.indexOf(platform.toLowerCase(Locale.US)) > -1; + return osName.contains(platform.toLowerCase(Locale.US)); } /** @@ -503,7 +503,7 @@ public abstract class TestSupport extends TestCase { */ public static boolean isJavaVendor(String vendor) { String javaVendor = System.getProperty("java.vendor").toLowerCase(Locale.US); - return javaVendor.indexOf(vendor.toLowerCase(Locale.US)) > -1; + return javaVendor.contains(vendor.toLowerCase(Locale.US)); } /** @@ -511,11 +511,11 @@ public abstract class TestSupport extends TestCase { * <p/> * Uses <tt>java.version</tt> from the system properties to determine the version. * - * @param vendor such as IBM + * @param version such as 1.6 * @return <tt>true</tt> if its that vendor. */ public static boolean isJavaVersion(String version) { String javaVersion = System.getProperty("java.version"); - return javaVersion.indexOf(version.toLowerCase(Locale.US)) > -1; + return javaVersion.contains(version.toLowerCase(Locale.US)); } } http://git-wip-us.apache.org/repos/asf/camel/blob/792dfb2e/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java b/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java index 903dff7..feaf4b4 100644 --- a/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java +++ b/camel-core/src/test/java/org/apache/camel/component/ComponentDiscoveryTest.java @@ -28,6 +28,7 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.camel.TestSupport.isJavaVersion; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -59,6 +60,11 @@ public class ComponentDiscoveryTest { @Test public void testComponentDocumentation() throws Exception { + // cannot be tested on java 1.6 + if (isJavaVersion("1.6")) { + return; + } + CamelContext context = new DefaultCamelContext(); String html = context.getComponentDocumentation("bean"); assertNotNull("Should have found some auto-generated HTML if on Java 7", html);
