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 2011/05/07 12:35:28 UTC
svn commit: r1100506 - in /camel/trunk/components/camel-jxpath: ./
src/main/java/org/apache/camel/language/jxpath/
src/test/java/org/apache/camel/language/jxpath/
Author: davsclaus
Date: Sat May 7 10:35:28 2011
New Revision: 1100506
URL: http://svn.apache.org/viewvc?rev=1100506&view=rev
Log:
CAMEL-3032: Do not use test-jar in pom.xml.
Removed:
camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/SpringJXPathFilterNotMatchingTest.java
Modified:
camel/trunk/components/camel-jxpath/pom.xml
camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java
camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java
camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/SpringJXPathFilterTest.java
Modified: camel/trunk/components/camel-jxpath/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/pom.xml?rev=1100506&r1=1100505&r2=1100506&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/pom.xml (original)
+++ camel/trunk/components/camel-jxpath/pom.xml Sat May 7 10:35:28 2011
@@ -42,10 +42,6 @@
<artifactId>camel-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
- </dependency>
- <dependency>
<groupId>commons-jxpath</groupId>
<artifactId>commons-jxpath</artifactId>
<version>1.3</version>
@@ -54,17 +50,11 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java?rev=1100506&r1=1100505&r2=1100506&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java (original)
+++ camel/trunk/components/camel-jxpath/src/main/java/org/apache/camel/language/jxpath/JXPathExpression.java Sat May 7 10:35:28 2011
@@ -24,7 +24,7 @@ import org.apache.commons.jxpath.JXPathC
import org.apache.commons.jxpath.JXPathException;
/**
- * <a href="http://commons.apache.org/jxpath/">JXPath</a> {@link Expression} support
+ * <a href="http://commons.apache.org/jxpath/">JXPath</a> {@link org.apache.camel.Expression} support
*/
public class JXPathExpression extends ExpressionSupport {
Modified: camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java?rev=1100506&r1=1100505&r2=1100506&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java (original)
+++ camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/BeanWithJXPathInjectionTest.java Sat May 7 10:35:28 2011
@@ -16,30 +16,31 @@
*/
package org.apache.camel.language.jxpath;
-
import javax.naming.Context;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* @version
*/
-public class BeanWithJXPathInjectionTest extends ContextTestSupport {
+public class BeanWithJXPathInjectionTest extends CamelTestSupport {
private static final transient Logger LOG = LoggerFactory.getLogger(BeanWithJXPathInjectionTest.class);
protected MyBean myBean = new MyBean();
+ @Test
public void testSendMessage() throws Exception {
-
template.sendBody("direct:in", new PersonBean("James", "London"));
assertEquals("bean foo: " + myBean, "James", myBean.name);
assertNotNull("Should pass body as well", myBean.body);
}
+ @Test
public void testSendNullMessage() throws Exception {
template.sendBody("direct:in", new PersonBean(null, "London"));
Modified: camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java?rev=1100506&r1=1100505&r2=1100506&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java (original)
+++ camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathFilterTest.java Sat May 7 10:35:28 2011
@@ -16,14 +16,16 @@
*/
package org.apache.camel.language.jxpath;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* @version
*/
-public class JXPathFilterTest extends ContextTestSupport {
+public class JXPathFilterTest extends CamelTestSupport {
+ @Test
public void testSendMatchingMessage() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
@@ -32,6 +34,7 @@ public class JXPathFilterTest extends Co
assertMockEndpointsSatisfied();
}
+ @Test
public void testSendNotMatchingMessage() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(0);
@@ -40,6 +43,7 @@ public class JXPathFilterTest extends Co
assertMockEndpointsSatisfied();
}
+ @Test
public void testSendNullMessage() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(0);
Modified: camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java?rev=1100506&r1=1100505&r2=1100506&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java (original)
+++ camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/JXPathTest.java Sat May 7 10:35:28 2011
@@ -17,7 +17,8 @@
package org.apache.camel.language.jxpath;
import org.apache.camel.ExpressionEvaluationException;
-import org.apache.camel.LanguageTestSupport;
+import org.apache.camel.test.junit4.LanguageTestSupport;
+import org.junit.Test;
/**
* Test for {@link JXPathExpression} and {@link JXPathLanguage}
@@ -26,9 +27,7 @@ public class JXPathTest extends Language
protected PersonBean body = new PersonBean("James", "London");
- /**
- * Test JXPath expressions
- */
+ @Test
public void testJXPathExpressions() throws Exception {
assertExpression(".", exchange);
assertExpression("./in/body", "<hello id='m123'>world!</hello>");
@@ -37,17 +36,13 @@ public class JXPathTest extends Language
assertExpression("in/headers/@foo", "abc");
}
- /**
- * Test JXPath predicates
- */
+ @Test
public void testJXPathPredicates() throws Exception {
assertPredicate("in/headers/@foo = 'abc'");
assertInvalidPredicate("in/headders/@foo = 'abc'");
}
- /**
- * Test exceptions being thrown appropriately
- */
+ @Test
public void testExceptions() throws Exception {
assertInvalidExpression(".@.");
assertInvalidExpression("ins/body");
Modified: camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/SpringJXPathFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/SpringJXPathFilterTest.java?rev=1100506&r1=1100505&r2=1100506&view=diff
==============================================================================
--- camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/SpringJXPathFilterTest.java (original)
+++ camel/trunk/components/camel-jxpath/src/test/java/org/apache/camel/language/jxpath/SpringJXPathFilterTest.java Sat May 7 10:35:28 2011
@@ -16,33 +16,36 @@
*/
package org.apache.camel.language.jxpath;
-import org.apache.camel.EndpointInject;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
+import org.apache.camel.test.junit4.CamelSpringTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
* @version
*/
-@ContextConfiguration
-public class SpringJXPathFilterTest extends AbstractJUnit38SpringContextTests {
- @Autowired
- protected ProducerTemplate template;
- @EndpointInject(uri = "mock:results")
- protected MockEndpoint endpoint;
+public class SpringJXPathFilterTest extends CamelSpringTestSupport {
- @Override
- protected void setUp() throws Exception {
- endpoint.reset();
- }
-
- public void testFilterWithJXPath() throws Exception {
- endpoint.expectedMessageCount(1);
+ @Test
+ public void testMatching() throws Exception {
+ getMockEndpoint("mock:results").expectedMessageCount(1);
template.sendBody("direct:start", new PersonBean("James", "London"));
- endpoint.assertIsSatisfied();
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testNotMatching() throws Exception {
+ getMockEndpoint("mock:result").expectedMessageCount(0);
+
+ template.sendBody("direct:start", new PersonBean("Hiram", "Tampa"));
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected AbstractApplicationContext createApplicationContext() {
+ return new ClassPathXmlApplicationContext("org/apache/camel/language/jxpath/SpringJXPathFilterTest-context.xml");
}
}
\ No newline at end of file