test/stream/server/ready_test.rb in vines-0.1.0 vs test/stream/server/ready_test.rb in vines-0.1.1

@@ -1,12 +1,11 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class ServerReadyTest < Test::Unit::TestCase
+class ServerReadyTest < MiniTest::Unit::TestCase
   STANZAS = []
 
   def setup
     @stream = MiniTest::Mock.new
     @state = Vines::Stream::Server::Ready.new(@stream, nil)
@@ -32,63 +31,63 @@
   def test_good_node_processes
     @stream.expect(:remote_domain, 'wonderland.lit')
     @stream.expect(:domain, 'verona.lit')
     @stream.expect(:user=, nil, [Vines::User.new(:jid => '[e-mail]')])
     node = node(%Q{<message from="[e-mail]" to="[e-mail]"/>})
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert_equal 1, STANZAS.size
     assert STANZAS.map {|s| s.verify }.all?
     assert @stream.verify
   end
 
   def test_unsupported_stanza_type
     node = node('<bogus/>')
-    assert_raise(Vines::StreamErrors::UnsupportedStanzaType) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::UnsupportedStanzaType) { @state.node(node) }
     assert STANZAS.empty?
     assert @stream.verify
   end
 
   def test_improper_addressing_missing_to
     node = node(%Q{<message from="[e-mail]"/>})
-    assert_raise(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
     assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   def test_improper_addressing_empty_to
     node = node(%Q{<message from="[e-mail]" to=" "/>})
-    assert_raise(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
     assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   def test_improper_addressing_missing_from
     node = node(%Q{<message to="[e-mail]"/>})
-    assert_raise(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
     assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   def test_improper_addressing_empty_from
     node = node(%Q{<message from=" " to="[e-mail]"/>})
-    assert_raise(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::ImproperAddressing) { @state.node(node) }
     assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   def test_invalid_from
     @stream.expect(:remote_domain, 'wonderland.lit')
     node = node(%Q{<message from="[e-mail]" to="[e-mail]"/>})
-    assert_raise(Vines::StreamErrors::InvalidFrom) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::InvalidFrom) { @state.node(node) }
     assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   def test_host_unknown
     @stream.expect(:remote_domain, 'wonderland.lit')
     @stream.expect(:domain, 'verona.lit')
     node = node(%Q{<message from="[e-mail]" to="[e-mail]"/>})
-    assert_raise(Vines::StreamErrors::HostUnknown) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::HostUnknown) { @state.node(node) }
     assert_equal 1, STANZAS.size
     assert @stream.verify
   end
 
   private