svn commit: r779614 - in /camel/trunk/components/camel-rmi/src/test: java/org/apache/camel/component/rmi/EchoService.java java/org/apache/camel/component/rmi/IEcho.java java/org/apache/camel/component/rmi/RmiConcurrencyTest.java resources/log4j.properties

[da...@apache.org]

Author: davsclaus
Date: Thu May 28 14:56:21 2009
New Revision: 779614

URL: http://svn.apache.org/viewvc?rev=779614&view=rev
Log:
Added concurrency test.

Added:
    camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/EchoService.java   (with props)
    camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/IEcho.java
      - copied, changed from r779577, camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/ISay.java
    camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
      - copied, changed from r779577, camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java
Modified:
    camel/trunk/components/camel-rmi/src/test/resources/log4j.properties

Added: camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/EchoService.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/EchoService.java?rev=779614&view=auto
==============================================================================
--- camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/EchoService.java (added)
+++ camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/EchoService.java Thu May 28 14:56:21 2009
@@ -0,0 +1,29 @@
+/**
+ * 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.rmi;
+
+import java.rmi.RemoteException;
+
+/**
+ * @version $Revision$
+ */
+public class EchoService implements IEcho {
+
+    public String echo(String s) throws RemoteException {
+        return "Echo " + s;
+    }
+}

Propchange: camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/EchoService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/EchoService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Copied: camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/IEcho.java (from r779577, camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/ISay.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/IEcho.java?p2=camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/IEcho.java&p1=camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/ISay.java&r1=779577&r2=779614&rev=779614&view=diff
==============================================================================
--- camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/ISay.java (original)
+++ camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/IEcho.java Thu May 28 14:56:21 2009
@@ -19,6 +19,8 @@
 import java.rmi.Remote;
 import java.rmi.RemoteException;
 
-public interface ISay extends Remote {
-    String say() throws RemoteException;
-}
+public interface IEcho extends Remote {
+
+    String echo(String s) throws RemoteException;
+
+}
\ No newline at end of file

Copied: camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java (from r779577, camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java?p2=camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java&p1=camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java&r1=779577&r2=779614&rev=779614&view=diff
==============================================================================
--- camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiRouteTest.java (original)
+++ camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java Thu May 28 14:56:21 2009
@@ -19,68 +19,85 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.rmi.registry.LocateRegistry;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
-import junit.framework.TestCase;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
+import org.apache.camel.ContextTestSupport;
 import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.bean.ProxyHelper;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.util.jndi.JndiContext;
+import org.apache.camel.impl.JndiRegistry;
 
 /**
  * @version $Revision$
  */
-public class RmiRouteTest extends TestCase {
+public class RmiConcurrencyTest extends ContextTestSupport {
+
+    private static boolean created;
 
     protected int getPort() {
-        return 37541;
+        return 37543;
     }
 
-    public void testPojoRoutes() throws Exception {
+    @Override
+    protected JndiRegistry createRegistry() throws Exception {
         if (classPathHasSpaces()) {
-            return;
+            return null;
         }
 
-        // Boot up a local RMI registry
-        LocateRegistry.createRegistry(getPort());
+        if (!created) {
+            LocateRegistry.createRegistry(getPort());
+            created = true;
+        }
 
-        // START SNIPPET: register
-        JndiContext context = new JndiContext();
-        context.bind("bye", new SayService("Good Bye!"));
+        JndiRegistry context = super.createRegistry();
+        context.bind("echo", new EchoService());
+        return context;
+    }
 
-        CamelContext camelContext = new DefaultCamelContext(context);
-        // END SNIPPET: register
+    public void testNoConcurrentProducers() throws Exception {
+        doSendMessages(1, 1);
+    }
 
-        camelContext.addRoutes(getRouteBuilder(camelContext));
+    public void testConcurrentProducers() throws Exception {
+        doSendMessages(10, 5);
+    }
 
-        camelContext.start();
+    private void doSendMessages(int files, int poolSize) throws Exception {
+        if (classPathHasSpaces()) {
+            return;
+        }
 
-        // START SNIPPET: invoke
-        Endpoint endpoint = camelContext.getEndpoint("direct:hello");
-        ISay proxy = ProxyHelper.createProxy(endpoint, ISay.class);
-        String rc = proxy.say();
-        assertEquals("Good Bye!", rc);
-        // END SNIPPET: invoke
+        getMockEndpoint("mock:result").expectedMessageCount(files);
+        getMockEndpoint("mock:result").assertNoDuplicates(body());
+        getMockEndpoint("mock:result").message(0).body().contains("Echo");
+
+        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.sendBody("direct:echo", "" + index);
+                    return null;
+                }
+            });
+        }
 
-        camelContext.stop();
+        assertMockEndpointsSatisfied();
     }
 
-    protected RouteBuilder getRouteBuilder(final CamelContext context) {
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
-            // START SNIPPET: route
-            // lets add simple route
-            public void configure() {
-                from("direct:hello").to("rmi://localhost:37541/bye");
-
-                // When exposing an RMI endpoint, the interfaces it exposes must
-                // be configured.
-                RmiEndpoint bye = (RmiEndpoint)endpoint("rmi://localhost:37541/bye");
-                bye.setRemoteInterfaces(ISay.class);
-                from(bye).to("bean:bye");
+            @Override
+            public void configure() throws Exception {
+                // setup the jmi server endpoint
+                RmiEndpoint echo = (RmiEndpoint)endpoint("rmi://localhost:37543/echo");
+                echo.setRemoteInterfaces(IEcho.class);
+                from(echo).to("bean:echo");
+
+                // and our route where we call the server
+                from("direct:echo").to("rmi://localhost:37543/echo").to("mock:result");
             }
-            // END SNIPPET: route
         };
     }
 
@@ -103,4 +120,4 @@
         }
         return false;
     }
-}
+}
\ No newline at end of file

Modified: camel/trunk/components/camel-rmi/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/resources/log4j.properties?rev=779614&r1=779613&r2=779614&view=diff
==============================================================================
--- camel/trunk/components/camel-rmi/src/test/resources/log4j.properties (original)
+++ camel/trunk/components/camel-rmi/src/test/resources/log4j.properties Thu May 28 14:56:21 2009
@@ -21,7 +21,7 @@
 log4j.rootLogger=INFO, file
 
 #log4j.logger.org.apache.activemq=DEBUG
-log4j.logger.org.apache.camel=DEBUG
+#log4j.logger.org.apache.camel=DEBUG
 
 # CONSOLE appender not used by default
 log4j.appender.out=org.apache.log4j.ConsoleAppender