stomp 1.1.10 → 1.2.0

data/test/test_client.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 $:.unshift(File.dirname(__FILE__))
 
 require 'test_helper'
@@ -6,14 +8,14 @@ class TestClient < Test::Unit::TestCase
   include TestBase
   
   def setup
-    @client = Stomp::Client.new(user, passcode, host, port)
+    @client = get_client()
     # Multi_thread test data
     @max_threads = 20
     @max_msgs = 50
   end
 
   def teardown
-    @client.close if @client # allow tests to close
+    @client.close if @client.open? # allow tests to close
   end
 
   def test_ack_api_works
@@ -23,9 +25,12 @@ class TestClient < Test::Unit::TestCase
     @client.subscribe(make_destination, {:ack => 'client'}) {|msg| received = msg}
     sleep 0.01 until received
     assert_equal message_text, received.body
-
     receipt = nil
-    @client.acknowledge(received) {|r| receipt = r}
+    ack_headers = {}
+    if @client.protocol > Stomp::SPL_10
+      ack_headers["subscription"] = received.headers["subscription"]
+    end
+    @client.acknowledge(received, ack_headers) {|r| receipt = r}
     sleep 0.01 until receipt
     assert_not_nil receipt.headers['receipt-id']
   end unless ENV['STOMP_RABBIT']
@@ -50,7 +55,7 @@ class TestClient < Test::Unit::TestCase
 
     # was never acked so should be resent to next client
 
-    @client = Stomp::Client.new(user, passcode, host, port)
+    @client = get_client()
     received2 = nil
     @client.subscribe(make_destination) {|msg| received2 = msg}
     sleep 0.01 until received2
@@ -78,7 +83,6 @@ class TestClient < Test::Unit::TestCase
       assert_equal(@client.disconnect_receipt.headers['receipt-id'],
         "xyz789", "receipt sent and received should match")
     }
-    @client = nil
   end
 
   def test_publish_then_sub
@@ -128,27 +132,51 @@ class TestClient < Test::Unit::TestCase
 
     @client.begin 'tx1'
     message = nil
-    @client.subscribe(make_destination, :ack => 'client') {|m| message = m}
+    sid = nil
+    if @client.protocol() == Stomp::SPL_10
+      @client.subscribe(make_destination, :ack => 'client') {|m| message = m}
+    else
+      sid = @client.uuid()
+      @client.subscribe(make_destination, :ack => 'client', :id => sid) {|m| message = m}
+    end
     sleep 0.01 until message
     assert_equal message_text, message.body
-    @client.acknowledge message, :transaction => 'tx1'
-    message = nil
-    @client.abort 'tx1'
+    assert_nothing_raised {
+      if @client.protocol() == Stomp::SPL_10
+        @client.acknowledge message, :transaction => 'tx1'
+      else
+        @client.acknowledge message, :transaction => 'tx1', :subscription => sid
+      end
+      message = nil
+      @client.abort 'tx1'
+    }
 
     # lets recreate the connection
     teardown
     setup
-    @client.subscribe(make_destination, :ack => 'client') {|m| message = m}
-
+    sid = nil
+    assert_nothing_raised {
+      if @client.protocol() == Stomp::SPL_10
+        @client.subscribe(make_destination, :ack => 'client') {|m| message = m}
+      else
+        sid = @client.uuid()
+        @client.subscribe(make_destination, :ack => 'client', :id => sid) {|m| message = m}
+      end
+    }
     Timeout::timeout(4) do
       sleep 0.01 until message
     end
     assert_not_nil message
     assert_equal message_text, message.body
-
+    assert_nothing_raised {
     @client.begin 'tx2'
-    @client.acknowledge message, :transaction => 'tx2'
-    @client.commit 'tx2'
+      if @client.protocol() == Stomp::SPL_10
+        @client.acknowledge message, :transaction => 'tx2'
+      else
+        @client.acknowledge message, :transaction => 'tx2', :subscription => sid
+      end
+      @client.commit 'tx2'
+    }
   end
 
   def test_raise_on_multiple_subscriptions_to_same_make_destination
@@ -243,12 +271,22 @@ class TestClient < Test::Unit::TestCase
 
     @client.begin 'tx1'
     message = nil
-    @client.subscribe(make_destination, :ack => 'client') { |m| message = m }
+    sid = nil
+    if @client.protocol() == Stomp::SPL_10
+      @client.subscribe(make_destination, :ack => 'client') { |m| message = m }
+    else
+      sid = @client.uuid()
+      @client.subscribe(make_destination, :ack => 'client', :id => sid) { |m| message = m }
+    end
 
     sleep 0.1 while message.nil?
 
     assert_equal message_text, message.body
