vines 0.1.0 → 0.1.1

data/test/config_test.rb

@@ -1,11 +1,11 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'test/unit'
+require 'minitest/autorun'
 
-class ConfigTest < Test::Unit::TestCase
+class ConfigTest < MiniTest::Unit::TestCase
   def test_missing_host
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         # missing hosts
       end
@@ -13,7 +13,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_duplicate_host
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
           storage 'fs' do
@@ -30,7 +30,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_duplicate_host_in_one_call
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit', 'wonderland.lit' do
           storage 'fs' do
@@ -42,7 +42,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_missing_storage
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
           # missing storage
@@ -52,7 +52,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_bad_storage
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
           storage 'bogus' do
@@ -64,7 +64,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_duplicate_storage
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         host 'wonderland.lit' do
           storage('fs') { dir '.' }
@@ -74,13 +74,11 @@ class ConfigTest < Test::Unit::TestCase
     end
   end
 
-  def test_good_storage
-    assert_nothing_raised do
-      Vines::Config.new do
-        host 'wonderland.lit' do
-          storage 'fs' do
-            dir '.'
-          end
+  def test_good_storage_raises_no_errors
+    Vines::Config.new do
+      host 'wonderland.lit' do
+        storage 'fs' do
+          dir '.'
         end
       end
     end
@@ -117,7 +115,7 @@ class ConfigTest < Test::Unit::TestCase
       end
     end
     %w[wonderland.lit verona.lit].each do |domain|
-      assert_not_nil config.vhosts[domain].ldap
+      refute_nil config.vhosts[domain].ldap
       assert config.vhosts[domain].ldap?
     end
   end
@@ -130,7 +128,7 @@ class ConfigTest < Test::Unit::TestCase
         end
       end
     end
-    assert_not_nil config
+    refute_nil config
     assert_same config, Vines::Config.instance
   end
 
@@ -152,13 +150,13 @@ class ConfigTest < Test::Unit::TestCase
       end
       client
     end
-    assert_not_nil config[:client]
-    assert_raise(ArgumentError) { config[:server] }
-    assert_raise(ArgumentError) { config[:bogus] }
+    refute_nil config[:client]
+    assert_raises(ArgumentError) { config[:server] }
+    assert_raises(ArgumentError) { config[:bogus] }
   end
 
   def test_duplicate_client
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         client
         client
@@ -167,7 +165,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_duplicate_server
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         server
         server
@@ -176,7 +174,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_duplicate_http
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         http
         http
@@ -185,7 +183,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_duplicate_component
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       Vines::Config.new do
         component
         component
@@ -201,7 +199,7 @@ class ConfigTest < Test::Unit::TestCase
       client
     end
     port = config.ports.first
-    assert_not_nil port
+    refute_nil port
     assert_equal Vines::Config::ClientPort, port.class
     assert_equal '0.0.0.0', port.host
     assert_equal 5222, port.port
@@ -223,7 +221,7 @@ class ConfigTest < Test::Unit::TestCase
       end
     end
     port = config.ports.first
-    assert_not_nil port
+    refute_nil port
     assert_equal Vines::Config::ClientPort, port.class
     assert_equal '0.0.0.1', port.host
     assert_equal 42, port.port
@@ -254,7 +252,7 @@ class ConfigTest < Test::Unit::TestCase
       server
     end
     port = config.ports.first
-    assert_not_nil port
+    refute_nil port
     assert !config.s2s?('verona.lit')
     assert_equal Vines::Config::ServerPort, port.class
     assert_equal '0.0.0.0', port.host
@@ -276,7 +274,7 @@ class ConfigTest < Test::Unit::TestCase
       end
     end
     port = config.ports.first
-    assert_not_nil port
+    refute_nil port
     assert config.s2s?('verona.lit')
     assert config.s2s?('denmark.lit')
     assert !config.s2s?('bogus')
@@ -297,11 +295,12 @@ class ConfigTest < Test::Unit::TestCase
       http
     end
     port = config.ports.first
