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/09/17 09:52:50 UTC

[2/3] git commit: Skip test on java 1.6 which cannot run

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/4c8fdb9b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4c8fdb9b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4c8fdb9b

Branch: refs/heads/camel-2.12.x
Commit: 4c8fdb9b9f877a501b5e3760f140b8804e866dd8
Parents: f8c6a74
Author: Claus Ibsen <da...@apache.org>
Authored: Tue Sep 17 09:51:37 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Tue Sep 17 09:51:53 2013 +0200

----------------------------------------------------------------------
 .../component/quickfixj/QuickfixjSpringTest.java      | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/4c8fdb9b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
----------------------------------------------------------------------
diff --git a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
index 90728b1..f071bc9 100644
--- a/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
+++ b/components/camel-quickfix/src/test/java/org/apache/camel/component/quickfixj/QuickfixjSpringTest.java
@@ -37,12 +37,26 @@ import static org.hamcrest.CoreMatchers.is;
 public class QuickfixjSpringTest extends CamelSpringTestSupport {
 
     @Override
+    public void setUp() throws Exception {
+        if (isJava16()) {
+            // cannot test on java 1.6
+            return;
+        }
+        super.setUp();
+    }
+
+    @Override
     protected AbstractApplicationContext createApplicationContext() {
         return new ClassPathXmlApplicationContext("org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml");
     }
 
     @Test
     public void configureInSpring() throws Exception {
+        if (isJava16()) {
+            // cannot test on java 1.6
+            return;
+        }
+
         SessionID sessionID = new SessionID("FIX.4.2:INITIATOR->ACCEPTOR");
         QuickfixjConfiguration configuration = context.getRegistry().lookupByNameAndType("quickfixjConfiguration", QuickfixjConfiguration.class);