vines 0.1.0 → 0.1.1

data/test/storage/ldap_test.rb

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class LdapTest < Test::Unit::TestCase
+class LdapTest < MiniTest::Unit::TestCase
   ALICE_DN = 'uid=alice@wondlerand.lit,ou=People,dc=wonderland,dc=lit'
   CONTEXT = {}
 
@@ -29,31 +28,27 @@ class LdapTest < Test::Unit::TestCase
     end
   end
 
-  def test_default_host_and_port
-    assert_nothing_raised do
-      Vines::Storage::Ldap.new do
-        tls true
-        dn 'cn=Directory Manager'
-        password 'secr3t'
-        basedn 'dc=wonderland,dc=lit'
-        object_class 'person'
-        user_attr 'uid'
-        name_attr 'cn'
-      end
+  def test_default_host_and_port_raises_no_errors
+    Vines::Storage::Ldap.new do
+      tls true
+      dn 'cn=Directory Manager'
+      password 'secr3t'
+      basedn 'dc=wonderland,dc=lit'
+      object_class 'person'
+      user_attr 'uid'
+      name_attr 'cn'
     end
   end
 
-  def test_configured_host_and_port
-    assert_nothing_raised do
-      Vines::Storage::Ldap.new('0.0.0.1', 42) do
-        tls true
-        dn 'cn=Directory Manager'
-        password 'secr3t'
-        basedn 'dc=wonderland,dc=lit'
-        object_class 'person'
-        user_attr 'uid'
-        name_attr 'cn'
-      end
+  def test_configured_host_and_port_raises_no_errors
+    Vines::Storage::Ldap.new('0.0.0.1', 42) do
+      tls true
+      dn 'cn=Directory Manager'
+      password 'secr3t'
+      basedn 'dc=wonderland,dc=lit'
+      object_class 'person'
+      user_attr 'uid'
+      name_attr 'cn'
     end
   end
 
@@ -78,17 +73,15 @@ class LdapTest < Test::Unit::TestCase
   end
 
   # Make sure we properly handle boolean false values.
-  def test_false_tls
-    assert_nothing_raised do
-      Vines::Storage::Ldap.new do
-        tls false
-        dn 'cn=Directory Manager'
-        password 'secr3t'
-        basedn 'dc=wonderland,dc=lit'
-        object_class 'person'
-        user_attr 'uid'
-        name_attr 'cn'
-      end
+  def test_false_tls_raises_no_errors
+    Vines::Storage::Ldap.new do
+      tls false
+      dn 'cn=Directory Manager'
+      password 'secr3t'
+      basedn 'dc=wonderland,dc=lit'
+      object_class 'person'
+      user_attr 'uid'
+      name_attr 'cn'
     end
   end
 
@@ -181,7 +174,7 @@ class LdapTest < Test::Unit::TestCase
       mock.expect(:bind, true)
     end
     user = ldap.authenticate('alice@wonderland.lit', 'passw0rd')
-    assert_not_nil user
+    refute_nil user
     assert_equal 'alice@wonderland.lit', user.jid.to_s
     assert_equal 'Alice Liddell', user.name
     assert_equal [], user.roster

data/test/storage/local_test.rb

@@ -2,9 +2,9 @@
 
 require 'storage_tests'
 require 'vines'
-require 'test/unit'
+require 'minitest/autorun'
 
-class LocalTest < Test::Unit::TestCase
+class LocalTest < MiniTest::Unit::TestCase
   include StorageTests
 
   def setup
@@ -46,9 +46,9 @@ class LocalTest < Test::Unit::TestCase
   end
 
   def test_init
-    assert_raise(RuntimeError) { Vines::Storage::Local.new {} }
-    assert_raise(RuntimeError) { Vines::Storage::Local.new { dir 'bogus' } }
-    assert_raise(RuntimeError) { Vines::Storage::Local.new { dir '/sbin' } }
-    assert_nothing_raised { Vines::Storage::Local.new { dir '.' } }
+    assert_raises(RuntimeError) { Vines::Storage::Local.new {} }
+    assert_raises(RuntimeError) { Vines::Storage::Local.new { dir 'bogus' } }
+    assert_raises(RuntimeError) { Vines::Storage::Local.new { dir '/sbin' } }
+    Vines::Storage::Local.new { dir '.' } # shouldn't raise an error
   end
 end

