Modified: camel/trunk/components/camel-mvel/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/pom.xml?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-mvel/pom.xml (original) +++ camel/trunk/components/camel-mvel/pom.xml Sat May 7 10:43:52 2011 @@ -51,12 +51,6 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> <scope>test</scope> </dependency>
Modified: camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java (original) +++ camel/trunk/components/camel-mvel/src/test/java/org/apache/camel/language/mvel/MvelTest.java Sat May 7 10:43:52 2011 @@ -16,9 +16,12 @@ */ package org.apache.camel.language.mvel; -import org.apache.camel.LanguageTestSupport; +import org.apache.camel.test.junit4.LanguageTestSupport; +import org.junit.Test; public class MvelTest extends LanguageTestSupport { + + @Test public void testMvelExpressions() throws Exception { assertExpression("exchange", exchange); assertExpression("exchange.getIn().body", "<hello id='m123'>world!</hello>"); @@ -29,11 +32,13 @@ public class MvelTest extends LanguageTe assertExpression("request.headers.foo", "abc"); } + @Test public void testGetOutFalseKeepsNullOutMessage() throws Exception { assertExpression("exchange.hasOut()", false); assertFalse(exchange.hasOut()); } + @Test public void testResponseCreatesOutMessage() throws Exception { assertExpression("response.body", null); assertTrue(exchange.hasOut()); Modified: camel/trunk/components/camel-ognl/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/pom.xml?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-ognl/pom.xml (original) +++ camel/trunk/components/camel-ognl/pom.xml Sat May 7 10:43:52 2011 @@ -60,12 +60,6 @@ <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <type>test-jar</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> <scope>test</scope> </dependency> Modified: camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java (original) +++ camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlInvokeMethodTest.java Sat May 7 10:43:52 2011 @@ -16,15 +16,17 @@ */ package org.apache.camel.language.ognl; -import org.apache.camel.ContextTestSupport; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; /** * */ -public class OgnlInvokeMethodTest extends ContextTestSupport { +public class OgnlInvokeMethodTest extends CamelTestSupport { + @Test public void testInvokeMethod() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); Modified: camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java (original) +++ camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlTest.java Sat May 7 10:43:52 2011 @@ -16,12 +16,15 @@ */ package org.apache.camel.language.ognl; -import org.apache.camel.LanguageTestSupport; +import org.apache.camel.test.junit4.LanguageTestSupport; +import org.junit.Test; /** * @version */ public class OgnlTest extends LanguageTestSupport { + + @Test public void testOgnlExpressions() throws Exception { assertExpression("exchange", exchange); assertExpression("exchange.getIn().body", "<hello id='m123'>world!</hello>"); @@ -32,11 +35,13 @@ public class OgnlTest extends LanguageTe assertExpression("request.headers.foo", "abc"); } + @Test public void testGetOutFalseKeepsNullOutMessage() throws Exception { assertExpression("exchange.hasOut()", false); assertFalse(exchange.hasOut()); } + @Test public void testResponseCreatesOutMessage() throws Exception { assertExpression("response.body", null); assertTrue(exchange.hasOut()); Modified: camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java (original) +++ camel/trunk/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/patterns/FilterTest.java Sat May 7 10:43:52 2011 @@ -16,39 +16,32 @@ */ package org.apache.camel.language.ognl.patterns; -import org.apache.camel.EndpointInject; -import org.apache.camel.Produce; -import org.apache.camel.ProducerTemplate; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.CamelTestSupport; +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + /** * @version */ public class FilterTest extends CamelTestSupport { - @EndpointInject(uri = "mock:result") - protected MockEndpoint resultEndpoint; - - @Produce(uri = "direct:start") - protected ProducerTemplate template; - + @Test public void testSendMatchingMessage() throws Exception { String expectedBody = "<matched/>"; + getMockEndpoint("mock:result").expectedBodiesReceived(expectedBody); - resultEndpoint.expectedBodiesReceived(expectedBody); - - template.sendBodyAndHeader(expectedBody, "foo", "bar"); + template.sendBodyAndHeader("direct:start", expectedBody, "foo", "bar"); - resultEndpoint.assertIsSatisfied(); + assertMockEndpointsSatisfied(); } + @Test public void testSendNotMatchingMessage() throws Exception { - resultEndpoint.expectedMessageCount(0); + getMockEndpoint("mock:result").expectedMessageCount(0); - template.sendBodyAndHeader("<notMatched/>", "foo", "notMatchedHeaderValue"); + template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue"); - resultEndpoint.assertIsSatisfied(); + assertMockEndpointsSatisfied(); } Modified: camel/trunk/components/camel-script/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/pom.xml?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/pom.xml (original) +++ camel/trunk/components/camel-script/pom.xml Sat May 7 10:43:52 2011 @@ -83,15 +83,6 @@ </dependency> <!-- testing --> - <!-- TODO: use by language test, which we should refactor into camel-test JAR --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <type>test-jar</type> - <optional>true</optional> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java (original) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/AnyLanguageFilterTest.java Sat May 7 10:43:52 2011 @@ -18,7 +18,6 @@ package org.apache.camel.builder.script. import org.apache.camel.CamelContext; import org.apache.camel.ScriptTestHelper; -import org.apache.camel.processor.XPathFilterTest; import org.apache.camel.spring.SpringCamelContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,11 +27,6 @@ import org.springframework.context.suppo public class AnyLanguageFilterTest extends XPathFilterTest { @Override - public boolean isUseRouteBuilder() { - return false; - } - - @Override public void testSendMatchingMessage() throws Exception { if (!ScriptTestHelper.canRunTestOnThisPlatform()) { return; Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java (original) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/BeanShellFilterTest.java Sat May 7 10:43:52 2011 @@ -18,7 +18,6 @@ package org.apache.camel.builder.script. import org.apache.camel.CamelContext; import org.apache.camel.ScriptTestHelper; -import org.apache.camel.processor.XPathFilterTest; import org.apache.camel.spring.SpringCamelContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,11 +27,6 @@ import org.springframework.context.suppo public class BeanShellFilterTest extends XPathFilterTest { @Override - public boolean isUseRouteBuilder() { - return false; - } - - @Override public void testSendMatchingMessage() throws Exception { if (!ScriptTestHelper.canRunTestOnThisPlatform()) { return; Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java (original) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/GroovyFilterTest.java Sat May 7 10:43:52 2011 @@ -18,7 +18,6 @@ package org.apache.camel.builder.script. import org.apache.camel.CamelContext; import org.apache.camel.ScriptTestHelper; -import org.apache.camel.processor.XPathFilterTest; import org.apache.camel.spring.SpringCamelContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,11 +27,6 @@ import org.springframework.context.suppo public class GroovyFilterTest extends XPathFilterTest { @Override - public boolean isUseRouteBuilder() { - return false; - } - - @Override public void testSendMatchingMessage() throws Exception { if (!ScriptTestHelper.canRunTestOnThisPlatform()) { return; Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java (original) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/JavaScriptFilterTest.java Sat May 7 10:43:52 2011 @@ -18,7 +18,6 @@ package org.apache.camel.builder.script. import org.apache.camel.CamelContext; import org.apache.camel.ScriptTestHelper; -import org.apache.camel.processor.XPathFilterTest; import org.apache.camel.spring.SpringCamelContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,11 +27,6 @@ import org.springframework.context.suppo public class JavaScriptFilterTest extends XPathFilterTest { @Override - public boolean isUseRouteBuilder() { - return false; - } - - @Override public void testSendMatchingMessage() throws Exception { if (!ScriptTestHelper.canRunTestOnThisPlatform()) { return; Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java (original) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/PythonFilterTest.java Sat May 7 10:43:52 2011 @@ -18,7 +18,6 @@ package org.apache.camel.builder.script. import org.apache.camel.CamelContext; import org.apache.camel.ScriptTestHelper; -import org.apache.camel.processor.XPathFilterTest; import org.apache.camel.spring.SpringCamelContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,11 +27,6 @@ import org.springframework.context.suppo public class PythonFilterTest extends XPathFilterTest { @Override - public boolean isUseRouteBuilder() { - return false; - } - - @Override public void testSendMatchingMessage() throws Exception { if (!ScriptTestHelper.canRunTestOnThisPlatform()) { return; Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java (original) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/RubyFilterTest.java Sat May 7 10:43:52 2011 @@ -18,7 +18,6 @@ package org.apache.camel.builder.script. import org.apache.camel.CamelContext; import org.apache.camel.ScriptTestHelper; -import org.apache.camel.processor.XPathFilterTest; import org.apache.camel.spring.SpringCamelContext; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -28,11 +27,6 @@ import org.springframework.context.suppo public class RubyFilterTest extends XPathFilterTest { @Override - public boolean isUseRouteBuilder() { - return false; - } - - @Override public void testSendMatchingMessage() throws Exception { if (!ScriptTestHelper.canRunTestOnThisPlatform()) { return; Added: camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/XPathFilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/XPathFilterTest.java?rev=1100508&view=auto ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/XPathFilterTest.java (added) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/builder/script/example/XPathFilterTest.java Sat May 7 10:43:52 2011 @@ -0,0 +1,48 @@ +/** + * 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.builder.script.example; + +import org.apache.camel.test.junit4.CamelTestSupport; +import org.junit.Test; + +/** + * + */ +public abstract class XPathFilterTest extends CamelTestSupport { + + protected String matchingBody = "<person name='James' city='London'/>"; + protected String notMatchingBody = "<person name='Hiram' city='Tampa'/>"; + + @Test + public void testSendMatchingMessage() throws Exception { + getMockEndpoint("mock:result").expectedBodiesReceived(matchingBody); + + template.sendBodyAndHeader("direct:start", matchingBody, "testCase", "testSendMatchingMessage"); + + assertMockEndpointsSatisfied(); + } + + @Test + public void testSendNotMatchingMessage() throws Exception { + getMockEndpoint("mock:result").expectedMessageCount(0); + + template.sendBodyAndHeader("direct:start", notMatchingBody, "testCase", "testSendNotMatchingMessage"); + + assertMockEndpointsSatisfied(); + } + +} Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java (original) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/JavaScriptLanguageTest.java Sat May 7 10:43:52 2011 @@ -16,8 +16,8 @@ */ package org.apache.camel.language.script; -import org.apache.camel.LanguageTestSupport; import org.apache.camel.ScriptTestHelper; +import org.apache.camel.test.junit4.LanguageTestSupport; import org.junit.Test; /** Modified: camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java (original) +++ camel/trunk/components/camel-script/src/test/java/org/apache/camel/language/script/PythonLanguageTest.java Sat May 7 10:43:52 2011 @@ -16,8 +16,8 @@ */ package org.apache.camel.language.script; -import org.apache.camel.LanguageTestSupport; import org.apache.camel.ScriptTestHelper; +import org.apache.camel.test.junit4.LanguageTestSupport; import org.junit.Test; /** Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java (original) +++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/osgi/OsgiSpringCamelContext.java Sat May 7 10:43:52 2011 @@ -18,8 +18,10 @@ package org.apache.camel.osgi; import org.apache.camel.TypeConverter; import org.apache.camel.core.osgi.OsgiCamelContextHelper; +import org.apache.camel.core.osgi.OsgiFactoryFinderResolver; import org.apache.camel.core.osgi.OsgiTypeConverter; import org.apache.camel.core.osgi.utils.BundleContextUtils; +import org.apache.camel.spi.FactoryFinder; import org.apache.camel.spi.Registry; import org.apache.camel.spring.SpringCamelContext; import org.osgi.framework.BundleContext; @@ -42,7 +44,8 @@ public class OsgiSpringCamelContext exte if (ctx == null) { ctx = bundleContext; } - return new OsgiTypeConverter(ctx, getInjector()); + FactoryFinder finder = new OsgiFactoryFinderResolver(bundleContext).resolveDefaultFactoryFinder(getClassResolver()); + return new OsgiTypeConverter(ctx, getInjector(), finder); } @Override Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java Sat May 7 10:43:52 2011 @@ -154,7 +154,9 @@ public abstract class SpringTestSupport @Override protected CamelContext createCamelContext() throws Exception { - return SpringCamelContext.springCamelContext(applicationContext); + CamelContext context = SpringCamelContext.springCamelContext(applicationContext); + context.setLazyLoadTypeConverters(isLazyLoadingTypeConverter()); + return context; } } Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java (original) +++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/CamelTestSupport.java Sat May 7 10:43:52 2011 @@ -183,6 +183,17 @@ public abstract class CamelTestSupport e } /** + * Whether or not type converters should be lazy loaded (notice core converters is always loaded) + * <p/> + * We enabled lazy by default as it would speedup unit testing. + * + * @return <tt>true</tt> by default. + */ + protected boolean isLazyLoadingTypeConverter() { + return true; + } + + /** * Lets post process this test instance to process any Camel annotations. * Note that using Spring Test or Guice is a more powerful approach. */ @@ -218,7 +229,9 @@ public abstract class CamelTestSupport e } protected CamelContext createCamelContext() throws Exception { - return new DefaultCamelContext(createRegistry()); + CamelContext context = new DefaultCamelContext(createRegistry()); + context.setLazyLoadTypeConverters(isLazyLoadingTypeConverter()); + return context; } protected JndiRegistry createRegistry() throws Exception { Added: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java?rev=1100508&view=auto ============================================================================== --- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java (added) +++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/LanguageTestSupport.java Sat May 7 10:43:52 2011 @@ -0,0 +1,95 @@ +/** + * 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.test; + +import org.apache.camel.Exchange; +import org.apache.camel.Expression; +import org.apache.camel.spi.Language; + +/** + * A useful base class for testing the language plugins in Camel + */ +public abstract class LanguageTestSupport extends ExchangeTestSupport { + + protected abstract String getLanguageName(); + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to true + */ + protected void assertPredicate(String expression) { + assertPredicate(exchange, expression, true); + } + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to false + */ + protected void assertPredicateFails(String expression) { + assertPredicate(exchange, expression, false); + } + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to the expected value + */ + protected void assertPredicate(String expression, boolean expected) { + assertPredicate(exchange, expression, expected); + } + + protected void assertPredicate(Exchange exchange, String expression, boolean expected) { + assertPredicate(getLanguageName(), expression, exchange, expected); + } + + + /** + * Asserts that this language expression evaluates to the given value on the given exchange + */ + protected void assertExpression(Exchange exchange, String expressionText, Object expectedValue) { + assertExpression(exchange, getLanguageName(), expressionText, expectedValue); + } + + /** + * Asserts that this language expression evaluates to the given value on the current exchange + */ + protected void assertExpression(String expressionText, Object expectedValue) { + assertExpression(exchange, expressionText, expectedValue); + } + + /** + * Asserts that the expression evaluates to one of the two given values + */ + protected void assertExpression(String expressionText, String expectedValue, String orThisExpectedValue) { + Language language = assertResolveLanguage(getLanguageName()); + + Expression expression = language.createExpression(expressionText); + assertNotNull("No Expression could be created for text: " + expressionText + " language: " + language, expression); + + Object value; + if (expectedValue != null) { + value = expression.evaluate(exchange, expectedValue.getClass()); + } else { + value = expression.evaluate(exchange, Object.class); + } + + log.debug("Evaluated expression: " + expression + " on exchange: " + exchange + " result: " + value); + + assertTrue("Expression: " + expression + " on Exchange: " + exchange, + expectedValue.equals(value) || orThisExpectedValue.equals(value)); + } + +} Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java (original) +++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/CamelTestSupport.java Sat May 7 10:43:52 2011 @@ -187,6 +187,17 @@ public abstract class CamelTestSupport e } /** + * Whether or not type converters should be lazy loaded (notice core converters is always loaded) + * <p/> + * We enabled lazy by default as it would speedup unit testing. + * + * @return <tt>true</tt> by default. + */ + protected boolean isLazyLoadingTypeConverter() { + return true; + } + + /** * Lets post process this test instance to process any Camel annotations. * Note that using Spring Test or Guice is a more powerful approach. */ @@ -222,7 +233,9 @@ public abstract class CamelTestSupport e } protected CamelContext createCamelContext() throws Exception { - return new DefaultCamelContext(createRegistry()); + CamelContext context = new DefaultCamelContext(createRegistry()); + context.setLazyLoadTypeConverters(isLazyLoadingTypeConverter()); + return context; } protected JndiRegistry createRegistry() throws Exception { Added: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java?rev=1100508&view=auto ============================================================================== --- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java (added) +++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/LanguageTestSupport.java Sat May 7 10:43:52 2011 @@ -0,0 +1,95 @@ +/** + * 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.test.junit4; + +import org.apache.camel.Exchange; +import org.apache.camel.Expression; +import org.apache.camel.spi.Language; + +/** + * A useful base class for testing the language plugins in Camel + */ +public abstract class LanguageTestSupport extends ExchangeTestSupport { + + protected abstract String getLanguageName(); + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to true + */ + protected void assertPredicate(String expression) { + assertPredicate(exchange, expression, true); + } + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to false + */ + protected void assertPredicateFails(String expression) { + assertPredicate(exchange, expression, false); + } + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to the expected value + */ + protected void assertPredicate(String expression, boolean expected) { + assertPredicate(exchange, expression, expected); + } + + protected void assertPredicate(Exchange exchange, String expression, boolean expected) { + assertPredicate(getLanguageName(), expression, exchange, expected); + } + + + /** + * Asserts that this language expression evaluates to the given value on the given exchange + */ + protected void assertExpression(Exchange exchange, String expressionText, Object expectedValue) { + assertExpression(exchange, getLanguageName(), expressionText, expectedValue); + } + + /** + * Asserts that this language expression evaluates to the given value on the current exchange + */ + protected void assertExpression(String expressionText, Object expectedValue) { + assertExpression(exchange, expressionText, expectedValue); + } + + /** + * Asserts that the expression evaluates to one of the two given values + */ + protected void assertExpression(String expressionText, String expectedValue, String orThisExpectedValue) { + Language language = assertResolveLanguage(getLanguageName()); + + Expression expression = language.createExpression(expressionText); + assertNotNull("No Expression could be created for text: " + expressionText + " language: " + language, expression); + + Object value; + if (expectedValue != null) { + value = expression.evaluate(exchange, expectedValue.getClass()); + } else { + value = expression.evaluate(exchange, Object.class); + } + + log.debug("Evaluated expression: " + expression + " on exchange: " + exchange + " result: " + value); + + assertTrue("Expression: " + expression + " on Exchange: " + exchange, + expectedValue.equals(value) || orThisExpectedValue.equals(value)); + } + +} Copied: camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java (from r1100247, camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java?p2=camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java&p1=camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java&r1=1100247&r2=1100508&rev=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugTest.java (original) +++ camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/patterns/DebugNoLazyTypeConverterTest.java Sat May 7 10:43:52 2011 @@ -25,7 +25,12 @@ import org.apache.camel.test.CamelTestSu /** * @version */ -public class DebugTest extends CamelTestSupport { +public class DebugNoLazyTypeConverterTest extends CamelTestSupport { + + @Override + protected boolean isLazyLoadingTypeConverter() { + return false; + } // START SNIPPET: e1 @Override Modified: camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java (original) +++ camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java Sat May 7 10:43:52 2011 @@ -160,6 +160,17 @@ public abstract class CamelTestSupport e } /** + * Whether or not type converters should be lazy loaded (notice core converters is always loaded) + * <p/> + * We enabled lazy by default as it would speedup unit testing. + * + * @return <tt>true</tt> by default. + */ + protected boolean isLazyLoadingTypeConverter() { + return false; + } + + /** * Lets post process this test instance to process any Camel annotations. * Note that using Spring Test or Guice is a more powerful approach. */ @@ -195,7 +206,9 @@ public abstract class CamelTestSupport e } protected CamelContext createCamelContext() throws Exception { - return new DefaultCamelContext(createRegistry()); + CamelContext context = new DefaultCamelContext(createRegistry()); + context.setLazyLoadTypeConverters(isLazyLoadingTypeConverter()); + return context; } protected JndiRegistry createRegistry() throws Exception { Added: camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java?rev=1100508&view=auto ============================================================================== --- camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java (added) +++ camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/LanguageTestSupport.java Sat May 7 10:43:52 2011 @@ -0,0 +1,94 @@ +/** + * 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.testng; + +import org.apache.camel.Exchange; +import org.apache.camel.Expression; +import org.apache.camel.spi.Language; + +/** + * A useful base class for testing the language plugins in Camel + */ +public abstract class LanguageTestSupport extends ExchangeTestSupport { + + protected abstract String getLanguageName(); + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to true + */ + protected void assertPredicate(String expression) { + assertPredicate(exchange, expression, true); + } + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to false + */ + protected void assertPredicateFails(String expression) { + assertPredicate(exchange, expression, false); + } + + /** + * Asserts that the given predicate expression evaluated on the current language and message + * exchange evaluates to the expected value + */ + protected void assertPredicate(String expression, boolean expected) { + assertPredicate(exchange, expression, expected); + } + + protected void assertPredicate(Exchange exchange, String expression, boolean expected) { + assertPredicate(getLanguageName(), expression, exchange, expected); + } + + + /** + * Asserts that this language expression evaluates to the given value on the given exchange + */ + protected void assertExpression(Exchange exchange, String expressionText, Object expectedValue) { + assertExpression(exchange, getLanguageName(), expressionText, expectedValue); + } + + /** + * Asserts that this language expression evaluates to the given value on the current exchange + */ + protected void assertExpression(String expressionText, Object expectedValue) { + assertExpression(exchange, expressionText, expectedValue); + } + + /** + * Asserts that the expression evaluates to one of the two given values + */ + protected void assertExpression(String expressionText, String expectedValue, String orThisExpectedValue) { + Language language = assertResolveLanguage(getLanguageName()); + + Expression expression = language.createExpression(expressionText); + assertNotNull(expression, "No Expression could be created for text: " + expressionText + " language: " + language); + + Object value; + if (expectedValue != null) { + value = expression.evaluate(exchange, expectedValue.getClass()); + } else { + value = expression.evaluate(exchange, Object.class); + } + + log.debug("Evaluated expression: " + expression + " on exchange: " + exchange + " result: " + value); + + assertTrue(expectedValue.equals(value) || orThisExpectedValue.equals(value), "Expression: " + expression + " on Exchange: " + exchange); + } + +} Copied: camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java (from r1100247, camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java) URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java?p2=camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java&p1=camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java&r1=1100247&r2=1100508&rev=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java (original) +++ camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugNoLazyTypeConverterTest.java Sat May 7 10:43:52 2011 @@ -21,11 +21,17 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.testng.CamelTestSupport; +import org.testng.annotations.Test; /** * @version $Revision$ */ -public class DebugTest extends CamelTestSupport { +public class DebugNoLazyTypeConverterTest extends CamelTestSupport { + + @Override + protected boolean isLazyLoadingTypeConverter() { + return false; + } @Override protected void debugBefore(Exchange exchange, Processor processor, @@ -35,6 +41,7 @@ public class DebugTest extends CamelTest log.info("Before " + definition + " with body " + exchange.getIn().getBody()); } + @Test public void testDebugger() throws Exception { // set mock expectations getMockEndpoint("mock:a").expectedMessageCount(1); @@ -47,6 +54,7 @@ public class DebugTest extends CamelTest assertMockEndpointsSatisfied(); } + @Test public void testTwo() throws Exception { // set mock expectations getMockEndpoint("mock:a").expectedMessageCount(2); Modified: camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java (original) +++ camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/DebugTest.java Sat May 7 10:43:52 2011 @@ -21,6 +21,7 @@ import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.ProcessorDefinition; import org.apache.camel.testng.CamelTestSupport; +import org.testng.annotations.Test; /** * @version $Revision$ @@ -35,6 +36,7 @@ public class DebugTest extends CamelTest log.info("Before " + definition + " with body " + exchange.getIn().getBody()); } + @Test public void testDebugger() throws Exception { // set mock expectations getMockEndpoint("mock:a").expectedMessageCount(1); @@ -47,6 +49,7 @@ public class DebugTest extends CamelTest assertMockEndpointsSatisfied(); } + @Test public void testTwo() throws Exception { // set mock expectations getMockEndpoint("mock:a").expectedMessageCount(2); Modified: camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterTest.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterTest.java?rev=1100508&r1=1100507&r2=1100508&view=diff ============================================================================== --- camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterTest.java (original) +++ camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/FilterTest.java Sat May 7 10:43:52 2011 @@ -22,6 +22,7 @@ import org.apache.camel.ProducerTemplate import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.testng.CamelTestSupport; +import org.testng.annotations.Test; /** * Tests filtering using Camel Test @@ -36,6 +37,7 @@ public class FilterTest extends CamelTes @Produce(uri = "direct:start") protected ProducerTemplate template; + @Test public void testSendMatchingMessage() throws Exception { String expectedBody = "<matched/>"; @@ -46,6 +48,7 @@ public class FilterTest extends CamelTes resultEndpoint.assertIsSatisfied(); } + @Test public void testSendNotMatchingMessage() throws Exception { resultEndpoint.expectedMessageCount(0);
