stomp 1.4.3 → 1.4.4

data/test/test_connection.rb

@@ -33,7 +33,9 @@ class TestConnection < Test::Unit::TestCase
 
   # Test asynchronous polling.
   def test_poll_async
-    @conn.subscribe("/queue/do.not.put.messages.on.this.queue", :id => "a.no.messages.queue")
+	  sq = ENV['STOMP_ARTEMIS'] ? "jms.queue.queue.do.not.put.messages.on.this.queue" :
+		  "/queue/do.not.put.messages.on.this.queue"
+    @conn.subscribe(sq, :id => "a.no.messages.queue")
     # If the test 'hangs' here, Connection#poll is broken.
     m = @conn.poll
     assert m.nil?
@@ -74,11 +76,9 @@ class TestConnection < Test::Unit::TestCase
   # Test asking for a receipt on disconnect.
   def test_disconnect_receipt
     @conn.disconnect :receipt => "abc123"
-    assert_nothing_raised {
-      assert_not_nil(@conn.disconnect_receipt, "should have a receipt")
-      assert_equal(@conn.disconnect_receipt.headers['receipt-id'],
-        "abc123", "receipt sent and received should match")
-    }
+    assert_not_nil(@conn.disconnect_receipt, "should have a receipt")
+    assert_equal(@conn.disconnect_receipt.headers['receipt-id'],
+      "abc123", "receipt sent and received should match")
   end
 
   # Test ACKs for Stomp 1.0
@@ -91,11 +91,9 @@ class TestConnection < Test::Unit::TestCase
     @conn.subscribe queue, :ack => :client
     @conn.publish queue, "test_stomp#test_client_ack_with_symbol_10"
     msg = @conn.receive
-    assert_nothing_raised {
-      # ACK has one required header, message-id, which must contain a value 
-      # matching the message-id for the MESSAGE being acknowledged.
-      @conn.ack msg.headers['message-id']
-    }
+    # ACK has one required header, message-id, which must contain a value 
+    # matching the message-id for the MESSAGE being acknowledged.
+    @conn.ack msg.headers['message-id']
     checkEmsg(@conn)
   end
 
@@ -110,13 +108,11 @@ class TestConnection < Test::Unit::TestCase
     @conn.subscribe queue, :ack => :client, :id => sid
     @conn.publish queue, "test_stomp#test_client_ack_with_symbol_11"
     msg = @conn.receive
-    assert_nothing_raised {
-      # ACK has two REQUIRED headers: message-id, which MUST contain a value 
-      # matching the message-id for the MESSAGE being acknowledged and 
-      # subscription, which MUST be set to match the value of the subscription's 
-      # id header.
-      @conn.ack msg.headers['message-id'], :subscription => msg.headers['subscription']
-    }
+    # ACK has two REQUIRED headers: message-id, which MUST contain a value 
+    # matching the message-id for the MESSAGE being acknowledged and 
+    # subscription, which MUST be set to match the value of the subscription's 
+    # id header.
+    @conn.ack msg.headers['message-id'], :subscription => msg.headers['subscription']
     checkEmsg(@conn)
   end
 
@@ -131,11 +127,9 @@ class TestConnection < Test::Unit::TestCase
     @conn.subscribe queue, :ack => :client, :id => sid
     @conn.publish queue, "test_stomp#test_client_ack_with_symbol_11"
     msg = @conn.receive
-    assert_nothing_raised {
-      # The ACK frame MUST include an id header matching the ack header 
-      # of the MESSAGE being acknowledged.
-      @conn.ack msg.headers['ack']
-    }
+    # The ACK frame MUST include an id header matching the ack header 
+    # of the MESSAGE being acknowledged.
+    @conn.ack msg.headers['ack']
     checkEmsg(@conn)
   end
 
@@ -387,9 +381,7 @@ class TestConnection < Test::Unit::TestCase
   # Test using a nil body.
   def test_nil_body
     dest = make_destination
