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/05/25 14:39:55 UTC
svn commit: r778409 - in /camel/trunk/components/camel-mail/src/test:
java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
resources/log4j.properties
Author: davsclaus
Date: Mon May 25 12:39:55 2009
New Revision: 778409
URL: http://svn.apache.org/viewvc?rev=778409&view=rev
Log:
Added concurrent producer unit test.
Added:
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java (with props)
Modified:
camel/trunk/components/camel-mail/src/test/resources/log4j.properties
Added: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java?rev=778409&view=auto
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java (added)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java Mon May 25 12:39:55 2009
@@ -0,0 +1,86 @@
+/**
+ * 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.component.mail;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.jvnet.mock_javamail.Mailbox;
+
+/**
+ * Mail producer concurrent test.
+ *
+ * @version $Revision$
+ */
+public class MailProducerConcurrentTest extends ContextTestSupport {
+
+ public void testNoConcurrentProducers() throws Exception {
+ doSendMessages(1, 1);
+ }
+
+ public void testConcurrentProducers() throws Exception {
+ doSendMessages(10, 5);
+ }
+
+ private void doSendMessages(int files, int poolSize) throws Exception {
+ Mailbox.clearAll();
+
+ getMockEndpoint("mock:result").expectedMessageCount(files);
+ getMockEndpoint("mock:result").expectsNoDuplicates(body());
+
+ ExecutorService executor = Executors.newFixedThreadPool(poolSize);
+ for (int i = 0; i < files; i++) {
+ final int index = i;
+ executor.submit(new Callable<Object>() {
+ public Object call() throws Exception {
+ template.sendBodyAndHeader("direct:start", "Message " + index, "To", "someone@localhost");
+ return null;
+ }
+ });
+ }
+
+ assertMockEndpointsSatisfied();
+
+ Mailbox box = Mailbox.get("someone@localhost");
+ assertEquals(files, box.size());
+
+ // as we use concurrent producers the mails can arrive out of order
+ Set bodies = new HashSet();
+ for (int i = 0; i < files; i++) {
+ bodies.add(box.get(i).getContent());
+ }
+
+ assertEquals("There should be " + files + " unique mails", files, bodies.size());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start").to("smtp://camel@localhost", "mock:result");
+ }
+ };
+ }
+
+
+}
Propchange: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/components/camel-mail/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/resources/log4j.properties?rev=778409&r1=778408&r2=778409&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-mail/src/test/resources/log4j.properties Mon May 25 12:39:55 2009
@@ -16,20 +16,22 @@
## ------------------------------------------------------------------------
#
-# The logging properties used during tests..
+# The logging properties used for eclipse testing, We want to see debug output on the console.
#
log4j.rootLogger=INFO, file
+# uncomment the following to enable camel debugging
+#log4j.logger.org.apache.camel.component.mail=TRACE
+log4j.logger.org.apache.camel=DEBUG
+
# CONSOLE appender not used by default
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern=%d %-5p %c{1} - %m %n
+log4j.appender.out=org.apache.log4j.ConsoleAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+#log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
# File appender
log4j.appender.file=org.apache.log4j.FileAppender
log4j.appender.file.layout=org.apache.log4j.PatternLayout
-log4j.appender.file.layout.ConversionPattern=%d %-5p %c{1} - %m %n
-log4j.appender.file.file=target/camel-mail-test.log
-
-# debug logging for Camel
-log4j.logger.org.apache.camel.component.mail=TRACE
\ No newline at end of file
+log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.file.file=target/camel-mail-test.log
\ No newline at end of file