Updated Branches: refs/heads/camel-2.11.x 37d4307f7 -> c8da7e436 refs/heads/camel-2.12.x f8c6a7441 -> 4c8fdb9b9 refs/heads/master 675dc4288 -> ba3703990
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/ba370399 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ba370399 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ba370399 Branch: refs/heads/master Commit: ba3703990c19e70d67ca17e624c7f4e57f0d2f7c Parents: 675dc42 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Sep 17 09:51:37 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Sep 17 09:51:37 2013 +0200 ---------------------------------------------------------------------- .../component/quickfixj/QuickfixjSpringTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ba370399/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);