-    assert_nothing_raised {
-      @conn.publish dest, nil
-    }
+    @conn.publish dest, nil
     conn_subscribe dest
     msg = @conn.receive
     assert_equal "", msg.body
@@ -412,7 +404,7 @@ class TestConnection < Test::Unit::TestCase
     msg = @conn.receive
     assert_equal "txn message", msg.body
     checkEmsg(@conn)
-  end
+  end unless ENV['STOMP_ARTEMIS'] # See Artemis docs for 1.3, page 222
 
   # Test duplicate subscriptions.
   def test_duplicate_subscription
@@ -431,9 +423,7 @@ class TestConnection < Test::Unit::TestCase
   def test_nil_connparms
     @conn.disconnect
     #
-    assert_nothing_raised do
-      @conn = Stomp::Connection.open(user, passcode, host, port, false, 5, nil)
-    end
+    @conn = Stomp::Connection.open(user, passcode, host, port, false, 5, nil)
     checkEmsg(@conn)
   end
 
@@ -454,17 +444,13 @@ class TestConnection < Test::Unit::TestCase
       assert_equal smsg, msg.body
       case @conn.protocol
         when Stomp::SPL_12
-          assert_nothing_raised {
-            @conn.nack msg.headers["ack"]
-            sleep 0.05 # Give racy brokers a chance to handle the last nack before unsubscribe
-            @conn.unsubscribe dest, :id => sid
-          }
+          @conn.nack msg.headers["ack"]
+          sleep 0.05 # Give racy brokers a chance to handle the last nack before unsubscribe
+          @conn.unsubscribe dest, :id => sid
         else # Stomp::SPL_11
-          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
-          }
+          @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
       end
 
       # phase 2
@@ -476,7 +462,7 @@ class TestConnection < Test::Unit::TestCase
       assert_equal smsg, msg2.body
       checkEmsg(@conn)
     end
-  end unless ENV['STOMP_AMQ11'] # AMQ sends NACK'd messages to a DLQ
+  end unless (ENV['STOMP_AMQ11'] || ENV['STOMP_ARTEMIS'])
 
   # Test to illustrate Issue #44.  Prior to a fix for #44, these tests would
   # fail only when connecting to a pure STOMP 1.0 server that does not 
@@ -492,9 +478,7 @@ class TestConnection < Test::Unit::TestCase
       :reliable => false,
     }
     c = nil
