You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/10/18 14:47:08 UTC
[1/3] git commit: Removed script test helper that checked for java
1.5 or 1.6+. No longer needed as java 1.6 is now minimum. Also camel-test has
better apis for checking java version ranges / java vendors etc.
Updated Branches:
refs/heads/camel-2.12.x 1c00d97bd -> f91575f65
refs/heads/master 4a89ad969 -> 4feb7bd09
Removed script test helper that checked for java 1.5 or 1.6+. No longer needed as java 1.6 is now minimum. Also camel-test has better apis for checking java version ranges / java vendors etc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/37e032b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/37e032b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/37e032b1
Branch: refs/heads/master
Commit: 37e032b1921f82682c038ad168a4f91fa383a8b5
Parents: 4a89ad9
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 18 14:46:07 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 18 14:46:07 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/ScriptTestHelper.java | 42 --------------------
.../script/BeanShellScriptRouteTest.java | 9 -----
.../script/GroovyExpressionListMapTest.java | 5 ---
.../script/GroovyPropertiesFunctionTest.java | 7 ----
.../script/GroovyPropertyComponentTest.java | 7 ----
.../builder/script/GroovyScriptRouteTest.java | 5 ---
.../GroovySetHeaderPropertyComponentTest.java | 11 -----
.../script/JavaScriptExpressionListMapTest.java | 5 ---
.../script/JavaScriptExpressionTest.java | 31 +--------------
.../JavaScriptPropertiesFunctionTest.java | 5 ---
.../apache/camel/builder/script/Jsr223Test.java | 5 ---
.../script/LanguageJavaScriptNoCacheTest.java | 5 ---
.../builder/script/LanguageJavaScriptTest.java | 5 ---
.../builder/script/PythonExpressionTest.java | 9 -----
.../builder/script/RubyExpressionTest.java | 9 -----
.../script/example/AnyLanguageFilterTest.java | 9 -----
.../script/example/BeanShellFilterTest.java | 9 -----
.../script/example/GroovyFilterTest.java | 9 -----
.../script/example/JavaScriptFilterTest.java | 9 -----
.../script/example/PythonFilterTest.java | 9 -----
.../builder/script/example/RubyFilterTest.java | 9 -----
.../language/script/JavaScriptLanguageTest.java | 5 ---
.../language/script/PythonLanguageTest.java | 5 ---
.../script/ScriptLanguageResourceTest.java | 5 ---
24 files changed, 2 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/ScriptTestHelper.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/ScriptTestHelper.java b/components/camel-script/src/test/java/org/apache/camel/ScriptTestHelper.java
deleted file mode 100644
index eb6d839..0000000
--- a/components/camel-script/src/test/java/org/apache/camel/ScriptTestHelper.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel;
-
-/**
- * Script test helper.
- *
- * @version
- */
-public final class ScriptTestHelper {
-
- private ScriptTestHelper() {
- }
-
- public static boolean canRunTestOnThisPlatform() {
- // requires java 1.6
-
- String version = System.getProperty("java.version");
- String[] numbers = version.split("\\.");
- if (Integer.valueOf(numbers[0]) > 1 || Integer.valueOf(numbers[1]) > 5) {
- // JDK 1.6 or newer (eg JDK 2.x)
- return true;
- }
-
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
index 715f17f..3757112 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/BeanShellScriptRouteTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.script;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -33,10 +32,6 @@ public class BeanShellScriptRouteTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("mock:unmatched").expectedMessageCount(0);
@@ -49,10 +44,6 @@ public class BeanShellScriptRouteTest extends CamelTestSupport {
@Test
public void testSendNonMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(1);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
index f9f001b..cd7956e 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyExpressionListMapTest.java
@@ -21,7 +21,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -34,10 +33,6 @@ public class GroovyExpressionListMapTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertiesFunctionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertiesFunctionTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertiesFunctionTest.java
index 0cb1aa3..557623e 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertiesFunctionTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertiesFunctionTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.properties.PropertiesComponent;
@@ -30,12 +29,6 @@ public class GroovyPropertiesFunctionTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
- log.info("Can run this test");
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
mock.expectedHeaderReceived("myHeader", "Kong");
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertyComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertyComponentTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertyComponentTest.java
index 67e799a..76d82ad 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertyComponentTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyPropertyComponentTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.properties.PropertiesComponent;
@@ -30,12 +29,6 @@ public class GroovyPropertyComponentTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
- log.info("Can run this test");
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
getMockEndpoint("mock:unmatched").expectedMessageCount(0);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java
index 3dfa21e..49ad6b0 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovyScriptRouteTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -31,10 +30,6 @@ public class GroovyScriptRouteTest extends CamelTestSupport {
@Test
public void testGroovyScript() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
mock.expectedHeaderReceived("foo", "Hello World");
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovySetHeaderPropertyComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovySetHeaderPropertyComponentTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovySetHeaderPropertyComponentTest.java
index 0677581..046d2bd 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovySetHeaderPropertyComponentTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/GroovySetHeaderPropertyComponentTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.properties.PropertiesComponent;
@@ -30,12 +29,6 @@ public class GroovySetHeaderPropertyComponentTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
- log.info("Can run this test");
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
mock.expectedHeaderReceived("myHeader", "Kong");
@@ -47,10 +40,6 @@ public class GroovySetHeaderPropertyComponentTest extends CamelTestSupport {
@Test
public void testNumber() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived(5);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java
index 7a1087b..ec8eec8 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionListMapTest.java
@@ -21,7 +21,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -34,10 +33,6 @@ public class JavaScriptExpressionListMapTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
index d02b1c2..acdc4aa 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptExpressionTest.java
@@ -21,7 +21,6 @@ import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -34,10 +33,6 @@ public class JavaScriptExpressionTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -53,10 +48,6 @@ public class JavaScriptExpressionTest extends CamelTestSupport {
@Test
public void testSendNonMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(1);
@@ -70,10 +61,6 @@ public class JavaScriptExpressionTest extends CamelTestSupport {
@Test
// START SNIPPET: e1
public void testArgumentsExample() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(1);
@@ -91,10 +78,6 @@ public class JavaScriptExpressionTest extends CamelTestSupport {
@Test
public void testArgumentsWithStringMap() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(1);
@@ -113,10 +96,6 @@ public class JavaScriptExpressionTest extends CamelTestSupport {
@Test
public void testArgumentsWithIntegerMap() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(1);
@@ -133,10 +112,6 @@ public class JavaScriptExpressionTest extends CamelTestSupport {
@Test
public void testArgumentsWithNonMap() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(1);
@@ -151,11 +126,9 @@ public class JavaScriptExpressionTest extends CamelTestSupport {
@Test
public void testSendingRequestInMutipleThreads() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(100);
+
long start = System.currentTimeMillis();
ExecutorService executorService = Executors.newFixedThreadPool(100);
for (int i = 0; i < 100; i++) {
@@ -176,8 +149,8 @@ public class JavaScriptExpressionTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
long delta = System.currentTimeMillis() - start;
log.info("Processing the 100 request tooks: " + delta + " ms");
+
executorService.shutdown();
-
}
protected RouteBuilder createRouteBuilder() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptPropertiesFunctionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptPropertiesFunctionTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptPropertiesFunctionTest.java
index a23b715..60af252 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptPropertiesFunctionTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/JavaScriptPropertiesFunctionTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.properties.PropertiesComponent;
@@ -30,10 +29,6 @@ public class JavaScriptPropertiesFunctionTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
mock.expectedHeaderReceived("myHeader", "Kong");
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
index d0e24c8..22db508 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/Jsr223Test.java
@@ -20,7 +20,6 @@ import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import junit.framework.TestCase;
-import org.apache.camel.ScriptTestHelper;
import org.junit.Test;
/**
@@ -31,10 +30,6 @@ public class Jsr223Test extends TestCase {
@Test
public void testLanguageNames() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
ScriptEngineManager manager = new ScriptEngineManager();
for (String scriptName : scriptNames) {
ScriptEngine engine = manager.getEngineByName(scriptName);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
index 1f3b903..504b35f 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -29,10 +28,6 @@ public class LanguageJavaScriptNoCacheTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived(7, 9);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
index 26c5fd9..46df9ae 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.builder.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
@@ -29,10 +28,6 @@ public class LanguageJavaScriptTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived(7, 9);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/PythonExpressionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/PythonExpressionTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/PythonExpressionTest.java
index fdbd802..27be36a 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/PythonExpressionTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/PythonExpressionTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.script;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -31,10 +30,6 @@ public class PythonExpressionTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("mock:unmatched").expectedMessageCount(0);
@@ -47,10 +42,6 @@ public class PythonExpressionTest extends CamelTestSupport {
@Test
public void testSendNonMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(1);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyExpressionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyExpressionTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyExpressionTest.java
index aaeb97d..55fc06c 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyExpressionTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/RubyExpressionTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.builder.script;
import java.util.HashMap;
import java.util.Map;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -33,10 +32,6 @@ public class RubyExpressionTest extends CamelTestSupport {
@Test
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(1);
getMockEndpoint("mock:unmatched").expectedMessageCount(0);
@@ -49,10 +44,6 @@ public class RubyExpressionTest extends CamelTestSupport {
@Test
public void testSendNonMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedMessageCount(0);
getMockEndpoint("mock:unmatched").expectedMessageCount(1);
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
index aab4a02..097889e 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.builder.script.example;
import org.apache.camel.CamelContext;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,19 +27,11 @@ public class AnyLanguageFilterTest extends XPathFilterTest {
@Override
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendMatchingMessage();
}
@Override
public void testSendNotMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendNotMatchingMessage();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
index 0fd8ed7..551292e 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.builder.script.example;
import org.apache.camel.CamelContext;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,19 +27,11 @@ public class BeanShellFilterTest extends XPathFilterTest {
@Override
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendMatchingMessage();
}
@Override
public void testSendNotMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendNotMatchingMessage();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java
index 412645f..36524db 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.builder.script.example;
import org.apache.camel.CamelContext;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,19 +27,11 @@ public class GroovyFilterTest extends XPathFilterTest {
@Override
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendMatchingMessage();
}
@Override
public void testSendNotMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendNotMatchingMessage();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
index f4799ec..75b02fe 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.builder.script.example;
import org.apache.camel.CamelContext;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,19 +27,11 @@ public class JavaScriptFilterTest extends XPathFilterTest {
@Override
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendMatchingMessage();
}
@Override
public void testSendNotMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendNotMatchingMessage();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java
index bf8a92a..b3aff35 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.builder.script.example;
import org.apache.camel.CamelContext;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,19 +27,11 @@ public class PythonFilterTest extends XPathFilterTest {
@Override
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendMatchingMessage();
}
@Override
public void testSendNotMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendNotMatchingMessage();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
index 529389c..07beadd 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.builder.script.example;
import org.apache.camel.CamelContext;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.spring.SpringCamelContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,19 +27,11 @@ public class RubyFilterTest extends XPathFilterTest {
@Override
public void testSendMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendMatchingMessage();
}
@Override
public void testSendNotMatchingMessage() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
super.testSendNotMatchingMessage();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java b/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java
index 13d77a0..6eacd14 100644
--- a/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.language.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.test.junit4.LanguageTestSupport;
import org.junit.Test;
@@ -27,10 +26,6 @@ public class JavaScriptLanguageTest extends LanguageTestSupport {
@Test
public void testLanguageExpressions() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
assertExpression("exchange.getIn().body", "<hello id='m123'>world!</hello>");
assertExpression("request.headers.get('foo')", "abc");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java b/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java
index 12d6102..4615cc9 100644
--- a/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.language.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.test.junit4.LanguageTestSupport;
import org.junit.Test;
@@ -27,10 +26,6 @@ public class PythonLanguageTest extends LanguageTestSupport {
@Test
public void testLanguageExpressions() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
// the properties are stored in a set so ordering is not known
assertExpression("exchange.in.headers", "{foo=abc, bar=123}", "{bar=123, foo=abc}");
http://git-wip-us.apache.org/repos/asf/camel/blob/37e032b1/components/camel-script/src/test/java/org/apache/camel/language/script/ScriptLanguageResourceTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/language/script/ScriptLanguageResourceTest.java b/components/camel-script/src/test/java/org/apache/camel/language/script/ScriptLanguageResourceTest.java
index 81f7695..b8bb9ac 100644
--- a/components/camel-script/src/test/java/org/apache/camel/language/script/ScriptLanguageResourceTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/language/script/ScriptLanguageResourceTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.language.script;
-import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -28,10 +27,6 @@ public class ScriptLanguageResourceTest extends CamelTestSupport {
@Test
public void testScriptResource() throws Exception {
- if (!ScriptTestHelper.canRunTestOnThisPlatform()) {
- return;
- }
-
getMockEndpoint("mock:result").expectedBodiesReceived(7);
template.sendBody("direct:start", 3);
[3/3] git commit: Skip tests which fails on CI servers
Posted by da...@apache.org.
Skip tests which fails on CI servers
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f91575f6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f91575f6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f91575f6
Branch: refs/heads/camel-2.12.x
Commit: f91575f65dfd543c21f105d11f0c27427d9c6af2
Parents: 1c00d97
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 18 14:46:58 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 18 14:47:14 2013 +0200
----------------------------------------------------------------------
.../apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java | 2 ++
.../org/apache/camel/builder/script/LanguageJavaScriptTest.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f91575f6/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
index 1f3b903..13b226f 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
@@ -20,11 +20,13 @@ import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
/**
* Tests a routing expression using JavaScript
*/
+@Ignore("May fail on CI servers")
public class LanguageJavaScriptNoCacheTest extends CamelTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/f91575f6/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
index 26c5fd9..ed0af1c 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
@@ -20,11 +20,13 @@ import org.apache.camel.ScriptTestHelper;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
/**
* Tests a routing expression using JavaScript
*/
+@Ignore("May fail on CI servers")
public class LanguageJavaScriptTest extends CamelTestSupport {
@Test
[2/3] git commit: Skip tests which fails on CI servers
Posted by da...@apache.org.
Skip tests which fails on CI servers
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4feb7bd0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4feb7bd0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4feb7bd0
Branch: refs/heads/master
Commit: 4feb7bd091fae4152a0436d4f24026f34077410d
Parents: 37e032b
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Oct 18 14:46:58 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Oct 18 14:46:58 2013 +0200
----------------------------------------------------------------------
.../apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java | 2 ++
.../org/apache/camel/builder/script/LanguageJavaScriptTest.java | 2 ++
2 files changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/4feb7bd0/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
index 504b35f..4698814 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptNoCacheTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.builder.script;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
/**
* Tests a routing expression using JavaScript
*/
+@Ignore("May fail on CI servers")
public class LanguageJavaScriptNoCacheTest extends CamelTestSupport {
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/4feb7bd0/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
----------------------------------------------------------------------
diff --git a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
index 46df9ae..247bc9b 100644
--- a/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
+++ b/components/camel-script/src/test/java/org/apache/camel/builder/script/LanguageJavaScriptTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.builder.script;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
import org.junit.Test;
/**
* Tests a routing expression using JavaScript
*/
+@Ignore("May fail on CI servers")
public class LanguageJavaScriptTest extends CamelTestSupport {
@Test