data/test/storage/redis_test.rb

@@ -2,9 +2,9 @@
 
 require 'storage_tests'
 require 'vines'
-require 'test/unit'
+require 'minitest/autorun'
 
-class RedisTest < Test::Unit::TestCase
+class RedisTest < MiniTest::Unit::TestCase
   include StorageTests
 
   MOCK_REDIS = Class.new do
@@ -65,11 +65,11 @@ class RedisTest < Test::Unit::TestCase
     storage
   end
 
-  def test_init
+  def test_init_raises_no_errors
     EMLoop.new do
-      assert_nothing_raised { Vines::Storage::Redis.new {} }
-      assert_nothing_raised { Vines::Storage::Redis.new { host 'localhost' } }
-      assert_nothing_raised { Vines::Storage::Redis.new { host'localhost'; port '6379' } }
+      Vines::Storage::Redis.new {}
+      Vines::Storage::Redis.new { host 'localhost' }
+      Vines::Storage::Redis.new { host'localhost'; port '6379' }
     end
   end
 end

data/test/storage/sql_test.rb

@@ -2,9 +2,9 @@
 
 require 'storage_tests'
 require 'vines'
-require 'test/unit'
+require 'minitest/autorun'
 
-class SqlTest < Test::Unit::TestCase
+class SqlTest < MiniTest::Unit::TestCase
   include StorageTests
 
   DB_FILE = "./xmpp_testcase.db"
@@ -48,8 +48,8 @@ class SqlTest < Test::Unit::TestCase
   end
 
   def test_init
-    assert_raise(RuntimeError) { Vines::Storage::Sql.new {} }
-    assert_raise(RuntimeError) { Vines::Storage::Sql.new { adapter 'postgresql' } }
-    assert_nothing_raised { Vines::Storage::Sql.new { adapter 'sqlite3'; database ':memory:' } }
+    assert_raises(RuntimeError) { Vines::Storage::Sql.new {} }
+    assert_raises(RuntimeError) { Vines::Storage::Sql.new { adapter 'postgresql' } }
+    Vines::Storage::Sql.new { adapter 'sqlite3'; database ':memory:' } # shouldn't raise an error
   end
 end

data/test/storage/storage_tests.rb

@@ -2,7 +2,7 @@
 
 require 'vines'
 require 'ext/nokogiri'
-require 'test/unit'
+require 'minitest/autorun'
 
 # Mixin methods for storage implementation test classes. The behavioral
 # tests are the same regardless of implementation so share those methods
@@ -37,11 +37,11 @@ module StorageTests
       assert_nil db.authenticate('clear_password@wonderland.lit', 'secret')
 
       user = db.authenticate('bcrypt_password@wonderland.lit', 'secret')
-      assert_not_nil user
+      refute_nil user
       assert_equal('bcrypt_password@wonderland.lit', user.jid.to_s)
 
       user = db.authenticate('full@wonderland.lit', 'secret')
-      assert_not_nil user
+      refute_nil user
       assert_equal 'Tester', user.name
       assert_equal 'full@wonderland.lit', user.jid.to_s
 
@@ -67,15 +67,15 @@ module StorageTests
       assert_nil user
 
       user = db.find_user('full@wonderland.lit')
-      assert_not_nil user
+      refute_nil user
       assert_equal 'full@wonderland.lit', user.jid.to_s
 
       user = db.find_user(Vines::JID.new('full@wonderland.lit'))
-      assert_not_nil user
+      refute_nil user
       assert_equal 'full@wonderland.lit', user.jid.to_s
 
       user = db.find_user(Vines::JID.new('full@wonderland.lit/resource'))