-    assert_nothing_raised {
-      c = Stomp::Connection.new(hash)
-    }
+    c = Stomp::Connection.new(hash)
     c.disconnect if c
     #
     hash = { :hosts => [ 
@@ -504,9 +488,7 @@ class TestConnection < Test::Unit::TestCase
       :reliable => false,
     }
     c = nil
-    assert_nothing_raised {
-      c = Stomp::Connection.new(hash)
-    }
+    c = Stomp::Connection.new(hash)
     c.disconnect if c
   end
 
@@ -614,10 +596,26 @@ class TestConnection < Test::Unit::TestCase
     #
     ok_vals = dflt_data_ok()
     ok_vals.each do |hsv|
-      assert_nothing_raised {
-        conn = Stomp::Connection.new(hsv)
-        conn.disconnect
-      }
+      conn = Stomp::Connection.new(hsv)
+      conn.disconnect
+    end
+  end
+
+  def test_conn_nodest_sub
+    assert_raise Stomp::Error::DestinationRequired do
+      @conn.subscribe(nil)
+    end
+  end
+
+  def test_conn_nodest_unsub
+    assert_raise Stomp::Error::DestinationRequired do
+      @conn.unsubscribe(nil)
+    end
+  end
+
+  def test_conn_nodest_pub
+    assert_raise Stomp::Error::DestinationRequired do
+      @conn.publish(nil, "msg")
     end
   end
 

data/test/test_connection1p.rb

@@ -77,10 +77,8 @@ class TestConnection1P < Test::Unit::TestCase
     cha = {:host => "localhost", "accept-version" => "1.0"}
     cha[:host] = "/" if ENV['STOMP_RABBIT']
     conn = nil
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
-      conn.disconnect
-    end
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn.disconnect
     assert_equal conn.protocol, Stomp::SPL_10
   end
 
@@ -90,10 +88,8 @@ class TestConnection1P < Test::Unit::TestCase
     #
     cha = get_conn_headers()
     conn = nil
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
-      conn.disconnect
-    end
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn.disconnect
     assert conn.protocol >= Stomp::SPL_11
   end
 
@@ -104,10 +100,8 @@ class TestConnection1P < Test::Unit::TestCase
     cha = get_conn_headers()    
     cha["heart-beat"] = "0,0" # No heartbeats
     conn = nil
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
-      conn.disconnect
-    end
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn.disconnect
     assert conn.protocol >= Stomp::SPL_11
   end
 
@@ -142,10 +136,8 @@ class TestConnection1P < Test::Unit::TestCase
     cha = get_conn_headers()    
     cha["heart-beat"] = "500,1000" # Valid heart beat headers
     conn = nil
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
-      conn.disconnect
-    end
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn.disconnect
     assert conn.hbsend_interval > 0
     assert conn.hbrecv_interval > 0
   end
@@ -158,13 +150,11 @@ class TestConnection1P < Test::Unit::TestCase
     cha["heart-beat"] = "10000,0" # Valid heart beat headers, send only
     conn = nil
     logger = Tlogger.new
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
-      conn.set_logger(logger)
-      sleep 65
-      conn.set_logger(nil)
-      conn.disconnect
-    end
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn.set_logger(logger)
+    sleep 65
+    conn.set_logger(nil)
+    conn.disconnect
     hb_asserts_send(conn)
   end if ENV['STOMP_HB11LONG']
 
@@ -176,14 +166,12 @@ class TestConnection1P < Test::Unit::TestCase
     cha["heart-beat"] = "0,6000" # Valid heart beat headers, receive only
     conn = nil
     logger = Tlogger.new
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
 #      m = conn.receive # This will hang forever .....
-      conn.set_logger(logger)
-      sleep 65
-      conn.set_logger(nil)
-      conn.disconnect
-    end
+    conn.set_logger(logger)
+    sleep 65
+    conn.set_logger(nil)
+    conn.disconnect
     hb_asserts_recv(conn)
   end if ENV['STOMP_HB11LONG']
 
@@ -195,14 +183,12 @@ class TestConnection1P < Test::Unit::TestCase
     cha["heart-beat"] = "5000,10000" # Valid heart beat headers, send and receive
     conn = nil
     logger = Tlogger.new
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
 #      m = conn.receive # This will hang forever .....
-      conn.set_logger(logger)
-      sleep 65
-      conn.set_logger(nil)
-      conn.disconnect
-    end
+    conn.set_logger(logger)
+    sleep 65
+    conn.set_logger(nil)
+    conn.disconnect
     hb_asserts_both(conn)
   end if ENV['STOMP_HB11LONG']
 
@@ -271,19 +257,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn.disconnect
   end
 
-  # Repeated headers test. Currently:
-  # - Apollo emits repeated headers for a 1.1 connection only
-  # - RabbitMQ does not emit repeated headers under any circumstances
-  # - AMQ 5.6 does not emit repeated headers under any circumstances
-  # Pure luck that this runs against AMQ at present.
+  # Repeated headers test. Brokers have a lot of freedom given the verbiage
+  # in the specs.
   def test_conn_1p_0124
     dest = make_destination
     msg = "payload: #{Time.now.to_f}"
     shdrs = { "key1" => "val1", "key2" => "val2",
       "key3" => ["kv3", "kv2", "kv1"] }
-    assert_nothing_raised {
-      @conn.publish dest, msg, shdrs
-    }
+    @conn.publish dest, msg, shdrs
     #
     sid = @conn.uuid()
     @conn.subscribe dest, :id => sid
@@ -291,7 +272,7 @@ class TestConnection1P < Test::Unit::TestCase
     received = @conn.receive
     assert_equal msg, received.body
     if @conn.protocol != Stomp::SPL_10
-      assert_equal shdrs["key3"], received.headers["key3"] unless ENV['STOMP_RABBIT'] || ENV['STOMP_AMQ11']
+      assert_equal shdrs["key3"], received.headers["key3"] unless ENV['STOMP_RABBIT'] || ENV['STOMP_AMQ11'] || ENV['STOMP_ARTEMIS']
     else
       assert_equal "kv3", received.headers["key3"]
     end
@@ -304,9 +285,7 @@ class TestConnection1P < Test::Unit::TestCase
     dest = make_destination
     sid = @conn.uuid()
     sid.freeze
-    assert_nothing_raised {
-      @conn.subscribe dest, :id => sid
-    }
+    @conn.subscribe dest, :id => sid
   end
 
   # Test heartbeats with send and receive.
@@ -317,14 +296,12 @@ class TestConnection1P < Test::Unit::TestCase
     cha["heart-beat"] = "10000,6000" # Valid heart beat headers, send and receive
     conn = nil
     logger = Tlogger.new
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
 #      m = conn.receive # This will hang forever .....
-      conn.set_logger(logger)
-      sleep 65
-      conn.set_logger(nil)
-      conn.disconnect
-    end
+    conn.set_logger(logger)
+    sleep 65
+    conn.set_logger(nil)
+    conn.disconnect
     hb_asserts_both(conn)
   end if ENV['STOMP_HB11LONG']
 
@@ -336,14 +313,12 @@ class TestConnection1P < Test::Unit::TestCase
     cha["heart-beat"] = "10000,1000" # Valid heart beat headers, send and receive
     conn = nil
     logger = Tlogger.new
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
 #      m = conn.receive # This will hang forever .....
-      conn.set_logger(logger)
-      sleep 65
-      conn.set_logger(nil)
-      conn.disconnect
-    end
+    conn.set_logger(logger)
+    sleep 65
+    conn.set_logger(nil)
+    conn.disconnect
     hb_asserts_both(conn)
   end if ENV['STOMP_HB11LONG']
 
@@ -355,14 +330,12 @@ class TestConnection1P < Test::Unit::TestCase
     cha["heart-beat"] = "1000,10000" # Valid heart beat headers, send and receive
     conn = nil
     logger = Tlogger.new
-    assert_nothing_raised do
-      conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
+    conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
 #      m = conn.receive # This will hang forever .....
-      conn.set_logger(logger)
-      sleep 65
-      conn.set_logger(nil)
-      conn.disconnect
-    end
+    conn.set_logger(logger)
+    sleep 65
+    conn.set_logger(nil)
+    conn.disconnect
     hb_asserts_both(conn)
   end if ENV['STOMP_HB11LONG']
 
@@ -378,9 +351,7 @@ class TestConnection1P < Test::Unit::TestCase
     if conn.protocol >= Stomp::SPL_12
       shdrs["bb\rcc"] = "dd\ree"
     end
-    assert_nothing_raised {
-      conn.publish dest, msg, shdrs
-    }
+    conn.publish dest, msg, shdrs
     #
     sid = conn.uuid()
     conn.subscribe dest, :id => sid
@@ -402,9 +373,7 @@ class TestConnection1P < Test::Unit::TestCase
     msg = "payload: #{Time.now.to_f}"
     dest = make_destination
     shdrs = { :suppress_content_length => true }
-    assert_nothing_raised {
-      @conn.publish dest, msg, shdrs
-    }
+    @conn.publish dest, msg, shdrs
     #
     sid = @conn.uuid()
     @conn.subscribe dest, :id => sid

data/test/test_helper.rb

@@ -168,15 +168,28 @@ module TestBase
   # Get a dynamic destination name.
   def make_destination
     name = caller_method_name unless name
-    qname = ENV['STOMP_DOTQUEUE'] ? "/queue/test.ruby.stomp." + name : "/queue/test/ruby/stomp/" + name
+    case
+      when ENV['STOMP_DOTQUEUE']
+        qname = "/queue/test.ruby.stomp." + name
+      when ENV['STOMP_ARTEMIS']
+        qname = "jms.queue.queue.test.ruby.stomp." + name
+      else
+        qname = "/queue/test/ruby/stomp/" + name
+    end
     return qname
   end
 
+  # get DLQ name
+  def make_dlq
+    return "jms.queue.DLQ" if ENV['STOMP_ARTEMIS']
+    "/queue/DLQ"
+  end
+
   #
   def checkEmsg(cc)
     m = cc.poll
     if m
-      assert m.command != Stomp::CMD_ERROR
+      assert m.command != Stomp::CMD_ERROR, "checkEmsg"
     end
   end
 

data/test/test_message.rb

@@ -123,44 +123,29 @@ class TestMessage < Test::Unit::TestCase
 			_ = Stomp::Message.new("ERROR\nbadheaders\n\njunk\0\n\n", false)
 		}
 		#
