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 2009/02/05 13:54:14 UTC
svn commit: r741094 - in /camel/trunk/components:
camel-mina/src/test/java/org/apache/camel/component/mina/
camel-spring/src/test/java/org/apache/camel/component/file/
camel-spring/src/test/java/org/apache/camel/spring/file/
camel-spring/src/test/resou...
Author: davsclaus
Date: Thu Feb 5 12:54:14 2009
New Revision: 741094
URL: http://svn.apache.org/viewvc?rev=741094&view=rev
Log:
moved unit test in camel-spring to avoid annotation loader to not able to load Test classes when using camel-spring-test jar in other components. Added mina example based on end user on forum.
Added:
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java (contents, props changed)
- copied, changed from r741025, camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java (contents, props changed)
- copied, changed from r741025, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileAntPathMatcherFileFilterTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java (contents, props changed)
- copied, changed from r741025, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml (props changed)
- copied unchanged from r741025, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/file/SpringFileAntPathMatcherFileFilterTest-context.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml (props changed)
- copied unchanged from r741025, camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/file/SpringFileRouteTest-context.xml
Removed:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/component/file/
Copied: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java (from r741025, camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java?p2=camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java&p1=camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java&r1=741025&r2=741094&rev=741094&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutRouteTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java Thu Feb 5 12:54:14 2009
@@ -17,44 +17,36 @@
package org.apache.camel.component.mina;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
/**
- * Unit test to verify that MINA can be used with an InOut MEP but still use sync to send and receive data
- * from a remote server.
+ * Unit test with InOut however we want sometimes to not send a response.
*/
-public class MinaInOutRouteTest extends ContextTestSupport {
+public class MinaInOutWithForcedNoResponseTest extends ContextTestSupport {
- public void testInOutUsingMina() throws Exception {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedBodiesReceived("Bye Claus");
- // we should preserve headers
- mock.expectedHeaderReceived("city", "Copenhagen");
- mock.setResultWaitTime(5000);
-
- Object out = template.requestBodyAndHeader("direct:in", "Claus", "city", "Copenhagen");
+ public void testResponse() throws Exception {
+ Object out = template.requestBody("mina:tcp://localhost:4444?sync=true", "Copenhagen");
+ assertEquals("Hello Claus", out);
+ }
- assertMockEndpointsSatisfied();
- assertEquals("Bye Claus", out);
+ public void testNoResponse() throws Exception {
+ try {
+ template.requestBody("mina:tcp://localhost:4444?sync=true", "London");
+ fail("Should throw an exception");
+ } catch (RuntimeCamelException e) {
+ assertTrue(e.getCause().getMessage().startsWith("No response"));
+ }
}
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("mina:tcp://localhost:8080?sync=true").process(new Processor() {
- public void process(Exchange exchange) throws Exception {
- String body = exchange.getIn().getBody(String.class);
- exchange.getOut().setBody("Bye " + body);
- }
- });
-
- from("direct:in")
- .to("mina:tcp://localhost:8080?sync=true")
- .to("mock:result");
+ from("mina:tcp://localhost:4444?sync=true")
+ .choice()
+ .when(body().isEqualTo("Copenhagen")).transform(constant("Hello Claus"))
+ .otherwise().transform(constant(null));
}
};
}
Propchange: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaInOutWithForcedNoResponseTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java (from r741025, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileAntPathMatcherFileFilterTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileAntPathMatcherFileFilterTest.java&r1=741025&r2=741094&rev=741094&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileAntPathMatcherFileFilterTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java Thu Feb 5 12:54:14 2009
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file;
+package org.apache.camel.spring.file;
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.TestSupport;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.file.FileComponent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java (from r741025, camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java?p2=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java&p1=camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java&r1=741025&r2=741094&rev=741094&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/file/SpringFileRouteTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java Thu Feb 5 12:54:14 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.component.file;
+package org.apache.camel.spring.file;
import java.io.File;
@@ -23,6 +23,8 @@
import org.apache.camel.ProducerTemplate;
import org.apache.camel.TestSupport;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.file.NewFileEndpoint;
+import org.apache.camel.component.file.FileComponent;
import org.apache.camel.hamcrest.Assertions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/file/SpringFileRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileAntPathMatcherFileFilterTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/file/SpringFileRouteTest-context.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml