stomp 1.4.5 → 1.4.10

data/test/test_connection1p.rb

@@ -17,6 +17,7 @@ class TestConnection1P < Test::Unit::TestCase
   
   def setup
     @conn = get_connection()
+    @tc1dbg = ENV['TC1DBG'] || ENV['TDBGALL']  ? true : false
   end
 
   def teardown
@@ -25,11 +26,17 @@ class TestConnection1P < Test::Unit::TestCase
 
   # Test basic connection open.
   def test_conn_1p_0000
+    mn = "test_conn_1p_0000" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
     assert @conn.open?
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test missing connect headers - part 1.
   def test_conn_1p_0010
+    mn = "test_conn_1p_0010" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = {:host => "localhost"}
@@ -40,11 +47,15 @@ class TestConnection1P < Test::Unit::TestCase
     chb = {"accept-version" => "1.0"}
     assert_raise Stomp::Error::ProtocolErrorConnect do
       _ = Stomp::Connection.open(user, passcode, host, port, false, 5, chb)
-    end    
+    end
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test missing connect headers - part 2.
   def test_conn_1p_0015
+    mn = "test_conn_1p_0015" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = {:host => "localhost"}
@@ -68,10 +79,14 @@ class TestConnection1P < Test::Unit::TestCase
     assert_raise Stomp::Error::ProtocolErrorConnect do
       _ = Stomp::Connection.open(hash)
     end
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test requesting only a 1.0 connection.
   def test_conn_1p_0020
+    mn = "test_conn_1p_0020" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = {:host => "localhost", "accept-version" => "1.0"}
@@ -80,10 +95,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
     conn.disconnect
     assert_equal conn.protocol, Stomp::SPL_10
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test requesting only a 1.1+ connection.
   def test_conn_1p_0030
+    mn = "test_conn_1p_0030" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()
@@ -91,10 +110,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
     conn.disconnect
     assert conn.protocol >= Stomp::SPL_11
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test basic request for no heartbeats.
   def test_conn_1p_0040
+    mn = "test_conn_1p_0040" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -103,10 +126,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
     conn.disconnect
     assert conn.protocol >= Stomp::SPL_11
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test malformed heartbeat header.
   def test_conn_1p_0050
+    mn = "test_conn_1p_0050" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -114,10 +141,14 @@ class TestConnection1P < Test::Unit::TestCase
     assert_raise Stomp::Error::InvalidHeartBeatHeaderError do
       _ = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
     end
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test malformed heartbeat header.
   def test_conn_11h_0060
+    mn = "test_conn_1p_0060" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()
@@ -125,10 +156,14 @@ class TestConnection1P < Test::Unit::TestCase
     assert_raise Stomp::Error::InvalidHeartBeatHeaderError do
       _ = Stomp::Connection.open(user, passcode, host, port, false, 5, cha)
     end
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test a valid heartbeat header.
   def test_conn_1p_0070
+    mn = "test_conn_1p_0070" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -138,10 +173,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn.disconnect
     assert conn.hbsend_interval > 0
     assert conn.hbrecv_interval > 0
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test only sending heartbeats.
   def test_conn_1p_0080
+    mn = "test_conn_1p_0080" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -154,10 +193,15 @@ class TestConnection1P < Test::Unit::TestCase
     conn.set_logger(nil)
     conn.disconnect
     hb_asserts_send(conn)
+    p [ "99", mn, "ends" ] if @tc1dbg
   end if ENV['STOMP_HB11LONG']
 
   # Test only receiving heartbeats.
+  # This is a no-no with Artemis, you must send, see docs
   def test_conn_1p_0090
+    mn = "test_conn_1p_0090" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -171,10 +215,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn.set_logger(nil)
     conn.disconnect
     hb_asserts_recv(conn)
-  end if ENV['STOMP_HB11LONG']
+    p [ "99", mn, "ends" ] if @tc1dbg
+  end if ENV['STOMP_HB11LONG'] && !ENV['STOMP_ARTEMIS']
 
   # Test sending and receiving heartbeats.
   def test_conn_1p_0100
+    mn = "test_conn_1p_0100" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -188,10 +236,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn.set_logger(nil)
     conn.disconnect
     hb_asserts_both(conn)
+    p [ "99", mn, "ends" ] if @tc1dbg
   end if ENV['STOMP_HB11LONG']
 
   # Test valid UTF8 data.
   def test_conn_1p_0110
+    mn = "test_conn_1p_0110" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -219,10 +271,14 @@ class TestConnection1P < Test::Unit::TestCase
       assert conn.valid_utf8?(string), "good unicode specs 01: #{string}"
     end
     conn.disconnect
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test invalid UTF8 data.
   def test_conn_1p_0120
+    mn = "test_conn_1p_0120" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -253,11 +309,15 @@ class TestConnection1P < Test::Unit::TestCase
       assert !conn.valid_utf8?(string), "bad unicode specs 01: #{string}"
     end
     conn.disconnect
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Repeated headers test. Brokers have a lot of freedom given the verbiage
   # in the specs.
   def test_conn_1p_0124
+    mn = "test_conn_1p_0124" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     dest = make_destination
     msg = "payload: #{Time.now.to_f}"
     shdrs = { "key1" => "val1", "key2" => "val2",
@@ -276,18 +336,26 @@ class TestConnection1P < Test::Unit::TestCase
     end
     #
     @conn.unsubscribe dest, :id => sid
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test frozen headers.
   def test_conn_1p_0127
+    mn = "test_conn_1p_0127" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     dest = make_destination
     sid = @conn.uuid()
     sid.freeze
     @conn.subscribe dest, :id => sid
+    p [ "99", mn, "ends" ] if @tc1dbg
   end
 
   # Test heartbeats with send and receive.
   def test_conn_1p_0130
+    mn = "test_conn_1p_0130" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -301,10 +369,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn.set_logger(nil)
     conn.disconnect
     hb_asserts_both(conn)
+    p [ "99", mn, "ends" ] if @tc1dbg
   end if ENV['STOMP_HB11LONG']
 
   # Test heartbeats with send and receive.
   def test_conn_1p_0135
+    mn = "test_conn_1p_0135" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -318,10 +390,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn.set_logger(nil)
     conn.disconnect
     hb_asserts_both(conn)
+    p [ "99", mn, "ends" ] if @tc1dbg
   end if ENV['STOMP_HB11LONG']
 
   # Test heartbeats with send and receive.
   def test_conn_1p_0140
+    mn = "test_conn_1p_0140" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -335,10 +411,14 @@ class TestConnection1P < Test::Unit::TestCase
     conn.set_logger(nil)
     conn.disconnect
     hb_asserts_both(conn)
+    p [ "99", mn, "ends" ] if @tc1dbg
   end if ENV['STOMP_HB11LONG']
 
   # Test very basic encoding / decoding of headers
   def test_conn_1p_0200
+    mn = "test_conn_1p_0200" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     @conn.disconnect
     #
     cha = get_conn_headers()    
@@ -363,11 +443,15 @@ class TestConnection1P < Test::Unit::TestCase
       assert received.headers[k] == v, "Mismatch: #{k},#{v}"
     }
     conn.disconnect
+    p [ "99", mn, "ends" ] if @tc1dbg
   end unless ENV['STOMP_RABBIT']
 
   # Test that 1.1+ connections do not break suppress_content_length
   # (Issue #52)
   def test_conn_1p_0210
+    mn = "test_conn_1p_0210" if @tc1dbg
+    p [ "01", mn, "starts" ] if @tc1dbg
+
     msg = "payload: #{Time.now.to_f}"
     dest = make_destination
     shdrs = { :suppress_content_length => true }
@@ -379,6 +463,7 @@ class TestConnection1P < Test::Unit::TestCase
     received = @conn.receive
     assert_equal msg, received.body
     assert_nil received.headers["content-length"], "No content length expected."
+    p [ "99", mn, "ends" ] if @tc1dbg
   end if ENV['STOMP_AMQ11']
 
 private

data/test/test_helper.rb

@@ -47,7 +47,7 @@ module TestBase
 
   # Get SSL port
   def ssl_port
-    (ENV['STOMP_SSLPORT'] || 61612).to_i
+    (ENV['STOMP_SSLPORT'] || 61611).to_i
   end
 
   # Helper for minitest on 1.9

data/test/test_message.rb

@@ -37,7 +37,8 @@ class TestMessage < Test::Unit::TestCase
 			"bad byte: \372",
 			"\004\b{\f:\tbody\"\001\207\004\b{\b:\016statusmsg\"\aOK:\017statuscodei\000:\tdata{\t:\voutput\"3Enabled, not running, last run 693 seconds ago:\frunningi\000:\fenabledi\006:\flastrunl+\aE\021\022M:\rsenderid\"\032xx.xx.xx.xx:\016requestid\"%849d647bbe3e421ea19ac9f947bbdde4:\020senderagent\"\fpuppetd:\016msgtarget\"%/topic/mcollective.puppetd.reply:\thash\"\001\257ZdQqtaDmmdD0jZinnEcpN+YbkxQDn8uuCnwsQdvGHau6d+gxnnfPLUddWRSb\nZNMs+sQUXgJNfcV1eVBn1H+Z8QQmzYXVDMqz7J43jmgloz5PsLVbN9K3PmX/\ngszqV/WpvIyAqm98ennWqSzpwMuiCC4q2Jr3s3Gm6bUJ6UkKXnY=\n:\fmsgtimel+\a\372\023\022M"
 		]
-		#
+    #
+    @tmsdbg = ENV['TMSDBG'] || ENV['TDBGALL']  ? true : false
   end
 
   def teardown
@@ -46,6 +47,8 @@ class TestMessage < Test::Unit::TestCase
 
 	# Various message bodies, including the failing test case reported
   def test_0010_kcode
+    mn = "test_0010_kcode" if @tmsdbg
+    p [ "01", mn, "starts" ] if @tmsdbg
 		#
 		dest = make_destination
     if @conn.protocol == Stomp::SPL_10
@@ -60,10 +63,14 @@ class TestMessage < Test::Unit::TestCase
 			assert_instance_of Stomp::Message , msg, "type check for #{abody}"
 			assert_equal abody, msg.body, "equal check for #{abody}"
 		end
+    p [ "99", mn, "ends" ] if @tmsdbg
   end
 
 	# All possible byte values
   def test_0020_kcode
+    mn = "test_0020_kcode" if @tmsdbg
+    p [ "01", mn, "starts" ] if @tmsdbg
+
 		#
 		abody = ""
 		"\000".upto("\377") {|abyte| abody << abyte } 
@@ -78,11 +85,15 @@ class TestMessage < Test::Unit::TestCase
 	  @conn.publish dest, abody
 		msg = @conn.receive
 		assert_instance_of Stomp::Message , msg, "type check for #{abody}"
-		assert_equal abody, msg.body, "equal check for #{abody}"
+    assert_equal abody, msg.body, "equal check for #{abody}"
+    p [ "99", mn, "ends" ] if @tmsdbg
   end
 
 	# A single byte at a time
   def test_0030_kcode
+    mn = "test_0030_kcode" if @tmsdbg
+    p [ "01", mn, "starts" ] if @tmsdbg
+
 		#
 		dest = make_destination
     if @conn.protocol == Stomp::SPL_10
@@ -97,11 +108,15 @@ class TestMessage < Test::Unit::TestCase
 			msg = @conn.receive
 			assert_instance_of Stomp::Message , msg, "type check for #{abody}"
 			assert_equal abody, msg.body, "equal check for #{abody}"
-		end
+    end
+    p [ "99", mn, "ends" ] if @tmsdbg
   end
 
 	# Test various valid and invalid frames.