-		assert_nothing_raised {
-			_ = Stomp::Message.new("CONNECTED\nh1:val1\n\njunk\0\n", false)
-		}
-		#
-		assert_nothing_raised {
-			_ = Stomp::Message.new("MESSAGE\nh1:val1\n\njunk\0\n", false)
-		}
-		#
-		assert_nothing_raised {
-			_ = Stomp::Message.new("MESSAGE\nh2:val2\n\n\0", false)
-		}
-		#
-		assert_nothing_raised {
-			_ = Stomp::Message.new("RECEIPT\nh1:val1\n\njunk\0\n", false)
-		}
-		#
-		assert_nothing_raised {
-			_ = Stomp::Message.new("ERROR\nh1:val1\n\njunk\0\n", false)
-		}
+
+    _ = Stomp::Message.new("CONNECTED\nh1:val1\n\njunk\0\n", false)
+    _ = Stomp::Message.new("MESSAGE\nh1:val1\n\njunk\0\n", false)
+    _ = Stomp::Message.new("MESSAGE\nh2:val2\n\n\0", false)
+    _ = Stomp::Message.new("RECEIPT\nh1:val1\n\njunk\0\n", false)
+    _ = Stomp::Message.new("ERROR\nh1:val1\n\njunk\0\n", false)
 
 	end
 
 	# Test multiple headers with the same key
   def test_0050_mh_msg_create
     aframe = bframe = nil
