svn commit: r1329191 - in /camel/branches/camel-2.9.x: ./ components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java

[davsclaus]

Author: davsclaus
Date: Mon Apr 23 11:37:09 2012
New Revision: 1329191

URL: http://svn.apache.org/viewvc?rev=1329191&view=rev
Log:
CAMEL-5177: getEndpointUri returns the exact uri the endpoint was given. Avoid 
reparsing as well. Polished EndpointConfiguration to avoid using 
PropertyEditorTypeConverter directly.

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1329190

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java?rev=1329191&r1=1329190&r2=1329191&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcConfigurationTest.java
 Mon Apr 23 11:37:09 2012
@@ -21,6 +21,7 @@ import java.util.List;
 
 import org.apache.camel.Endpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.URISupport;
 import org.junit.Test;
 
 public class IrcConfigurationTest extends CamelTestSupport {
@@ -99,8 +100,8 @@ public class IrcConfigurationTest extend
 
         // Test with encoding of @realname
         deprecate = 
"irc://u...@irc.freenode.net?keys=foo,&channels=#camel,#cxf&realname=Camel 
Bot&username=user&nickname=camelbot";
-        sanitized = 
"irc://u...@irc.freenode.net?channel=camel!foo&channel=cxf&nickname=camelbot&realname=Camel%20Bot";
-        endpoint = component.createEndpoint(deprecate); 
+        sanitized = 
"irc://u...@irc.freenode.net?realname=Camel%20Bot&nickname=camelbot&channel=camel!foo&channel=cxf";
+        endpoint = component.createEndpoint(deprecate);
         assertEquals(sanitized, endpoint.getEndpointUri());
         assertNotNull(new URI(endpoint.getEndpointUri()));
     }