You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/16 09:59:44 UTC
svn commit: r785106 - in /camel/trunk/components/camel-groovy: pom.xml
src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
src/test/java/org/apache/camel/language/groovy/GroovyTest.java
Author: ningjiang
Date: Tue Jun 16 07:59:44 2009
New Revision: 785106
URL: http://svn.apache.org/viewvc?rev=785106&view=rev
Log:
CAMEL-1712 Upgraded the camel-groovy JUnit version to 4.6
Modified:
camel/trunk/components/camel-groovy/pom.xml
camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java
Modified: camel/trunk/components/camel-groovy/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/pom.xml?rev=785106&r1=785105&r2=785106&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/pom.xml (original)
+++ camel/trunk/components/camel-groovy/pom.xml Tue Jun 16 07:59:44 2009
@@ -52,11 +52,15 @@
<!-- 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.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
Modified: camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java?rev=785106&r1=785105&r2=785106&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java (original)
+++ camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyExpressionTest.java Tue Jun 16 07:59:44 2009
@@ -17,26 +17,30 @@
package org.apache.camel.language.groovy;
import org.apache.camel.Exchange;
-import org.apache.camel.TestSupport;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Before;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class GroovyExpressionTest extends TestSupport {
+public class GroovyExpressionTest extends CamelTestSupport {
private static final transient Log LOG = LogFactory.getLog(GroovyTest.class);
protected Exchange exchange;
+ @Test
public void testExpressionReturnsTheCorrectValue() throws Exception {
assertExpression(GroovyLanguage.groovy("exchange.in.headers['foo.bar']"), exchange, "cheese");
assertExpression(GroovyLanguage.groovy("exchange.in.headers.name"), exchange, "James");
assertExpression(GroovyLanguage.groovy("exchange.in.headers['doesNotExist']"), exchange, null);
}
+ @Test
public void testPredicateEvaluation() throws Exception {
assertPredicate(GroovyLanguage.groovy("exchange.in.headers.name == 'James'"), exchange, true);
assertPredicate(GroovyLanguage.groovy("exchange.in.headers.name == 'Hiram'"), exchange, false);
@@ -44,12 +48,14 @@
assertPredicate(GroovyLanguage.groovy("request.headers.name == 'James'"), exchange, true);
}
+ @Test
public void testProcessorMutatesTheExchange() throws Exception {
GroovyLanguage.groovy("request.headers.myNewHeader = 'ABC'").evaluate(exchange);
assertInMessageHeader(exchange, "myNewHeader", "ABC");
}
+ @Test
public void testInvalidExpressionFailsWithMeaningfulException() throws Exception {
try {
GroovyLanguage.groovy("exchange.doesNotExist").evaluate(exchange);
@@ -62,7 +68,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
exchange = new DefaultExchange(new DefaultCamelContext());
exchange.getIn().setHeader("foo.bar", "cheese");
exchange.getIn().setHeader("name", "James");
Modified: camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java?rev=785106&r1=785105&r2=785106&view=diff
==============================================================================
--- camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java (original)
+++ camel/trunk/components/camel-groovy/src/test/java/org/apache/camel/language/groovy/GroovyTest.java Tue Jun 16 07:59:44 2009
@@ -21,14 +21,17 @@
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;
/**
* @version $Revision$
*/
-public class GroovyTest extends ContextTestSupport {
+public class GroovyTest extends CamelTestSupport {
protected String expected = "<hello>world!</hello>";
protected String groovyBuilderClass = "org.apache.camel.language.groovy.example.GroovyRoutes";
+ @Test
public void testSendMatchingMessage() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:results");
resultEndpoint.expectedBodiesReceived(expected);
@@ -40,6 +43,7 @@
log.debug("Should have received one exchange: " + resultEndpoint.getReceivedExchanges());
}
+ @Test
public void testSendNotMatchingMessage() throws Exception {
MockEndpoint resultEndpoint = getMockEndpoint("mock:results");
resultEndpoint.expectedMessageCount(0);