-		assert_nothing_raised {
-      amsg = "MESSAGE\n" +
-        "h1:val1\n" + 
-        "h2:val3\n" + 
-        "h2:val2\n" + 
-        "h2:val1\n" + 
-        "h3:val1\n" + 
-        "\n" +
-        "payload" +
-        "\0\n"
-			aframe = Stomp::Message.new(amsg, false)
-			bframe = Stomp::Message.new(amsg, true)
-		}
+    amsg = "MESSAGE\n" +
+      "h1:val1\n" + 
+      "h2:val3\n" + 
+      "h2:val2\n" + 
+      "h2:val1\n" + 
+      "h3:val1\n" + 
+      "\n" +
+      "payload" +
+      "\0\n"
+    aframe = Stomp::Message.new(amsg, false)
+    bframe = Stomp::Message.new(amsg, true)
     #
     assert aframe.headers["h2"].is_a?(String), "Expected a String"
     assert_equal "val3", aframe.headers["h2"], "Expected 1st value"
@@ -199,9 +184,7 @@ class TestMessage < Test::Unit::TestCase
     assert_raise Stomp::Error::ProtocolErrorEmptyHeaderValue do
       _ = Stomp::Message.new(amsg, false)
     end
-    assert_nothing_raised {
-      _ = Stomp::Message.new(amsg, true)
-    }
+    _ = Stomp::Message.new(amsg, true)
   end
 
 end