-    assert_not_nil port
+    refute_nil port
     assert_equal Vines::Config::HttpPort, port.class
     assert_equal '0.0.0.0', port.host
     assert_equal 5280, port.port
     assert_equal 131_072, port.max_stanza_size
+    assert_equal 5, port.max_resources_per_account
     assert_equal Vines::Stream::Http, port.stream
     assert_same config, port.config 
     assert_equal 1, config.ports.size
@@ -314,14 +313,16 @@ class ConfigTest < Test::Unit::TestCase
       end
       http '0.0.0.1', 42 do
         max_stanza_size 60_000
+        max_resources_per_account 1
       end
     end
     port = config.ports.first
-    assert_not_nil port
+    refute_nil port
     assert_equal Vines::Config::HttpPort, port.class
     assert_equal '0.0.0.1', port.host
     assert_equal 42, port.port
     assert_equal 60_000, port.max_stanza_size
+    assert_equal 1, port.max_resources_per_account
     assert_equal Vines::Stream::Http, port.stream
     assert_same config, port.config 
     assert_equal 1, config.ports.size
@@ -335,7 +336,7 @@ class ConfigTest < Test::Unit::TestCase
       component
     end
     port = config.ports.first
-    assert_not_nil port
+    refute_nil port
     assert port.components.empty?
     assert_nil port.password('bogus')
     assert_equal Vines::Config::ComponentPort, port.class
@@ -359,7 +360,7 @@ class ConfigTest < Test::Unit::TestCase
       end
     end
     port = config.ports.first
-    assert_not_nil port
+    refute_nil port
     assert_equal 2, port.components.size
     assert_equal 'secr3t', port.password('tea.wonderland.lit')
     assert_equal 'passw0rd', port.password('cake.wonderland.lit')
@@ -374,7 +375,7 @@ class ConfigTest < Test::Unit::TestCase
   end
 
   def test_invalid_log_level
-    assert_raise(RuntimeError) do
+    assert_raises(RuntimeError) do
       config = Vines::Config.new do
         log 'bogus'
         host 'wonderland.lit' do

data/test/contact_test.rb

@@ -0,0 +1,42 @@
+# encoding: UTF-8
+
+require 'vines'
+require 'minitest/autorun'
+
+class ContactTest < MiniTest::Unit::TestCase
+  def test_equality
+    alice  = Vines::Contact.new(:jid => 'alice@wonderland.lit')
+    alice2 = Vines::Contact.new(:jid => 'alice@wonderland.lit')
+    hatter = Vines::Contact.new(:jid => 'hatter@wonderland.lit')
+
+    assert_nil alice <=> 42
+
+    assert alice == alice2
+    assert alice.eql?(alice2)
+    assert alice.hash == alice2.hash
+
+    refute alice == hatter
+    refute alice.eql?(hatter)
+    refute alice.hash == hatter.hash
+  end
+
+  def test_initialize_missing_jid
+    assert_raises(ArgumentError) { Vines::Contact.new }
+  end
+
+  def test_to_roster_xml_sorts_groups
+    contact = Vines::Contact.new(
+      :jid => 'a@wonderland.lit',
+      :name => "Contact 1",
+      :groups => %w[B A])
+
+    expected = %q{
+      <item jid="a@wonderland.lit" name="Contact 1" subscription="none">
+        <group>A</group>
+        <group>B</group>
+      </item>
+    }.strip.gsub(/\n/, '').gsub(/\s{2,}/, '')
+
+    assert_equal expected, contact.to_roster_xml.to_xml(:indent => 0).gsub(/\n/, '')
+  end
+end

data/test/error_test.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'test/unit'
+require 'minitest/autorun'
 
-class ErrorTest < Test::Unit::TestCase
+class ErrorTest < MiniTest::Unit::TestCase
   def test_sasl_error_without_text
     expected = %q{<failure xmlns="urn:ietf:params:xml:ns:xmpp-sasl"><temporary-auth-failure/></failure>}
     assert_equal expected, Vines::SaslErrors::TemporaryAuthFailure.new.to_xml

