camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r802379 - in /camel/trunk/components/camel-irc/src: main/java/org/apache/camel/component/irc/IrcConsumer.java test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
Date Sat, 08 Aug 2009 13:52:38 GMT
Author: davsclaus
Date: Sat Aug  8 13:52:38 2009
New Revision: 802379

URL: http://svn.apache.org/viewvc?rev=802379&view=rev
Log:
CAMEL-1881: irc consumer now also supports private messages. Applied patch with thanks to
Stan Lewis.

Added:
    camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
  (with props)
Modified:
    camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java

Modified: camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java?rev=802379&r1=802378&r2=802379&view=diff
==============================================================================
--- camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
(original)
+++ camel/trunk/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcConsumer.java
Sat Aug  8 13:52:38 2009
@@ -173,7 +173,7 @@
         @Override
         public void onPrivmsg(String target, IRCUser user, String msg) {
             if (configuration.isOnPrivmsg()) {
-                if (target.equals(configuration.getTarget())) {
+                if (target.equals(configuration.getTarget()) || target.equals(configuration.getNickname()))
{
                     Exchange exchange = endpoint.createOnPrivmsgExchange(target, user, msg);
                     try {
                         getProcessor().process(exchange);

Added: camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java?rev=802379&view=auto
==============================================================================
--- camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
(added)
+++ camel/trunk/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
Sat Aug  8 13:52:38 2009
@@ -0,0 +1,95 @@
+/**
+ * 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.irc;
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+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 IrcPrivmsgTest extends CamelTestSupport {
+    protected MockEndpoint resultEndpoint;
+
+    protected String expectedBody1 = "Message One";
+    protected String expectedBody2 = "Message Two";
+
+    protected String command = "PRIVMSG camel-con :";
+
+    protected String body1 = command + expectedBody1;
+    protected String body2 = command + expectedBody2;
+
+    private boolean sentMessages;    
+
+    @Test
+    public void testIrcPrivateMessages() throws Exception {
+        resultEndpoint = (MockEndpoint) context.getEndpoint("mock:result");
+        resultEndpoint.expectedBodiesReceived(expectedBody1, expectedBody2);
+
+        resultEndpoint.assertIsSatisfied();
+
+        List<Exchange> list = resultEndpoint.getReceivedExchanges();
+        for (Exchange exchange : list) {
+            log.info("Received exchange: " + exchange + " headers: " + exchange.getIn().getHeaders());
+        }
+    }   
+    
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() throws Exception {
+                from(fromUri()).
+                        choice().
+                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("PRIVMSG")).to("mock:result").
+                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("JOIN")).to("seda:consumerJoined");
+
+                from("seda:consumerJoined").process(new Processor() {
+                    public void process(Exchange exchange) throws Exception {
+                        sendMessages();
+                    }
+                });
+            }
+        };
+    }
+
+    protected String sendUri() {
+        return "irc://camel-prd@irc.codehaus.org:6667/#camel-test?nickname=camel-prd";
+    }
+
+    protected String fromUri() {
+        return "irc://camel-con@irc.codehaus.org:6667/#camel-test?nickname=camel-con";
+    }    
+    
+    /**
+     * Lets send messages once the consumer has joined
+     */
+    protected void sendMessages() {
+        if (!sentMessages) {
+            sentMessages = true;
+
+            // now the consumer has joined, lets send some messages
+
+            template.sendBody(sendUri(), body1);
+            template.sendBody(sendUri(), body2);
+        }
+    }
+}

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

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



Mime
View raw message