-	def test_0040_msg_create
+  def test_0040_msg_create
+    mn = "test_0040_msg_create" if @tmsdbg
+    p [ "01", mn, "starts" ] if @tmsdbg
+    
 		#
 		assert_raise(Stomp::Error::InvalidFormat) {
 			_ = Stomp::Message.new("junk", false)
@@ -130,10 +145,14 @@ class TestMessage < Test::Unit::TestCase
     _ = Stomp::Message.new("RECEIPT\nh1:val1\n\njunk\0\n", false)
     _ = Stomp::Message.new("ERROR\nh1:val1\n\njunk\0\n", false)
 
-	end
+    p [ "99", mn, "ends" ] if @tmsdbg
+  end
 
 	# Test multiple headers with the same key
   def test_0050_mh_msg_create
+    mn = "test_0050_mh_msg_create" if @tmsdbg
+    p [ "01", mn, "starts" ] if @tmsdbg
+
     aframe = bframe = nil
     amsg = "MESSAGE\n" +
       "h1:val1\n" + 
@@ -155,10 +174,14 @@ class TestMessage < Test::Unit::TestCase
     assert_equal "val3", bframe.headers["h2"][0], "Expected val3"
     assert_equal "val2", bframe.headers["h2"][1], "Expected val2"
     assert_equal "val1", bframe.headers["h2"][2], "Expected val1"
+    p [ "99", mn, "ends" ] if @tmsdbg
   end
 
 	# Test headers with empty key / value
   def test_0060_hdr_ekv
+    mn = "test_0060_hdr_ekv" if @tmsdbg
+    p [ "01", mn, "starts" ] if @tmsdbg
+
     #
     amsg = "MESSAGE\n" +
       "h1:val1\n" +
@@ -185,6 +208,7 @@ class TestMessage < Test::Unit::TestCase
       _ = Stomp::Message.new(amsg, false)
     end
     _ = Stomp::Message.new(amsg, true)
+    p [ "99", mn, "ends" ] if @tmsdbg
   end
 
 end

data/test/test_ssl.rb

@@ -17,6 +17,7 @@ class TestSSL < Test::Unit::TestCase
   
   def setup
     @conn = get_ssl_connection()
+    @tssdbg = ENV['TSSDBG'] || ENV['TDBGALL']  ? true : false 
   end
 
   def teardown
@@ -24,38 +25,90 @@ class TestSSL < Test::Unit::TestCase
   end
   #
   def test_ssl_0000
+    mn = "test_ssl_0000" if @tssdbg
+    p [ "01", mn, "starts" ] if @tssdbg
     assert @conn.open?
+    p [ "99", mn, "ends" ] if @tssdbg
   end
 
   # Test SSLParams basic.
   def test_ssl_0010_parms
+    mn = "test_ssl_0010_parms" if @tssdbg
+    p [ "01", mn, "starts" ] if @tssdbg
+
     ssl_params = Stomp::SSLParams.new
     assert ssl_params.ts_files.nil?
     assert ssl_params.cert_file.nil?
     assert ssl_params.key_file.nil?
     assert ssl_params.fsck.nil?
+    p [ "99", mn, "ends" ] if @tssdbg
   end
 
   # Test using correct parameters.
   def test_ssl_0020_noraise
+    mn = "test_ssl_0020_noraise" if @tssdbg
+    p [ "01", mn, "starts" ] if @tssdbg
+
     _ = Stomp::SSLParams.new(:cert_file => "dummy1", :key_file => "dummy2")
+    _ = Stomp::SSLParams.new(:cert_file => "dummy1", :key_text => "dummy3")
+    _ = Stomp::SSLParams.new(:cert_text => "dummy1", :key_file => "dummy2")
+    _ = Stomp::SSLParams.new(:cert_text => "dummy4", :key_text => "dummy3")
     _ = Stomp::SSLParams.new(:ts_files => "dummyts1")
     _ = Stomp::SSLParams.new(:ts_files => "dummyts1", 
       :cert_file => "dummy1", :key_file => "dummy2")
+    p [ "99", mn, "ends" ] if @tssdbg
   end
 
   # Test using incorrect / incomplete parameters.
   def test_ssl_0030_raise
+    mn = "test_ssl_0030_raise" if @tssdbg
+    p [ "01", mn, "starts" ] if @tssdbg
+
+    key_text = '-----BEGIN PRIVATE KEY-----
+    fake_key
+    -----END PRIVATE KEY-----'
+    cert_text = '------BEGIN CERTIFICATE-----
+    fake_cert
+    ------END CERTIFICATE-----'
+
     assert_raise(Stomp::Error::SSLClientParamsError) {
       _ = Stomp::SSLParams.new(:cert_file => "dummy1")
     }
+    assert_raise(Stomp::Error::SSLClientParamsError) {
+      _ = Stomp::SSLParams.new(:cert_text => cert_text)
+    }
     assert_raise(Stomp::Error::SSLClientParamsError) {
       _ = Stomp::SSLParams.new(:key_file => "dummy2")
     }
+    assert_raise(Stomp::Error::SSLClientParamsError) {
+      _ = Stomp::SSLParams.new(:key_text => key_text)
+    }
+    assert_raise(Stomp::Error::SSLClientParamsError) {
+      _ = Stomp::SSLParams.new(:cert_text => cert_text, :cert_file => "dummy1")
+    }
+    assert_raise(Stomp::Error::SSLClientParamsError) {
+      _ = Stomp::SSLParams.new(:key_text => key_text, :cert_text => cert_text, :cert_file => "dummy1")
+    }
+    assert_raise(Stomp::Error::SSLClientParamsError) {
+      _ = Stomp::SSLParams.new(:key_file => "dummy2", :cert_text => cert_text, :cert_file => "dummy1")
+    }
+    assert_raise(Stomp::Error::SSLClientParamsError) {
+      _ = Stomp::SSLParams.new(:key_text => key_text, :key_file => "dummy2")
+    }
+    assert_raise(Stomp::Error::SSLClientParamsError) {
+      _ = Stomp::SSLParams.new(:cert_file => "dummy1", :key_text => key_text, :key_file => "dummy2")
+    }
+    assert_raise(Stomp::Error::SSLClientParamsError) {
+      _ = Stomp::SSLParams.new(:cert_text => cert_text, :key_text => key_text, :key_file => "dummy2")
+    }
+    p [ "99", mn, "ends" ] if @tssdbg
   end
 
   # Test that :fsck works.
   def test_ssl_0040_fsck
+    mn = "test_ssl_0040_fsck" if @tssdbg
+    p [ "01", mn, "starts" ] if @tssdbg
+
     assert_raise(Stomp::Error::SSLNoCertFileError) {
       _ = Stomp::SSLParams.new(:cert_file => "dummy1", 
         :key_file => "dummy2", :fsck => true)
@@ -68,6 +121,7 @@ class TestSSL < Test::Unit::TestCase
       _ = Stomp::SSLParams.new(:ts_files => "/tmp/not-likely-here.txt", 
         :fsck => true)
     }
+    p [ "99", mn, "ends" ] if @tssdbg
   end
 
   #