data/test/jid_test.rb

@@ -1,12 +1,12 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'test/unit'
+require 'minitest/autorun'
 
-class JidTest < Test::Unit::TestCase
+class JidTest < MiniTest::Unit::TestCase
   def test_nil_and_empty_jids
     [nil, ''].each do |text|
-      assert_nothing_raised { Vines::JID.new(text) }
+      Vines::JID.new(text) # shouldn't raise an error
       jid = Vines::JID.new(text)
       assert_nil jid.node
       assert_nil jid.resource
@@ -17,11 +17,11 @@ class JidTest < Test::Unit::TestCase
   end
 
   def test_jid_too_long_error
-    assert_nothing_raised { Vines::JID.new('n' * 1023) }
+    Vines::JID.new('n' * 1023) # shouldn't raise an error
     assert_raises(ArgumentError) { Vines::JID.new('n' * 1024) }
     assert_raises(ArgumentError) { Vines::JID.new('n', 'd' * 1024) }
     assert_raises(ArgumentError) { Vines::JID.new('n', 'd', 'r' * 1024) }
-    assert_nothing_raised { Vines::JID.new('n' * 1023, 'd' * 1023, 'r' * 1023) }
+    Vines::JID.new('n' * 1023, 'd' * 1023, 'r' * 1023) # shouldn't raise an error
   end
 
   def test_domain_only
@@ -57,7 +57,7 @@ class JidTest < Test::Unit::TestCase
     assert_equal 'wonderland.lit', jid.domain
     assert_equal 'alice', jid.node
     assert_equal 'tea', jid.resource
-    assert_not_equal jid, jid.bare
+    refute_equal jid, jid.bare
   end
 
   def test_parsed_full_jid
@@ -66,6 +66,6 @@ class JidTest < Test::Unit::TestCase
     assert_equal 'wonderland.lit', jid.domain
     assert_equal 'alice', jid.node
     assert_equal 'tea', jid.resource
-    assert_not_equal jid, jid.bare
+    refute_equal jid, jid.bare
   end
 end

data/test/kit_test.rb

@@ -1,21 +1,21 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'test/unit'
+require 'minitest/autorun'
 
-class KitTest < Test::Unit::TestCase
+class KitTest < MiniTest::Unit::TestCase
   def test_hmac
-    assert_equal(128, Vines::Kit.hmac('secret', 'username').length)
-    assert_equal(Vines::Kit.hmac('s1', 'u1'), Vines::Kit.hmac('s1', 'u1'))
-    assert_not_equal(Vines::Kit.hmac('s1', 'u1'), Vines::Kit.hmac('s2', 'u1'))
-    assert_not_equal(Vines::Kit.hmac('s1', 'u1'), Vines::Kit.hmac('s1', 'u2'))
+    assert_equal 128, Vines::Kit.hmac('secret', 'username').length
+    assert_equal Vines::Kit.hmac('s1', 'u1'), Vines::Kit.hmac('s1', 'u1')
+    refute_equal Vines::Kit.hmac('s1', 'u1'), Vines::Kit.hmac('s2', 'u1')
+    refute_equal Vines::Kit.hmac('s1', 'u1'), Vines::Kit.hmac('s1', 'u2')
   end
 
   def test_uuid
     ids = Array.new(1000) { Vines::Kit.uuid }
-    assert(ids.all? {|id| !id.nil? })
-    assert(ids.all? {|id| id.length == 36 })
-    assert(ids.all? {|id| id.match(/\w{8}-\w{4}-[4]\w{3}-[89ab]\w{3}-\w{12}/) })
-    assert_equal(ids.length, ids.uniq.length)
+    assert ids.all? {|id| !id.nil? }
+    assert ids.all? {|id| id.length == 36 }
+    assert ids.all? {|id| id.match(/\w{8}-\w{4}-[4]\w{3}-[89ab]\w{3}-\w{12}/) }
+    assert_equal ids.length, ids.uniq.length
   end
 end

