stomp 1.4.3 → 1.4.4

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*-
 
+require 'rubygems' if RUBY_VERSION < "1.9"
 require 'rspec'
 dir = File.dirname(__FILE__)
 lib_path = File.expand_path("#{dir}/../lib")

data/stomp.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: stomp 1.4.3 ruby lib
+# stub: stomp 1.4.4 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "stomp"
-  s.version = "1.4.3"
+  s.name = "stomp".freeze
+  s.version = "1.4.4"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Brian McCallister", "Marius Mathiesen", "Thiago Morello", "Guy M. Allard"]
-  s.date = "2016-08-21"
-  s.description = "Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge."
-  s.email = ["brianm@apache.org", "marius@stones.com", "morellon@gmail.com", "allard.guy.m@gmail.com"]
-  s.executables = ["catstomp", "stompcat"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Brian McCallister".freeze, "Marius Mathiesen".freeze, "Thiago Morello".freeze, "Guy M. Allard".freeze]
+  s.date = "2017-06-11"
+  s.description = "Ruby client for the Stomp messaging protocol.  Note that this gem is no longer supported on rubyforge.".freeze
+  s.email = ["brianm@apache.org".freeze, "marius@stones.com".freeze, "morellon@gmail.com".freeze, "allard.guy.m@gmail.com".freeze]
+  s.executables = ["catstomp".freeze, "stompcat".freeze]
   s.extra_rdoc_files = [
     "LICENSE",
     "README.md"
@@ -36,6 +36,9 @@ Gem::Specification.new do |s|
     "bin/catstomp",
     "bin/stompcat",
     "examples/amqdurasub.rb",
+    "examples/artemis/artlogger.rb",
+    "examples/artemis/cliwaiter_not_reliable.rb",
+    "examples/artemis/cliwaiter_reliable.rb",
     "examples/client11_ex1.rb",
     "examples/client11_putget1.rb",
     "examples/conn11_ex1.rb",
@@ -96,6 +99,7 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb",
     "stomp.gemspec",
     "test/.gitignore",
+    "test/MultiBrokerUnitTestExample.sh",
     "test/funcs.sh",
     "test/test_anonymous.rb",
     "test/test_client.rb",
@@ -109,21 +113,21 @@ Gem::Specification.new do |s|
     "test/tlogger.rb",
     "test/unitst.sh"
   ]
-  s.homepage = "https://github.com/stompgem/stomp"
-  s.licenses = ["Apache-2.0"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Ruby client for the Stomp messaging protocol"
+  s.homepage = "https://github.com/stompgem/stomp".freeze
+  s.licenses = ["Apache-2.0".freeze]
+  s.rubygems_version = "2.6.11".freeze
+  s.summary = "Ruby client for the Stomp messaging protocol".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.14.1", "~> 2.14"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 2.14.1", "~> 2.14"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.14.1", "~> 2.14"])
+      s.add_dependency(%q<rspec>.freeze, [">= 2.14.1", "~> 2.14"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.14.1", "~> 2.14"])
+    s.add_dependency(%q<rspec>.freeze, [">= 2.14.1", "~> 2.14"])
   end
 end
 

data/test/MultiBrokerUnitTestExample.sh

@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+set -x
+#
+# An example of running unit tests against multiple message brokers.
+#
+pref="STOMP_PORT=61613 rake test --trace"
+echo =============== AMQ Stomp 1.0 ===============
+eval $pref
+
+pref="STOMP_PORT=61613 STOMP_TEST11p=1.1 STOMP_AMQ11=y STOMP_NOWILD=y rake test --trace"
+echo =============== AMQ Stomp 1.1 ===============
+eval $pref
+
+pref="STOMP_PORT=61613 STOMP_TEST11p=1.2 STOMP_AMQ11=y STOMP_NOWILD=y rake test --trace"
+echo =============== AMQ Stomp 1.2 ===============
+eval $pref
+
+pref="STOMP_TESTSSL=y STOMP_PORT=62613 STOMP_SSLPORT=62614 STOMP_DOTQUEUE=y STOMP_NOWILD=y rake test --trace"
+echo =============== Apollo Stomp 1.0 ===============
+eval $pref
+
+pref="STOMP_TESTSSL=y STOMP_PORT=62613 STOMP_SSLPORT=62614 STOMP_DOTQUEUE=y STOMP_TEST11p=1.1 STOMP_NOWILD=y STOMP_APOLLO=y rake test --trace"
+echo =============== Apollo Stomp 1.1 ===============
+eval $pref
+
+pref="STOMP_TESTSSL=y STOMP_PORT=62613 STOMP_SSLPORT=62614 STOMP_DOTQUEUE=y STOMP_TEST11p=1.2 STOMP_NOWILD=y STOMP_APOLLO=y rake test --trace"
+echo =============== Apollo Stomp 1.2 ===============
+eval $pref
+
+pref="STOMP_TESTSSL=y STOMP_PORT=62613 STOMP_SSLPORT=62614 STOMP_DOTQUEUE=y STOMP_TEST11p=1.2 STOMP_NOWILD=y STOMP_CRLF=y STOMP_APOLLO=y rake test --trace"
+echo =============== Apollo Stomp 1.2 - CRLF=y ===============
+eval $pref
+
+pref="STOMP_TESTSSL=y STOMP_PORT=62613 STOMP_SSLPORT=62614 STOMP_DOTQUEUE=y STOMP_TEST11p=1.2 STOMP_NOWILD=y STOMP_CONN=y STOMP_APOLLO=y rake test --trace"
+echo =============== Apollo Stomp 1.2 - CONN=y ===============
+eval $pref
+
+pref="STOMP_RABBIT=y STOMP_PORT=41613 STOMP_DOTQUEUE=y STOMP_NOWILD=y rake test --trace"
+echo =============== RabbitMQ Stomp 1.0 ===============
+eval $pref
+
+pref="STOMP_RABBIT=y STOMP_PORT=41613 STOMP_DOTQUEUE=y STOMP_NOWILD=y STOMP_TEST11p=1.1 rake test --trace"
+echo =============== RabbitMQ Stomp 1.1 ===============
+eval $pref
+
+pref="STOMP_RABBIT=y STOMP_PORT=41613 STOMP_DOTQUEUE=y STOMP_NOWILD=y STOMP_TEST11p=1.2 rake test --trace"
+echo =============== RabbitMQ Stomp 1.2 ===============
+eval $pref
+
+pref="STOMP_ARTEMIS=y STOMP_PORT=31613 STOMP_NOWILD=y rake test --trace"
+echo =============== Artemis Stomp 1.0 ===============
+eval $pref
+
+pref="STOMP_ARTEMIS=y STOMP_PORT=31613 STOMP_NOWILD=y STOMP_TEST11p=1.1 rake test --trace"
+echo =============== Artemis Stomp 1.1 ===============
+eval $pref
+
+pref="STOMP_ARTEMIS=y STOMP_PORT=31613 STOMP_NOWILD=y STOMP_TEST11p=1.2 rake test --trace"
+echo =============== Artemis Stomp 1.2 ===============
+eval $pref
+
+set +x
+exit 0
+

data/test/test_anonymous.rb

@@ -33,7 +33,9 @@ class TestAnonymous < 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 TestAnonymous < 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 TestAnonymous < 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 TestAnonymous < 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 TestAnonymous < 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 TestAnonymous < 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 TestAnonymous < 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 TestAnonymous < Test::Unit::TestCase
   def test_nil_connparms
     @conn.disconnect
     #
-    assert_nothing_raised do
-      @conn = Stomp::Connection.open(nil, nil, host, port, false, 5, nil)
-    end
+    @conn = Stomp::Connection.open(nil, nil, host, port, false, 5, nil)
     checkEmsg(@conn)
   end
 
@@ -454,17 +444,13 @@ class TestAnonymous < 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 TestAnonymous < 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 TestAnonymous < 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 TestAnonymous < 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
 

data/test/test_client.rb

@@ -14,7 +14,7 @@ end
 =end
 class TestClient < Test::Unit::TestCase
   include TestBase
-  
+
   def setup
     @client = get_client()
     # Multi_thread test data
@@ -102,11 +102,9 @@ class TestClient < Test::Unit::TestCase
   # Test requesting a receipt on disconnect.
   def test_disconnect_receipt
     @client.close :receipt => "xyz789"
-    assert_nothing_raised {
-      assert_not_nil(@client.disconnect_receipt, "should have a receipt")
-      assert_equal(@client.disconnect_receipt.headers['receipt-id'],
-        "xyz789", "receipt sent and received should match")
-    }
+    assert_not_nil(@client.disconnect_receipt, "should have a receipt")
+    assert_equal(@client.disconnect_receipt.headers['receipt-id'],
+      "xyz789", "receipt sent and received should match")
   end
 
   # Test publish and immediate subscribe.
@@ -122,7 +120,7 @@ class TestClient < Test::Unit::TestCase
 
   # Test that Client subscribe requires a block.
   def test_subscribe_requires_block
-    assert_raise(RuntimeError) do
+    assert_raise(Stomp::Error::NoListenerGiven) do
       @client.subscribe make_destination
     end
     checkEmsg(@client)
@@ -179,21 +177,19 @@ class TestClient < Test::Unit::TestCase
     end
     sleep 0.01 until message
     assert_equal data, message.body
-    assert_nothing_raised {
-      case @client.protocol()
-        when Stomp::SPL_10
-          @client.acknowledge message, :transaction => 'tx1'
-          checkEmsg(@client)
-        when Stomp::SPL_11
-          @client.acknowledge message, :transaction => 'tx1', :subscription => message.headers['subscription']
-          checkEmsg(@client)
-        else # 1.2+
-          @client.acknowledge message, :transaction => 'tx1', :id => message.headers['ack']
-          checkEmsg(@client)
-      end
-      message = nil # reset
-      @client.abort 'tx1' # now abort
-    }
+    case @client.protocol()
+      when Stomp::SPL_10
+        @client.acknowledge message, :transaction => 'tx1'
+        checkEmsg(@client)
+      when Stomp::SPL_11
+        @client.acknowledge message, :transaction => 'tx1', :subscription => message.headers['subscription']
+        checkEmsg(@client)
+      else # 1.2+
+        @client.acknowledge message, :transaction => 'tx1', :id => message.headers['ack']
+        checkEmsg(@client)
+    end
+    message = nil # reset
+    @client.abort 'tx1' # now abort
     checkEmsg(@client)
     # lets recreate the connection
     @client.close
@@ -201,34 +197,30 @@ class TestClient < Test::Unit::TestCase
     sid = nil
     message2 = nil
     @client.begin 'tx2'
-    assert_nothing_raised {
-      if @client.protocol() == Stomp::SPL_10
-        @client.subscribe(q, :ack => 'client') {|m| message2 = m}
-      else # 1.1 and 1.2 are the same for this
-        sid = @client.uuid()
-        @client.subscribe(q, :ack => 'client', :id => sid) {|m| message2 = m}
-      end
-    }
+    if @client.protocol() == Stomp::SPL_10
+      @client.subscribe(q, :ack => 'client') {|m| message2 = m}
+    else # 1.1 and 1.2 are the same for this
+      sid = @client.uuid()
+      @client.subscribe(q, :ack => 'client', :id => sid) {|m| message2 = m}
+    end
     sleep 0.01 until message2
     assert_not_nil message
     assert_equal data, message2.body
-    assert_nothing_raised {
-      case @client.protocol()
-        when Stomp::SPL_10
-          @client.acknowledge message2, :transaction => 'tx2'
-          checkEmsg(@client)
-        when Stomp::SPL_11
-          @client.acknowledge message2, :transaction => 'tx2', :subscription => message2.headers['subscription']
-          checkEmsg(@client)
-        else # 1.2+
-          @client.acknowledge message2, :transaction => 'tx2', :id => message2.headers['ack']
-          checkEmsg(@client)
-      end
-      @client.commit 'tx2'
-    }
+    case @client.protocol()
+      when Stomp::SPL_10
+        @client.acknowledge message2, :transaction => 'tx2'
+        checkEmsg(@client)
+      when Stomp::SPL_11
+        @client.acknowledge message2, :transaction => 'tx2', :subscription => message2.headers['subscription']
+        checkEmsg(@client)
+      else # 1.2+
+        @client.acknowledge message2, :transaction => 'tx2', :id => message2.headers['ack']
+        checkEmsg(@client)
+    end
+    @client.commit 'tx2'
     checkEmsg(@client)
     @client.close
-  end
+  end unless ENV['STOMP_ARTEMIS'] # See Artemis docs for 1.3, page 222
 
   # Test transaction publish and abort, receive with new client.
   # New client uses ack => auto.
@@ -250,21 +242,19 @@ class TestClient < Test::Unit::TestCase
     end
     sleep 0.01 until message
     assert_equal data, message.body
-    assert_nothing_raised {
-      case @client.protocol()
-        when Stomp::SPL_10
-          @client.acknowledge message, :transaction => 'tx1'
-          checkEmsg(@client)
-        when Stomp::SPL_11
-          @client.acknowledge message, :transaction => 'tx1', :subscription => message.headers['subscription']
-          checkEmsg(@client)
-        else # 1.2+
-          @client.acknowledge message, :transaction => 'tx1', :id => message.headers['ack']
-          checkEmsg(@client)
-      end
-      message = nil # reset
-      @client.abort 'tx1' # now abort
-    }
+    case @client.protocol()
+      when Stomp::SPL_10
+        @client.acknowledge message, :transaction => 'tx1'
+        checkEmsg(@client)
+      when Stomp::SPL_11
+        @client.acknowledge message, :transaction => 'tx1', :subscription => message.headers['subscription']
+        checkEmsg(@client)
+      else # 1.2+
+        @client.acknowledge message, :transaction => 'tx1', :id => message.headers['ack']
+        checkEmsg(@client)
+    end
+    message = nil # reset
+    @client.abort 'tx1' # now abort
     checkEmsg(@client)
     # lets recreate the connection
     @client.close
@@ -273,27 +263,25 @@ class TestClient < Test::Unit::TestCase
     sid = nil
     message2 = nil
     @client.begin 'tx2'
-    assert_nothing_raised {
-      if @client.protocol() == Stomp::SPL_10
-        @client.subscribe(q, :ack => 'auto') {|m| message2 = m}
-      else # 1.1 and 1.2 are the same for this
-        sid = @client.uuid()
-        @client.subscribe(q, :ack => 'auto', :id => sid) {|m| message2 = m}
-      end
-    }
+    if @client.protocol() == Stomp::SPL_10
+      @client.subscribe(q, :ack => 'auto') {|m| message2 = m}
+    else # 1.1 and 1.2 are the same for this
+      sid = @client.uuid()
+      @client.subscribe(q, :ack => 'auto', :id => sid) {|m| message2 = m}
+    end
     sleep 0.01 until message2
     assert_not_nil message2
     assert_equal data, message2.body
     @client.commit 'tx2'
     checkEmsg(@client)
     @client.close
-  end
+  end unless ENV['STOMP_ARTEMIS'] # See Artemis docs for 1.3, page 222
 
   # Test that subscription destinations must be unique for a Client.
   def test_raise_on_multiple_subscriptions_to_same_make_destination
     subscribe_dest = make_destination
     @client.subscribe(subscribe_dest) {|m| nil }
-    assert_raise(RuntimeError) do
+    assert_raise(Stomp::Error::DuplicateSubscription) do
       @client.subscribe(subscribe_dest) {|m| nil }
     end
     checkEmsg(@client)
@@ -303,7 +291,7 @@ class TestClient < Test::Unit::TestCase
   def test_raise_on_multiple_subscriptions_to_same_id
     subscribe_dest = make_destination
     @client.subscribe(subscribe_dest, {'id' => 'myid'}) {|m| nil }
-    assert_raise(RuntimeError) do
+    assert_raise(Stomp::Error::DuplicateSubscription) do
       @client.subscribe(subscribe_dest, {'id' => 'myid'}) {|m| nil }
     end
     checkEmsg(@client)
@@ -313,7 +301,7 @@ class TestClient < Test::Unit::TestCase
   def test_raise_on_multiple_subscriptions_to_same_id_mixed
     subscribe_dest = make_destination
     @client.subscribe(subscribe_dest, {'id' => 'myid'}) {|m| nil }
-    assert_raise(RuntimeError) do
+    assert_raise(Stomp::Error::DuplicateSubscription) do
       @client.subscribe(subscribe_dest, {:id => 'myid'}) {|m| nil }
     end
     checkEmsg(@client)
@@ -341,7 +329,7 @@ class TestClient < Test::Unit::TestCase
       assert_equal send_message, message.body
     end
     results = [queue1, queue2].collect do |queue|
-      messages.any? do |message| 
+      messages.any? do |message|
         message_source = message.headers['destination']
         message_source == queue
       end
@@ -376,7 +364,7 @@ class TestClient < Test::Unit::TestCase
     end
     # make sure that the messages received came from the expected queues
     results = [queue1, queue2, queue3].collect do |queue|
-      messages.any? do |message| 
+      messages.any? do |message|
         message_source = message.headers['destination']
         message_source == queue
       end
@@ -421,21 +409,19 @@ class TestClient < Test::Unit::TestCase
     sleep 0.1 while message.nil?
     assert_not_nil message
     assert_equal data, message.body
-    assert_nothing_raised {
-      @client.begin 'tx2'
-      case @client.protocol()
-        when Stomp::SPL_10
-          @client.acknowledge message, :transaction => 'tx2'
-          checkEmsg(@client)
-        when Stomp::SPL_11
-          @client.acknowledge message, :transaction => 'tx2', :subscription => message.headers['subscription']
-          checkEmsg(@client)
-        else # 1.2+
-          @client.acknowledge message, :transaction => 'tx2', :id => message.headers['ack']
-          checkEmsg(@client)
-      end
-      @client.commit 'tx2'
-    }
+    @client.begin 'tx2'
+    case @client.protocol()
+      when Stomp::SPL_10
+        @client.acknowledge message, :transaction => 'tx2'
+        checkEmsg(@client)
+      when Stomp::SPL_11
+        @client.acknowledge message, :transaction => 'tx2', :subscription => message.headers['subscription']
+        checkEmsg(@client)
+      else # 1.2+
+        @client.acknowledge message, :transaction => 'tx2', :id => message.headers['ack']
+        checkEmsg(@client)
+    end
+    @client.commit 'tx2'
     checkEmsg(@client)
     @client.close
     @client = nil
@@ -496,16 +482,14 @@ class TestClient < Test::Unit::TestCase
     msg = nil
     dest = make_destination
     Thread.new(@client) do |acli|
-      assert_nothing_raised {
-        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
-      }
+      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
     end
     #
     @client.publish(dest, message_text)
@@ -523,28 +507,26 @@ class TestClient < Test::Unit::TestCase
     1.upto(@max_threads) do |tnum|
       # Threads within threads .....
       Thread.new(@client) do |acli|
-        assert_nothing_raised {
-          # this is ugly .....
-          if acli.protocol() == Stomp::SPL_10
-            acli.subscribe(dest) { |m| 
-              _ = m
-              lock.synchronize do
-                msg_ctr += 1
-              end
-              # Simulate message processing
-              sleep 0.05
-            }
-          else
-            acli.subscribe(dest, :id => acli.uuid()) { |m| 
-              _ = m
-              lock.synchronize do
-                msg_ctr += 1
-              end
-              # Simulate message processing
-              sleep 0.05
-            }
-          end
-        }
+        # this is ugly .....
+        if acli.protocol() == Stomp::SPL_10
+          acli.subscribe(dest) { |m|
+            _ = m
+            lock.synchronize do
+              msg_ctr += 1
+            end
+            # Simulate message processing
+            sleep 0.05
+          }
+        else
+          acli.subscribe(dest, :id => acli.uuid()) { |m|
+            _ = m
+            lock.synchronize do
+              msg_ctr += 1
+            end
+            # Simulate message processing
+            sleep 0.05
+          }
+        end
       end
     end
     #
@@ -620,17 +602,18 @@ class TestClient < Test::Unit::TestCase
   # test max redeliveries is not broken (6c2c1c1)
   def test_max_redeliveries
     @client.close
-    rdmsg = "To Be Redelivered"
-    dest = make_destination
-    [1, 2, 3].each do |max_re|
+    2.upto(2) do |max_re|
+      rdmsg = "To Be Redelivered: #{max_re.to_s}"
+      dest = make_destination + ".#{max_re.to_s}"
       @client = get_client()
-      sid = @client.uuid()
+      sid = "sid_max_redeliveries_#{max_re.to_s}"
       received = nil
       rm_actual = 0
       sh = @client.protocol() == Stomp::SPL_10 ?  {} : {:id => sid}
       @client.subscribe(dest, sh) {|msg|
         rm_actual += 1
-        @client.unreceive(msg, :max_redeliveries => max_re)
+        @client.unreceive(msg, :max_redeliveries => max_re,
+			:dead_letter_queue => make_dlq())
         received = msg if rm_actual - 1 == max_re
       }
       @client.publish(dest, rdmsg)
@@ -641,7 +624,8 @@ class TestClient < Test::Unit::TestCase
       assert_equal max_re, rm_actual - 1
       @client.close
     end
-  end
+  end unless ENV['STOMP_ARTEMIS'] # need to investigate this, but skip
+  # Artemis for now
 
   # test issue99, OK values
   def test_cli_iss99_ok
@@ -650,10 +634,8 @@ class TestClient < Test::Unit::TestCase
     #
     ok_vals = dflt_data_ok()
     ok_vals.each do |hsv|
-      assert_nothing_raised {
-        cli = Stomp::Client.open(hsv)
-        cli.close
-      }
+      cli = Stomp::Client.open(hsv)
+      cli.close
     end
   end
 
@@ -670,6 +652,24 @@ class TestClient < Test::Unit::TestCase
     end
   end
 
+  def test_cli_nodest_sub
+    assert_raise Stomp::Error::DestinationRequired do
+      @client.subscribe(nil) {|msg| puts msg}
+    end
+  end
+
+  def test_cli_nodest_unsub
+    assert_raise Stomp::Error::DestinationRequired do
+      @client.unsubscribe(nil)
+    end
+  end
+
+  def test_cli_nodest_pub
+    assert_raise Stomp::Error::DestinationRequired do
+      @client.publish(nil, "msg")
+    end
+  end
+
   private
     def message_text
       name = caller_method_name unless name