-      assert_not_nil user
+      refute_nil user
       assert_equal 'full@wonderland.lit', user.jid.to_s
     end
   end
@@ -92,7 +92,7 @@ module StorageTests
         :name => 'Contact 1')
       db.save_user(user)
       user = db.find_user('save_user@domain.tld')
-      assert_not_nil user
+      refute_nil user
       assert_equal 'save_user@domain.tld', user.jid.to_s
       assert_equal 'Save User', user.name
       assert_equal 1, user.roster.length
@@ -108,15 +108,15 @@ module StorageTests
       assert_nil card
 
       card = db.find_vcard('full@wonderland.lit')
-      assert_not_nil card
+      refute_nil card
       assert_equal VCARD, card
 
       card = db.find_vcard(Vines::JID.new('full@wonderland.lit'))
-      assert_not_nil card
+      refute_nil card
       assert_equal VCARD, card
 
       card = db.find_vcard(Vines::JID.new('full@wonderland.lit/resource'))
-      assert_not_nil card
+      refute_nil card
       assert_equal VCARD, card
     end
   end
@@ -127,7 +127,7 @@ module StorageTests
       db.save_user(Vines::User.new(:jid => 'save_user@domain.tld'))
       db.save_vcard('save_user@domain.tld/resource1', VCARD)
       card = db.find_vcard('save_user@domain.tld')
-      assert_not_nil card
+      refute_nil card
       assert_equal VCARD, card
     end
   end

data/test/storage_test.rb

@@ -2,10 +2,9 @@
 
 require 'storage_tests'
 require 'vines'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class StorageTest < Test::Unit::TestCase
+class StorageTest < MiniTest::Unit::TestCase
   ALICE = 'alice@wonderland.lit'.freeze
 
   class MockLdapStorage < Vines::Storage
@@ -64,7 +63,7 @@ class StorageTest < Test::Unit::TestCase
       storage = MockLdapStorage.new(alice)
       storage.ldap.expect(:authenticate, alice, [ALICE, 'secr3t'])
       user = storage.authenticate(ALICE, 'secr3t')
-      assert_not_nil user
+      refute_nil user
       assert_equal ALICE, user.jid.to_s
       assert_equal 0, storage.authenticate_calls
       assert_equal 1, storage.find_user_calls
@@ -79,7 +78,7 @@ class StorageTest < Test::Unit::TestCase
       storage = MockLdapStorage.new
       storage.ldap.expect(:authenticate, alice, [ALICE, 'secr3t'])
       user = storage.authenticate(ALICE, 'secr3t')
-      assert_not_nil user
+      refute_nil user
       assert_equal ALICE, user.jid.to_s
       assert_equal 0, storage.authenticate_calls
       assert_equal 1, storage.find_user_calls

data/test/stream/client/auth_test.rb

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class ClientAuthTest < Test::Unit::TestCase
+class ClientAuthTest < MiniTest::Unit::TestCase
   # disable logging for tests
   Class.new.extend(Vines::Log).log.level = Logger::FATAL
 