data/test/rake_test_loader.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+# Use the latest MiniTest gem instead of the buggy
+# version included with Ruby 1.9.2.
+gem 'minitest'
+
+# Load the test files from the command line.
+
+ARGV.each { |f| load f unless f =~ /^-/  }

data/test/router_test.rb

@@ -1,10 +1,9 @@
 # encoding: UTF-8
 
 require 'vines'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class RouterTest < Test::Unit::TestCase
+class RouterTest < MiniTest::Unit::TestCase
   def setup
     @router = Vines::Router.new
   end
@@ -29,6 +28,7 @@ class RouterTest < Test::Unit::TestCase
     config.expect(:vhost?, true, ['wonderland.lit'])
     stream = MiniTest::Mock.new
     stream.expect(:config, config)
+    stream.expect(:stream_type, :client)
     @router << stream
 
     stanza = MiniTest::Mock.new
@@ -46,6 +46,7 @@ class RouterTest < Test::Unit::TestCase
     config.expect(:vhost?, false, ['wonderland.lit'])
     stream = MiniTest::Mock.new
     stream.expect(:config, config)
+    stream.expect(:stream_type, :client)
     @router << stream
 
     stanza = MiniTest::Mock.new

data/test/stanza/iq/roster_test.rb

@@ -2,10 +2,9 @@
 
 require 'vines'
 require 'ext/nokogiri'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class RosterTest < Test::Unit::TestCase
+class RosterTest < MiniTest::Unit::TestCase
   def setup
     @stream = MiniTest::Mock.new
   end
@@ -59,7 +58,7 @@ class RosterTest < Test::Unit::TestCase
       </iq>}.strip.gsub(/\n|\s{2,}/, ''))
 
     stanza = Vines::Stanza::Iq::Roster.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::Forbidden) { stanza.process }
+    assert_raises(Vines::StanzaErrors::Forbidden) { stanza.process }
     assert @stream.verify
   end
 
@@ -70,7 +69,7 @@ class RosterTest < Test::Unit::TestCase
       </iq>}.strip.gsub(/\n|\s{2,}/, ''))
 
     stanza = Vines::Stanza::Iq::Roster.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::BadRequest) { stanza.process }
+    assert_raises(Vines::StanzaErrors::BadRequest) { stanza.process }
     assert @stream.verify
   end
 
@@ -84,7 +83,7 @@ class RosterTest < Test::Unit::TestCase
       </iq>}.strip.gsub(/\n|\s{2,}/, ''))
 
     stanza = Vines::Stanza::Iq::Roster.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::BadRequest) { stanza.process }
+    assert_raises(Vines::StanzaErrors::BadRequest) { stanza.process }
     assert @stream.verify
   end
 
@@ -97,7 +96,7 @@ class RosterTest < Test::Unit::TestCase
       </iq>}.strip.gsub(/\n|\s{2,}/, ''))
 
     stanza = Vines::Stanza::Iq::Roster.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::BadRequest) { stanza.process }
+    assert_raises(Vines::StanzaErrors::BadRequest) { stanza.process }
     assert @stream.verify
   end
 
@@ -116,7 +115,7 @@ class RosterTest < Test::Unit::TestCase
       </iq>}.strip.gsub(/\n|\s{2,}/, ''))
 
     stanza = Vines::Stanza::Iq::Roster.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::BadRequest) { stanza.process }
+    assert_raises(Vines::StanzaErrors::BadRequest) { stanza.process }
     assert @stream.verify
   end
 
@@ -134,7 +133,7 @@ class RosterTest < Test::Unit::TestCase
       </iq>}.strip.gsub(/\n|\s{2,}/, ''))
 
     stanza = Vines::Stanza::Iq::Roster.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::NotAcceptable) { stanza.process }