-    @client.acknowledge message, :transaction => 'tx1'
+    if @client.protocol() == Stomp::SPL_10
+      @client.acknowledge message, :transaction => 'tx1'
+    else
+      @client.acknowledge message, :transaction => 'tx1', :subscription => sid
+    end
     message = nil
     @client.abort 'tx1'
 
@@ -258,7 +296,11 @@ class TestClient < Test::Unit::TestCase
     assert_equal message_text, message.body
 
     @client.begin 'tx2'
-    @client.acknowledge message, :transaction => 'tx2'
+    if @client.protocol() == Stomp::SPL_10
+      @client.acknowledge message, :transaction => 'tx2'
+    else
+      @client.acknowledge message, :transaction => 'tx2', :subscription => sid
+    end
     @client.commit 'tx2'
   end
 
@@ -270,28 +312,37 @@ class TestClient < Test::Unit::TestCase
     message = nil
     dest = make_destination
     to_send = message_text
-    client = Stomp::Client.new(user, passcode, host, port, true)
-    assert_nothing_raised {
+    client = get_client()
+    sid = nil
+    if @client.protocol() == Stomp::SPL_10
       client.subscribe(dest, :ack => 'client') { |m| message = m }
-      @client.publish dest, to_send
-      Timeout::timeout(4) do
-        sleep 0.01 until message
-      end
-    }
+    else
+      sid = client.uuid()
+      client.subscribe(dest, :ack => 'client', :id => sid) { |m| message = m }
+    end
+    @client.publish dest, to_send
+    Timeout::timeout(4) do
+      sleep 0.01 until message
+    end
     assert_equal to_send, message.body, "first body check"
-    assert_nothing_raised {
-      client.unsubscribe dest # was throwing exception on unsub at one point
-      client.close
-    }
+    if @client.protocol() == Stomp::SPL_10
+      client.unsubscribe dest
+    else
+      client.unsubscribe dest, :subscription => sid
+    end
+    client.close
     #  Same message should remain on the queue.  Receive it again with ack=>auto.
     message_copy = nil
-    client = Stomp::Client.new(user, passcode, host, port, true)
-    assert_nothing_raised {
+    client = get_client()
+    if @client.protocol() == Stomp::SPL_10
       client.subscribe(dest, :ack => 'auto') { |m| message_copy = m }
-      Timeout::timeout(4) do
-        sleep 0.01 until message_copy
-      end
-    }
+    else
+      sid = client.uuid()
+      client.subscribe(dest, :ack => 'auto', :id => sid) { |m| message_copy = m }
+    end
+    Timeout::timeout(4) do
+      sleep 0.01 until message_copy
+    end
     assert_equal to_send, message_copy.body, "second body check"
     assert_equal message.headers['message-id'], message_copy.headers['message-id'], "header check" unless ENV['STOMP_RABBIT']
   end
