You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2011/08/26 03:26:18 UTC

svn commit: r1161956 - in /activemq/activemq-apollo/trunk/apollo-stomp/src: main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala test/scala/org/apache/activemq/apollo/stomp/StompTest.scala

Author: chirino
Date: Fri Aug 26 01:26:18 2011
New Revision: 1161956

URL: http://svn.apache.org/viewvc?rev=1161956&view=rev
Log:
Fixes failing tests.

Modified:
    activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
    activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala?rev=1161956&r1=1161955&r2=1161956&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/main/scala/org/apache/activemq/apollo/stomp/StompProtocolHandler.scala Fri Aug 26 01:26:18 2011
@@ -828,7 +828,7 @@ class StompProtocolHandler extends Proto
             var msg = if( security_context.user==null ) {
               "Authentication failed."
             } else {
-              "Authentication failed. Username: "+security_context.user
+              "Authentication failed. Username="+security_context.user
             }
             async_die(msg)
             noop // to make the cps compiler plugin happy.
@@ -837,7 +837,7 @@ class StompProtocolHandler extends Proto
             var msg = if( security_context.user==null ) {
               "Connect not authorized."
             } else {
-              "Connect not authorized. Username: "+security_context.user
+              "Connect not authorized. Username="+security_context.user
             }
             async_die(msg)
             noop // to make the cps compiler plugin happy.

Modified: activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala?rev=1161956&r1=1161955&r2=1161956&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala (original)
+++ activemq/activemq-apollo/trunk/apollo-stomp/src/test/scala/org/apache/activemq/apollo/stomp/StompTest.scala Fri Aug 26 01:26:18 2011
@@ -1292,14 +1292,14 @@ class StompSecurityTest extends StompTes
       "login:can_not_connect\n" +
       "passcode:can_not_connect\n")
     frame should startWith("ERROR\n")
-    frame should include("message:Connect not authorized.\n")
+    frame should include("message:Connect not authorized.")
 
   }
 
   test("Connect with no id password") {
     val frame = connect_request("1.1", client)
     frame should startWith("ERROR\n")
-    frame should include("message:Authentication failed.\n")
+    frame should include("message:Authentication failed.")
   }
 
   test("Connect with invalid id password") {
@@ -1307,7 +1307,7 @@ class StompSecurityTest extends StompTes
       "login:foo\n" +
       "passcode:bar\n")
     frame should startWith("ERROR\n")
-    frame should include("message:Authentication failed.\n")
+    frame should include("message:Authentication failed.")
 
   }