You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2012/11/24 18:27:24 UTC
svn commit: r1413210 - in
/camel/trunk/camel-core/src/test/java/org/apache/camel: TestSupport.java
processor/SplitterWithScannerIoExceptionTest.java
Author: cmueller
Date: Sat Nov 24 17:27:23 2012
New Revision: 1413210
URL: http://svn.apache.org/viewvc?rev=1413210&view=rev
Log:
skip tests on Java 7 which only fails on Java 7
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithScannerIoExceptionTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java?rev=1413210&r1=1413209&r2=1413210&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/TestSupport.java Sat Nov 24 17:27:23 2012
@@ -506,4 +506,8 @@ public abstract class TestSupport extend
return javaVendor.indexOf(vendor.toLowerCase(Locale.US)) > -1;
}
+ public static boolean isJavaVersion(String version) {
+ String javaVersion = System.getProperty("java.version");
+ return javaVersion.indexOf(version.toLowerCase(Locale.US)) > -1;
+ }
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithScannerIoExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithScannerIoExceptionTest.java?rev=1413210&r1=1413209&r2=1413210&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithScannerIoExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterWithScannerIoExceptionTest.java Sat Nov 24 17:27:23 2012
@@ -22,6 +22,10 @@ import org.apache.camel.builder.RouteBui
public class SplitterWithScannerIoExceptionTest extends ContextTestSupport {
public void testSplitterStreamingWithError() throws Exception {
+ if (isJavaVersion("1.7")) {
+ return;
+ }
+
getMockEndpoint("mock:a").expectedMessageCount(252);
getMockEndpoint("mock:b").expectedMessageCount(0);
getMockEndpoint("mock:b").setSleepForEmptyTest(3000);