+    assert_raises(Vines::StanzaErrors::NotAcceptable) { stanza.process }
     assert @stream.verify
   end
 
@@ -173,7 +172,6 @@ class RosterTest < Test::Unit::TestCase
 
     stanza = Vines::Stanza::Iq::Roster.new(node, @stream)
     stanza.process
-    assert_nothing_raised { stanza.process }
     assert @stream.verify
     assert storage.verify
     assert router.verify

data/test/stanza/iq/session_test.rb

@@ -2,10 +2,9 @@
 
 require 'vines'
 require 'ext/nokogiri'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class SessionTest < Test::Unit::TestCase
+class SessionTest < MiniTest::Unit::TestCase
   def test_session
     stream = MiniTest::Mock.new
     stream.expect(:domain, 'wonderland.lit')

data/test/stanza/iq/vcard_test.rb

@@ -2,10 +2,9 @@
 
 require 'vines'
 require 'ext/nokogiri'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class VcardTest < Test::Unit::TestCase
+class VcardTest < MiniTest::Unit::TestCase
   def setup
     @stream = MiniTest::Mock.new
   end
@@ -105,7 +104,7 @@ class VcardTest < Test::Unit::TestCase
     @stream.expect(:storage, storage, ['wonderland.lit'])
 
     stanza = Vines::Stanza::Iq::Vcard.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::ItemNotFound) { stanza.process }
+    assert_raises(Vines::StanzaErrors::ItemNotFound) { stanza.process }
     assert @stream.verify
     assert router.verify
     assert storage.verify
@@ -122,7 +121,7 @@ class VcardTest < Test::Unit::TestCase
     @stream.expect(:router, router)
 
     stanza = Vines::Stanza::Iq::Vcard.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::Forbidden) { stanza.process }
+    assert_raises(Vines::StanzaErrors::Forbidden) { stanza.process }
     assert @stream.verify
   end
 

data/test/stanza/message_test.rb

@@ -2,10 +2,9 @@
 
 require 'vines'
 require 'ext/nokogiri'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class MessageTest < Test::Unit::TestCase
+class MessageTest < MiniTest::Unit::TestCase
   def setup
     @stream = MiniTest::Mock.new
   end
@@ -13,7 +12,7 @@ class MessageTest < Test::Unit::TestCase
   def test_bad_type_returns_error
     node = node('<message type="bogus">hello!</message>')
     stanza = Vines::Stanza::Message.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::BadRequest) { stanza.process }
+    assert_raises(Vines::StanzaErrors::BadRequest) { stanza.process }
   end
 
   def test_missing_to_address_is_sent_to_sender
@@ -21,16 +20,18 @@ class MessageTest < Test::Unit::TestCase
     node = node('<message>hello!</message>')
 
     recipient = MiniTest::Mock.new
+    recipient.expect(:user, alice)
+    recipient.expect(:write, nil, [node])
+
     router = MiniTest::Mock.new
     router.expect(:local?, true, [node])
     router.expect(:connected_resources, [recipient], [alice.jid.bare])
 
     @stream.expect(:router, router)
     @stream.expect(:user, alice)
-    @stream.expect(:broadcast, nil, [node, [recipient]])
 
     stanza = Vines::Stanza::Message.new(node, @stream)
-    assert_nothing_raised { stanza.process }
+    stanza.process
     assert @stream.verify
     assert router.verify
     assert recipient.verify
@@ -51,7 +52,7 @@ class MessageTest < Test::Unit::TestCase
     @stream.expect(:storage, storage, [bogus.domain])
 
     stanza = Vines::Stanza::Message.new(node, @stream)
-    assert_nothing_raised { stanza.process }
+    stanza.process
     assert @stream.verify
     assert router.verify
     assert storage.verify
@@ -72,26 +73,31 @@ class MessageTest < Test::Unit::TestCase
     @stream.expect(:storage, storage, [hatter.jid.domain])
 
     stanza = Vines::Stanza::Message.new(node, @stream)
