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/08/07 06:31:26 UTC
svn commit: r801879 - in
/camel/trunk/camel-core/src/test/java/org/apache/camel:
component/file/FileConsumerNoopTest.java
component/file/FileConsumerProducerRouteTest.java
processor/RoutePerformanceCountTest.java
Author: davsclaus
Date: Fri Aug 7 04:31:25 2009
New Revision: 801879
URL: http://svn.apache.org/viewvc?rev=801879&view=rev
Log:
Fixed unit test reported by hudson.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java (with props)
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java?rev=801879&r1=801878&r2=801879&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerNoopTest.java Fri Aug 7 04:31:25 2009
@@ -19,26 +19,33 @@
import java.io.File;
import org.apache.camel.ContextTestSupport;
-import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
/**
* @version $Revision$
*/
public class FileConsumerNoopTest extends ContextTestSupport {
- public void testNoop() throws Exception {
- File file = new File("src/main/data");
- String[] before = file.list();
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/filenoop");
+ super.setUp();
+ template.sendBodyAndHeader("file://target/filenoop", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file://target/filenoop", "Bye World", Exchange.FILE_NAME, "bye.txt");
+ }
+ public void testNoop() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(2);
assertMockEndpointsSatisfied();
// wait a little to let file consumer run some more
Thread.sleep(2000);
- String[] after = file.list();
- assertEquals("Same number of files should exist", before.length, after.length);
+
+ File file = new File("target/filenoop").getAbsoluteFile();
+ assertEquals("There should be 2 files", 2, file.list().length);
// should not come new files since
assertMockEndpointsSatisfied();
@@ -49,7 +56,7 @@
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("file://src/main/data?noop=true").to("mock:result");
+ from("file://target/filenoop?noop=true").to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java?rev=801879&r1=801878&r2=801879&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerProducerRouteTest.java Fri Aug 7 04:31:25 2009
@@ -17,6 +17,7 @@
package org.apache.camel.component.file;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -25,21 +26,22 @@
*/
public class FileConsumerProducerRouteTest extends ContextTestSupport {
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/test-consumer-produer-inbox");
+ super.setUp();
+ template.sendBodyAndHeader("file://target/test-consumer-produer-inbox", "Hello World", Exchange.FILE_NAME, "hello.txt");
+ template.sendBodyAndHeader("file://target/test-consumer-produer-inbox", "Bye World", Exchange.FILE_NAME, "bye.txt");
+ }
+
public void testFileRoute() throws Exception {
MockEndpoint result = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
result.expectedMessageCount(2);
- result.setResultWaitTime(10000);
result.assertIsSatisfied();
}
@Override
- protected void setUp() throws Exception {
- deleteDirectory("target/test-consumer-produer-inbox");
- super.setUp();
- }
-
- @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java?rev=801879&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java Fri Aug 7 04:31:25 2009
@@ -0,0 +1,87 @@
+/**
+ * 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.processor;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision$
+ */
+public class RoutePerformanceCountTest extends ContextTestSupport {
+
+ private CountProcessor processor = new CountProcessor();
+ private int size = 50000;
+ private String url = "direct:start";
+
+ public void testSendMessages() throws Exception {
+ if (!canRunOnThisPlatform()) {
+ return;
+ }
+
+ long start = System.currentTimeMillis();
+
+ for (int i = 0; i < size; i++) {
+ template.sendBody(url, "Message " + i);
+ }
+ assertEquals(size, processor.getCounter());
+
+ long delta = System.currentTimeMillis() - start;
+ System.out.println("RoutePerformanceCountTest: Sent: " + size + " Took: " + delta + " ms");
+ }
+
+ private boolean canRunOnThisPlatform() {
+ String os = System.getProperty("os.name");
+ // HP-UX is just to slow to run this test
+ return !os.toLowerCase().contains("hp-ux");
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("log:a?level=OFF", "log:b?level=OFF", "direct:c");
+
+ from("direct:c")
+ .choice()
+ .when().header("foo").process(processor)
+ .otherwise().process(processor)
+ .end();
+ }
+ };
+ }
+
+ private class CountProcessor implements Processor {
+
+ private AtomicInteger counter = new AtomicInteger(0);
+
+ public void process(Exchange exchange) throws Exception {
+ counter.incrementAndGet();
+ }
+
+ public int getCounter() {
+ return counter.intValue();
+ }
+
+ }
+
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceCountTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date