@@ -301,7 +352,11 @@ class TestClient < Test::Unit::TestCase
     dest = make_destination
     Thread.new(@client) do |acli|
       assert_nothing_raised {
-        acli.subscribe(dest) { |m| msg = m }
+        if acli.protocol() == Stomp::SPL_10
+          acli.subscribe(dest) { |m| msg = m }
+        else
+          acli.subscribe(dest, :id => acli.uuid()) { |m| msg = m }
+        end
         Timeout::timeout(4) do
           sleep 0.01 until msg
         end
@@ -322,14 +377,26 @@ class TestClient < Test::Unit::TestCase
       # Threads within threads .....
       Thread.new(@client) do |acli|
         assert_nothing_raised {
-          acli.subscribe(dest) { |m| 
-            msg = m
-            lock.synchronize do
-              msg_ctr += 1
-            end
-            # Simulate message processing
-            sleep 0.05
-          }
+          # this is ugly .....
+          if acli.protocol() == Stomp::SPL_10
+            acli.subscribe(dest) { |m| 
+              msg = m
+              lock.synchronize do
+                msg_ctr += 1
+              end
+              # Simulate message processing
+              sleep 0.05
+            }
+          else
+            acli.subscribe(dest, :id => acli.uuid()) { |m| 
+              msg = m
+              lock.synchronize do
+                msg_ctr += 1
+              end
+              # Simulate message processing
+              sleep 0.05
+            }
+          end
         }
       end
     end
@@ -351,6 +418,47 @@ class TestClient < Test::Unit::TestCase
     assert_equal @max_msgs, msg_ctr
   end
 
+  def test_closed_checks_client
+    @client.close
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      m = Stomp::Message.new("")
+      @client.acknowledge(m) {|r| receipt = r}
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @client.begin("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @client.commit("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @client.abort("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @client.subscribe("dummy_data", {:ack => 'auto'}) {|msg| received = msg}
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @client.unsubscribe("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @client.publish("dummy_data","dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @client.unreceive("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @client.close("dummy_data")
+    end
+  end
+
   private
     def message_text
       name = caller_method_name unless name

data/test/test_codec.rb

@@ -0,0 +1,83 @@
+# -*- encoding: utf-8 -*-
+
+$:.unshift(File.dirname(__FILE__))
+
+require 'test_helper'
+
+class TestCodec < Test::Unit::TestCase
+  include TestBase
+  
+  def setup
+    @conn = get_connection()
+    # Data for multi_thread tests
+    @max_threads = 20
+    @max_msgs = 100
+  end
+
+  def teardown
+    @conn.disconnect if @conn.open? # allow tests to disconnect
+  end
+
+  def test_1000_check_notneeded
+    test_data = [
+      "a",
+      "abcdefghijklmnopqrstuvwxyz",
+      "ªºÀÁ",
+      "AÇBØCꞇDẼ",
+      "ªºÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿ" + 
+                "ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġDŽDždžLJLjǼǽǾǿȀȁȂȃȌȍȒɰɵɲɮᴘᴤᴭᴥᵻᶅ" +
+                "ᶑṆṌṕṽẄẂỚỘⅱⅲꜨꝐꞂ",
+      ]
+    #
+    test_data.each do |s|
+      #
+      s_decoded = Stomp::HeaderCodec::decode(s)
+      assert_equal s, s_decoded, "Sanity check decode: #{s} | #{s_decoded}"
+      s_reencoded = Stomp::HeaderCodec::encode(s_decoded)
+      assert_equal s_decoded, s_reencoded, "Sanity check reencode: #{s_decoded} | #{s_reencoded}"
+      #
+    end
+  end
+
+  #
+  def test_1010_basic_encode_decode
+    test_data = [
+    	[ "\\\\", "\\" ],
+    	["\\n", "\n"],
+	    ["\\c", ":"],
+	    ["\\\\\\n\\c", "\\\n:"],
+	    ["\\c\\n\\\\", ":\n\\"],
+	    ["\\\\\\c", "\\:"],
+	    ["c\\cc", "c:c"],
+	    ["n\\nn", "n\nn"],
+      ]
+    #
+    test_data.each do |s|
+      #
+      s_decoded = Stomp::HeaderCodec::encode(s[0])
+      assert_equal s[1], s_decoded, "Sanity check encode: #{s[1]} | #{s_decoded}"
+      #
+      s_encoded = Stomp::HeaderCodec::decode(s[1])
+      assert_equal s[0], s_encoded, "Sanity check decode: #{s[0]} | #{s_encoded}"
+    end
+  end
+
+  #
+  def test_1020_fancier
+    test_data = [
+    	[ "a\\\\b", "a\\b" ],
+      [ "\\\\\\n\\c", "\\\n:" ],
+      ]
+    #
+    test_data.each do |s|
+      #
+      s_decoded = Stomp::HeaderCodec::encode(s[0])
+      assert_equal s[1], s_decoded, "Sanity check encode: #{s[1]} | #{s_decoded}"
+      #
+      s_encoded = Stomp::HeaderCodec::decode(s[1])
+      assert_equal s[0], s_encoded, "Sanity check decode: #{s[0]} | #{s_encoded}"
+    end
+  end
+
+end # of class
+

data/test/test_connection.rb

@@ -1,19 +1,21 @@
+# -*- encoding: utf-8 -*-
+
 $:.unshift(File.dirname(__FILE__))
 
 require 'test_helper'
 
-class TestStomp < Test::Unit::TestCase
+class TestConnection < Test::Unit::TestCase
   include TestBase
   
   def setup
-    @conn = Stomp::Connection.open(user, passcode, host, port)
+    @conn = get_connection()
     # Data for multi_thread tests
     @max_threads = 20
     @max_msgs = 100
   end
 
   def teardown
-    @conn.disconnect if @conn # allow tests to disconnect
+    @conn.disconnect if @conn.open? # allow tests to disconnect
   end
 
   def test_connection_exists
@@ -21,7 +23,7 @@ class TestStomp < Test::Unit::TestCase
   end
 
   def test_no_length
-    @conn.subscribe make_destination
+    conn_subscribe make_destination
     #
     @conn.publish make_destination, "test_stomp#test_no_length",
       { :suppress_content_length => true }
@@ -31,18 +33,22 @@ class TestStomp < Test::Unit::TestCase
     @conn.publish make_destination, "test_stomp#test_\000_length",
       { :suppress_content_length => true }
     msg2 = @conn.receive
-    assert_equal "test_stomp#test_", msg2.body
+    if @conn.protocol == Stomp::SPL_10
+      assert_equal "test_stomp#test_", msg2.body
+    else
+      assert_equal "test_stomp#test_\000_length", msg2.body
+    end
   end unless ENV['STOMP_RABBIT']
 
   def test_explicit_receive
-    @conn.subscribe make_destination
+    conn_subscribe make_destination
     @conn.publish make_destination, "test_stomp#test_explicit_receive"
     msg = @conn.receive
     assert_equal "test_stomp#test_explicit_receive", msg.body
   end
 
   def test_receipt
-    @conn.subscribe make_destination, :receipt => "abc"
+    conn_subscribe make_destination, :receipt => "abc"
     msg = @conn.receive
     assert_equal "abc", msg.headers['receipt-id']
   end
@@ -54,18 +60,28 @@ class TestStomp < Test::Unit::TestCase
       assert_equal(@conn.disconnect_receipt.headers['receipt-id'],
         "abc123", "receipt sent and received should match")
     }
-    @conn = nil
   end
 
   def test_client_ack_with_symbol
-    @conn.subscribe make_destination, :ack => :client
+    if @conn.protocol == Stomp::SPL_10
+      @conn.subscribe make_destination, :ack => :client
+    else
+      sid = @conn.uuid()
+      @conn.subscribe make_destination, :ack => :client, :id => sid
+    end
     @conn.publish make_destination, "test_stomp#test_client_ack_with_symbol"
     msg = @conn.receive
-    @conn.ack msg.headers['message-id']
+    assert_nothing_raised {
+      if @conn.protocol == Stomp::SPL_10
+        @conn.ack msg.headers['message-id']
+      else
+        @conn.ack msg.headers['message-id'], :subscription => sid
+      end
+    }
   end
 
   def test_embedded_null
-    @conn.subscribe make_destination
+    conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     msg = @conn.receive
     assert_equal "a\0" , msg.body
@@ -83,15 +99,63 @@ class TestStomp < Test::Unit::TestCase
     assert_equal true, @conn.closed?
   end
 
+  def test_closed_checks_conn
+    @conn.disconnect
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @conn.ack("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @conn.begin("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @conn.commit("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @conn.abort("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      conn_subscribe("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @conn.unsubscribe("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @conn.publish("dummy_data","dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @conn.unreceive("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      @conn.disconnect("dummy_data")
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      m = @conn.receive
+    end
+    #
+    assert_raise Stomp::Error::NoCurrentConnection do
+      m = @conn.poll
+    end
+  end
+
   def test_response_is_instance_of_message_class
-    @conn.subscribe make_destination
+    conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     msg = @conn.receive
     assert_instance_of Stomp::Message , msg
   end
 
   def test_message_to_s
-    @conn.subscribe make_destination
+    conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     msg = @conn.receive
     assert_match /^<Stomp::Message headers=/ , msg.to_s
@@ -102,7 +166,7 @@ class TestStomp < Test::Unit::TestCase
   end
   
   def test_messages_with_multipleLine_ends
-    @conn.subscribe make_destination
+    conn_subscribe make_destination
     @conn.publish make_destination, "a\n\n"
     @conn.publish make_destination, "b\n\na\n\n"
     
@@ -114,7 +178,7 @@ class TestStomp < Test::Unit::TestCase
   end
 
   def test_publish_two_messages
-    @conn.subscribe make_destination
+    conn_subscribe make_destination
     @conn.publish make_destination, "a\0"
     @conn.publish make_destination, "b\0"
     msg_a = @conn.receive
@@ -132,7 +196,7 @@ class TestStomp < Test::Unit::TestCase
         end
     end
     #
-    @conn.subscribe( make_destination )
+    conn_subscribe( make_destination )
     message = Time.now.to_s
     @conn.publish(make_destination, message)
     sleep 1
@@ -142,7 +206,7 @@ class TestStomp < Test::Unit::TestCase
 
   def test_thread_poll_one
     received = nil
-    max_sleep = (RUBY_VERSION =~ /1\.8\.6/) ? 5 : 1
+    max_sleep = (RUBY_VERSION =~ /1\.8/) ? 10 : 1
     Thread.new(@conn) do |amq|
         while true
           received = amq.poll
@@ -152,7 +216,7 @@ class TestStomp < Test::Unit::TestCase
         end
     end
     #
-    @conn.subscribe( make_destination )
+    conn_subscribe( make_destination )
     message = Time.now.to_s
     @conn.publish(make_destination, message)
     sleep max_sleep+1
@@ -178,13 +242,14 @@ class TestStomp < Test::Unit::TestCase
       end
     end
     #
-    @conn.subscribe( dest )
+    conn_subscribe( dest )
     1.upto(@max_msgs) do |mnum|
       msg = Time.now.to_s + " #{mnum}"
       @conn.publish(dest, msg)
     end
     #
-    max_sleep = (RUBY_VERSION =~ /1\.8\.6/) ? 30 : 5
+    max_sleep = (RUBY_VERSION =~ /1\.8/) ? 30 : 5
+    max_sleep = 30 if RUBY_ENGINE =~ /mingw/
     sleep_incr = 0.10
     total_slept = 0
     while true
@@ -194,7 +259,7 @@ class TestStomp < Test::Unit::TestCase
       sleep sleep_incr
     end
     assert_equal @max_msgs, msg_ctr
-  end
+  end unless RUBY_ENGINE =~ /jruby/
 
   def test_multi_thread_poll
     #
@@ -220,13 +285,14 @@ class TestStomp < Test::Unit::TestCase
       end
     end
     #
-    @conn.subscribe( dest )
+    conn_subscribe( dest )
     1.upto(@max_msgs) do |mnum|
       msg = Time.now.to_s + " #{mnum}"
       @conn.publish(dest, msg)
     end
     #
     max_sleep = (RUBY_VERSION =~ /1\.8\.6/) ? 30 : 5
+    max_sleep = 30 if RUBY_ENGINE =~ /mingw/
     sleep_incr = 0.10
     total_slept = 0
     while true
@@ -236,20 +302,20 @@ class TestStomp < Test::Unit::TestCase
       sleep sleep_incr
     end
     assert_equal @max_msgs, msg_ctr
-  end
+  end unless RUBY_ENGINE =~ /jruby/
 
   def test_nil_body
     dest = make_destination
     assert_nothing_raised {
       @conn.publish dest, nil
     }
-    @conn.subscribe dest
+    conn_subscribe dest
     msg = @conn.receive
     assert_equal "", msg.body    
   end
 
   def test_transaction
-    @conn.subscribe make_destination
+    conn_subscribe make_destination
 
     @conn.begin "txA"
     @conn.publish make_destination, "txn message", 'transaction' => "txA"
@@ -264,5 +330,52 @@ class TestStomp < Test::Unit::TestCase
     assert_equal "txn message", msg.body
   end
 
+  def test_duplicate_subscription
+    @conn.disconnect # not reliable
+    @conn = Stomp::Connection.open(user, passcode, host, port, true) # reliable
+    dest = make_destination
+    conn_subscribe dest
+    #
+    assert_raise Stomp::Error::DuplicateSubscription do
+      conn_subscribe dest
+    end
+  end
+
+  def test_nil_connparms
+    @conn.disconnect
+    #
+    assert_nothing_raised do
+      @conn = Stomp::Connection.open(user, passcode, host, port, false, 5, nil)
+    end
+  end
+
+  def test_nack11p_0010
+    if @conn.protocol == Stomp::SPL_10
+      assert_raise Stomp::Error::UnsupportedProtocolError do
+        @conn.nack "dummy msg-id"
+      end
+    else
+      sid = @conn.uuid()
+      dest = make_destination
+      @conn.subscribe dest, :ack => :client, :id => sid
+      smsg = "test_stomp#test_nack01: #{Time.now.to_f}"
+      @conn.publish make_destination, smsg
+      msg = @conn.receive
+      assert_equal smsg, msg.body
+      assert_nothing_raised {
+        @conn.nack msg.headers["message-id"], :subscription => sid
+        sleep 0.05 # Give racy brokers a chance to handle the last nack before unsubscribe
+        @conn.unsubscribe dest, :id => sid
+      }
+      # phase 2
+      teardown()
+      setup()
+      sid = @conn.uuid()
+      @conn.subscribe dest, :ack => :auto, :id => sid
+      msg2 = @conn.receive
+      assert_equal smsg, msg2.body
+    end
+  end
+
 end