-    assert_raise(Vines::StanzaErrors::ServiceUnavailable) { stanza.process }
+    assert_raises(Vines::StanzaErrors::ServiceUnavailable) { stanza.process }
     assert @stream.verify
     assert router.verify
     assert storage.verify
   end
 
   def test_message_to_local_user_in_different_domain_is_delivered
+    alice = Vines::User.new(:jid => 'alice@wonderland.lit/tea')
     romeo = Vines::User.new(:jid => 'romeo@verona.lit/balcony')
     node = node(%Q{<message to="#{romeo.jid}">hello!</message>})
+    expected = node(%Q{<message to="#{romeo.jid}" from="#{alice.jid}">hello!</message>})
 
     recipient = MiniTest::Mock.new
+    recipient.expect(:user, romeo)
+    recipient.expect(:write, nil, [expected])
+
     router = MiniTest::Mock.new
     router.expect(:local?, true, [node])
     router.expect(:connected_resources, [recipient], [romeo.jid])
 
     @stream.expect(:router, router)
-    @stream.expect(:broadcast, nil, [node, [recipient]])
+    @stream.expect(:user, alice)
 
     stanza = Vines::Stanza::Message.new(node, @stream)
-    assert_nothing_raised { stanza.process }
+    stanza.process
     assert @stream.verify
     assert router.verify
     assert recipient.verify
@@ -111,7 +117,7 @@ class MessageTest < Test::Unit::TestCase
     @stream.expect(:user, alice)
 
     stanza = Vines::Stanza::Message.new(node, @stream)
-    assert_nothing_raised { stanza.process }
+    stanza.process
     assert @stream.verify
     assert router.verify
   end

data/test/stanza/presence/subscribe_test.rb

@@ -2,10 +2,9 @@
 
 require 'vines'
 require 'ext/nokogiri'
-require 'minitest/mock'
-require 'test/unit'
+require 'minitest/autorun'
 
-class SubscribeTest < Test::Unit::TestCase
+class SubscribeTest < MiniTest::Unit::TestCase
   def test_outbound_subscribe_to_local_jid_but_missing_contact
     alice = Vines::JID.new('alice@wonderland.lit/tea')
     hatter = Vines::JID.new('hatter@wonderland.lit')
@@ -22,7 +21,7 @@ class SubscribeTest < Test::Unit::TestCase
     storage.expect(:find_user, nil, [hatter])
 
     recipient = MiniTest::Mock.new
-    recipient.expect(:user, Vines::User.new(:jid => hatter))
+    recipient.expect(:user, user)
     def recipient.nodes; @nodes; end
     def recipient.write(node)
       @nodes ||= []

data/test/storage/couchdb_test.rb

@@ -2,9 +2,9 @@
 
 require 'storage_tests'
 require 'vines'
-require 'test/unit'
+require 'minitest/autorun'
 
-class CouchDBTest < Test::Unit::TestCase
+class CouchDBTest < MiniTest::Unit::TestCase
   include StorageTests
 
   URL = 'http://localhost:5984/xmpp_testcase'.freeze
@@ -88,14 +88,13 @@ class CouchDBTest < Test::Unit::TestCase
 
   def test_init
     EMLoop.new do
-      assert_raise(RuntimeError) { Vines::Storage::CouchDB.new {} }
-      assert_raise(RuntimeError) { Vines::Storage::CouchDB.new { host 'localhost' } }
-      assert_nothing_raised do
-        Vines::Storage::CouchDB.new do
-          host 'localhost'
-          port '5984'
-          database 'test'
-        end
+      assert_raises(RuntimeError) { Vines::Storage::CouchDB.new {} }
+      assert_raises(RuntimeError) { Vines::Storage::CouchDB.new { host 'localhost' } }
+      # shouldn't raise an error
+      Vines::Storage::CouchDB.new do
+        host 'localhost'
+        port '5984'
+        database 'test'
       end
     end
   end