@@ -34,42 +33,42 @@ class ClientAuthTest < Test::Unit::TestCase
 
   def test_invalid_element
     node = node('<bogus/>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
   end
 
   def test_invalid_sasl_element
     node = node(%Q{<bogus xmlns="#{Vines::NAMESPACES[:sasl]}"/>})
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
   end
 
   def test_missing_namespace
     node = node('<auth/>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
   end
 
   def test_invalid_namespace
     node = node('<auth xmlns="bogus"/>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
   end
 
   def test_missing_mechanism
     @stream.expect(:error, nil, [Vines::SaslErrors::InvalidMechanism.new])
     node = node(%Q{<auth xmlns="#{Vines::NAMESPACES[:sasl]}">tokens</auth>})
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert @stream.verify
   end
 
   def test_invalid_mechanism
     @stream.expect(:error, nil, [Vines::SaslErrors::InvalidMechanism.new])
     node = node(%Q{<auth xmlns="#{Vines::NAMESPACES[:sasl]}" mechanism="bogus">tokens</auth>})
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert @stream.verify
   end
 
   def test_missing_text
     @stream.expect(:error, nil, [Vines::SaslErrors::MalformedRequest.new])
     node = node(%Q{<auth xmlns="#{Vines::NAMESPACES[:sasl]}" mechanism="PLAIN"></auth>})
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert @stream.verify
   end
 
@@ -77,7 +76,7 @@ class ClientAuthTest < Test::Unit::TestCase
     @stream.expect(:storage, MockStorage.new(true))
     @stream.expect(:error, nil, [Vines::SaslErrors::TemporaryAuthFailure.new])
     node = node(%Q{<auth xmlns="#{Vines::NAMESPACES[:sasl]}" mechanism="PLAIN">tokens</auth>})
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert @stream.verify
   end
 
@@ -85,7 +84,7 @@ class ClientAuthTest < Test::Unit::TestCase
     @stream.expect(:storage, MockStorage.new)
     @stream.expect(:error, nil, [Vines::SaslErrors::NotAuthorized.new])
     node = node(%Q{<auth xmlns="#{Vines::NAMESPACES[:sasl]}" mechanism="PLAIN">#{Base64.encode64("alice@wonderland.lit\000\000bogus")}</auth>})
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert @stream.verify
   end
 
@@ -97,7 +96,7 @@ class ClientAuthTest < Test::Unit::TestCase
     @stream.expect(:write, nil, [%Q{<success xmlns="#{Vines::NAMESPACES[:sasl]}"/>}])
     @stream.expect(:advance, nil, [Vines::Stream::Client::BindRestart.new(@stream)])
     node = node(%Q{<auth xmlns="#{Vines::NAMESPACES[:sasl]}" mechanism="PLAIN">#{Base64.encode64("alice@wonderland.lit\000\000secr3t")}</auth>})
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert @stream.verify
   end
 
@@ -108,14 +107,14 @@ class ClientAuthTest < Test::Unit::TestCase
     end
 
     @stream.expect(:error, nil, [Vines::SaslErrors::NotAuthorized.new])
-    assert_nothing_raised { @state.node(node.call) }
+    @state.node(node.call)
     assert @stream.verify
 
-    assert_nothing_raised { @state.node(node.call) }
+    @state.node(node.call)
     assert @stream.verify
 
     @stream.expect(:error, nil, [Vines::StreamErrors::PolicyViolation.new])
-    assert_nothing_raised { @state.node(node.call) }
+    @state.node(node.call)
     assert @stream.verify
   end
 

data/test/stream/client/ready_test.rb

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class ClientReadyTest < Test::Unit::TestCase
+class ClientReadyTest < MiniTest::Unit::TestCase
   STANZAS = []
 
   def setup
@@ -28,14 +27,14 @@ class ClientReadyTest < Test::Unit::TestCase
 
   def test_good_node_processes
     node = node('<message/>')
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert_equal 1, STANZAS.size
     assert STANZAS.map {|s| s.verify }.all?
   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?
   end
 

data/test/stream/client/session_test.rb

@@ -0,0 +1,21 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'minitest/autorun'
+
+class ClientSessionTest < MiniTest::Unit::TestCase
+  def test_equality
+    one = Vines::Stream::Client::Session.new(nil)
+    two = Vines::Stream::Client::Session.new(nil)
+
+    assert_nil one <=> 42
+
+    assert one == one
+    assert one.eql?(one)
+    assert one.hash == one.hash
+
+    refute one == two
+    refute one.eql?(two)
+    refute one.hash == two.hash
+  end
+end

data/test/stream/component/handshake_test.rb

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class HandshakeTest < Test::Unit::TestCase
+class HandshakeTest < MiniTest::Unit::TestCase
   def setup
     @stream = MiniTest::Mock.new
     @state = Vines::Stream::Component::Handshake.new(@stream)
@@ -12,20 +11,20 @@ class HandshakeTest < Test::Unit::TestCase
 
   def test_invalid_element
     node = node('<message/>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
   end
 
   def test_missing_text
     @stream.expect(:secret, 'secr3t')
     node = node('<handshake/>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
     assert @stream.verify
   end
 
   def test_invalid_secret
     @stream.expect(:secret, 'secr3t')
     node = node('<handshake>bogus</handshake>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
     assert @stream.verify
   end
 
@@ -34,7 +33,7 @@ class HandshakeTest < Test::Unit::TestCase
     @stream.expect(:write, nil, ['<handshake/>'])
     @stream.expect(:advance, nil, [Vines::Stream::Component::Ready.new(@stream)])
     node = node('<handshake>secr3t</handshake>')
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert @stream.verify
   end
 

data/test/stream/component/ready_test.rb

@@ -2,10 +2,9 @@
 
 require 'vines'
 require 'ext/nokogiri'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class ComponentReadyTest < Test::Unit::TestCase
+class ComponentReadyTest < MiniTest::Unit::TestCase
   STANZAS = []
 
   def setup
@@ -34,7 +33,7 @@ class ComponentReadyTest < Test::Unit::TestCase
 
   def test_missing_to_and_from_addresses
     node = node('<message/>')
-    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
@@ -42,14 +41,14 @@ class ComponentReadyTest < Test::Unit::TestCase
   def test_missing_from_address
     @stream.expect(:remote_domain, 'tea.wonderland.lit')
     node = node(%q{<message to="hatter@wonderland.lit"/>})
-    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_missing_to_address
     node = node(%q{<message from="alice@tea.wonderland.lit"/>})
-    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
@@ -57,14 +56,14 @@ class ComponentReadyTest < Test::Unit::TestCase
   def test_invalid_from_address
     @stream.expect(:remote_domain, 'tea.wonderland.lit')
     node = node(%q{<message from="alice@bogus.wonderland.lit" to="hatter@wonderland.lit"/>})
-    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_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
@@ -72,7 +71,7 @@ class ComponentReadyTest < Test::Unit::TestCase
   def test_remote_message_routes
     @stream.expect(:remote_domain, 'tea.wonderland.lit')
     node = node(%q{<message from="alice@tea.wonderland.lit" to="romeo@verona.lit"/>})
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert_equal 1, STANZAS.size
     assert STANZAS.map {|s| s.verify }.all?
     assert @stream.verify
@@ -89,7 +88,7 @@ class ComponentReadyTest < Test::Unit::TestCase
     @router.expect(:connected_resources, [@recipient], ['hatter@wonderland.lit'])
     @stream.expect(:router, @router)
 
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert_equal 1, STANZAS.size
     assert STANZAS.map {|s| s.verify }.all?
     assert @stream.verify

data/test/stream/component/start_test.rb

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class ComponentStartTest < Test::Unit::TestCase
+class ComponentStartTest < MiniTest::Unit::TestCase
   def setup
     @stream = MiniTest::Mock.new
     @state = Vines::Stream::Component::Start.new(@stream)
@@ -12,24 +11,24 @@ class ComponentStartTest < Test::Unit::TestCase
 
   def test_invalid_element
     node = node('<message/>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
   end
 
   def test_missing_stream_namespace
     node = node('<stream:stream/>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
   end
 
   def test_invalid_stream_namespace
     node = node('<stream:stream xmlns="bogus"/>')
-    assert_raise(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
+    assert_raises(Vines::StreamErrors::NotAuthorized) { @state.node(node) }
   end
 
   def test_valid_stream_header
     node = node(%q{<stream:stream xmlns:stream="http://etherx.jabber.org/streams" xmlns="jabber:component:accept" to="tea.wonderland.lit"/>})
     @stream.expect(:start, nil, [node])
     @stream.expect(:advance, nil, [Vines::Stream::Component::Handshake.new(@stream)])
-    assert_nothing_raised { @state.node(node) }
+    @state.node(node)
     assert @stream.verify
   end