Merge pull request #82 from ktdreyer/minitest

Switch to Minitest, and misc test cleanups

Author: dennisreimann

.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 script: rake
 rvm:
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - jruby-19mode

Gemfile

@@ -4,4 +4,3 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'rake'
-gem 'test-unit', '>= 2.5.2'

admin/runtests.rb

@@ -23,4 +23,6 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.md', 'INSTALL.md', 'LICENSE', 'UPGRADE.md']
   s.rdoc_options << '--main' << 'README.md'
+
+  s.add_development_dependency 'minitest', '>= 5'
 end

ruby-openid.gemspec

@@ -1416,10 +1416,7 @@ def exec_test
       return
     end
     $stderr.puts 'Running tests...' if verbose?
-    require 'test/unit'
-    runner = Test::Unit::AutoRunner.new(true)
-    runner.to_run << TESTDIR
-    runner.run
+    Dir.glob './test/**/test_*.rb', &method(:require)
   end
 
   #

setup.rb

@@ -1,12 +1,12 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'testutil'
 require 'openid/yadis/accept'
 require 'openid/extras'
 require 'openid/util'
 
 module OpenID
 
-  class AcceptTest < Test::Unit::TestCase
+  class AcceptTest < Minitest::Test
     include TestDataMixin
 
     def getTestData()
@@ -154,7 +154,7 @@ def test_generate_accept_header
       ].each { |input, expected_header|
 
         if expected_header.nil?
-          assert_raise(ArgumentError) {
+          assert_raises(ArgumentError) {
             Yadis.generate_accept_header(*input)
           }
         else

test/test_accept.rb

@@ -1,8 +1,8 @@
-require "test/unit"
+require "minitest/autorun"
 require "openid/association"
 
 module OpenID
-  class AssociationTestCase < Test::Unit::TestCase
+  class AssociationTestCase < Minitest::Test
     def setup
       # Use this funny way of getting a time so that it does not have
       # fractional seconds, and so can be serialized exactly using our
@@ -202,7 +202,7 @@ def sign(pairs)
     end
   end
 
-  class AssociationNegotiatorTestCase < Test::Unit::TestCase
+  class AssociationNegotiatorTestCase < Minitest::Test
     def assert_equal_under(item1, item2)
       val1 = yield(item1)
       val2 = yield(item2)

test/test_association.rb

@@ -1,4 +1,4 @@
-require "test/unit"
+require "minitest/autorun"
 require "openid/consumer/associationmanager"
 require "openid/association"
 require "openid/dh"
@@ -10,14 +10,12 @@
 require "time"
 
 module OpenID
-  class DHAssocSessionTest < Test::Unit::TestCase
+  class DHAssocSessionTest < Minitest::Test
     def test_sha1_get_request
       # Initialized without an explicit DH gets defaults
       sess = Consumer::DiffieHellmanSHA1Session.new
       assert_equal(['dh_consumer_public'], sess.get_request.keys)
-      assert_nothing_raised do
-        Util::from_base64(sess.get_request['dh_consumer_public'])
-      end
+      Util::from_base64(sess.get_request['dh_consumer_public'])
     end
 
     def test_sha1_get_request_custom_dh
@@ -28,9 +26,7 @@ def test_sha1_get_request_custom_dh
                    req.keys.sort)
       assert_equal(dh.modulus, CryptUtil.base64_to_num(req['dh_modulus']))
       assert_equal(dh.generator, CryptUtil.base64_to_num(req['dh_gen']))
-      assert_nothing_raised do
-        Util::from_base64(req['dh_consumer_public'])
-      end
+      Util::from_base64(req['dh_consumer_public'])
     end
   end
 
@@ -102,7 +98,7 @@ def test_invalid_base64_mac_key
     end
   end
 
-  class TestConsumerOpenID1DHSHA1 < Test::Unit::TestCase
+  class TestConsumerOpenID1DHSHA1 < Minitest::Test
     include TestDiffieHellmanResponseParametersMixin
     class << self
       attr_reader :session_cls, :message_namespace
@@ -112,7 +108,7 @@ class << self
     @message_namespace = OPENID1_NS
   end
 
-  class TestConsumerOpenID2DHSHA1 < Test::Unit::TestCase
+  class TestConsumerOpenID2DHSHA1 < Minitest::Test
     include TestDiffieHellmanResponseParametersMixin
     class << self
       attr_reader :session_cls, :message_namespace
@@ -122,7 +118,7 @@ class << self
     @message_namespace = OPENID2_NS
   end
 
-  class TestConsumerOpenID2DHSHA256 < Test::Unit::TestCase
+  class TestConsumerOpenID2DHSHA256 < Minitest::Test
     include TestDiffieHellmanResponseParametersMixin
     class << self
       attr_reader :session_cls, :message_namespace
@@ -132,7 +128,7 @@ class << self
     @message_namespace = OPENID2_NS
   end
 
-  class TestConsumerNoEncryptionSession < Test::Unit::TestCase
+  class TestConsumerNoEncryptionSession < Minitest::Test
     def setup
       @sess = Consumer::NoEncryptionSession.new
     end
@@ -149,7 +145,7 @@ def test_get_secret
     end
   end
 
-  class TestCreateAssociationRequest < Test::Unit::TestCase
+  class TestCreateAssociationRequest < Minitest::Test
     def setup
       @server_url = 'http://invalid/'
       @assoc_manager = Consumer::AssociationManager.new(nil, @server_url)
@@ -203,7 +199,7 @@ def test_dh_sha1_compatibility
 
       # This is a random base-64 value, so just check that it's
       # present.
-      assert_not_nil(args.get_arg(OPENID1_NS, 'dh_consumer_public'))
+      refute_nil(args.get_arg(OPENID1_NS, 'dh_consumer_public'))
       args.del_arg(OPENID1_NS, 'dh_consumer_public')
 
       # OK, session_type is set here and not for no-encryption
@@ -216,7 +212,7 @@ def test_dh_sha1_compatibility
     end
   end
 
-  class TestAssociationManagerExpiresIn < Test::Unit::TestCase
+  class TestAssociationManagerExpiresIn < Minitest::Test
     def expires_in_msg(val)
       msg = Message.from_openid_args({'expires_in' => val})
       Consumer::AssociationManager.extract_expires_in(msg)
@@ -248,7 +244,7 @@ def test_parse
     end
   end
 
-  class TestAssociationManagerCreateSession < Test::Unit::TestCase
+  class TestAssociationManagerCreateSession < Minitest::Test
     def test_invalid
       assert_raises(ArgumentError) {
         Consumer::AssociationManager.create_session('monkeys')
@@ -292,7 +288,7 @@ def request_association(assoc_type, session_type)
 
   # Test the session type negotiation behavior of an OpenID 2
   # consumer.
-  class TestOpenID2SessionNegotiation < Test::Unit::TestCase
+  class TestOpenID2SessionNegotiation < Minitest::Test
     include NegotiationTestMixin
 
     Compat = false
@@ -413,7 +409,7 @@ def test_valid
   # oidutil.log.  See the calls to self.failUnlessLogMatches.  Some of
   # these tests pass openid2-style messages to the openid 1
   # association processing logic to be sure it ignores the extra data.
-  class TestOpenID1SessionNegotiation < Test::Unit::TestCase
+  class TestOpenID1SessionNegotiation < Minitest::Test
     include NegotiationTestMixin
 
     Compat = true
@@ -498,7 +494,7 @@ def test_valid
   end
 
 
-  class TestExtractAssociation < Test::Unit::TestCase
+  class TestExtractAssociation < Minitest::Test
     include ProtocolErrorMixin
 
     # An OpenID associate response (without the namespace)
@@ -619,7 +615,7 @@ def test_openid1_no_encryption_fallback
     end
   end
 
-  class GetOpenIDSessionTypeTest < Test::Unit::TestCase
+  class GetOpenIDSessionTypeTest < Minitest::Test
     include TestUtil
 
     SERVER_URL = 'http://invalid/'
@@ -666,7 +662,7 @@ def test_explicit_no_encryption
     end
   end
 
-  class ExtractAssociationTest < Test::Unit::TestCase
+  class ExtractAssociationTest < Minitest::Test
     include ProtocolErrorMixin
 
     SERVER_URL = 'http://invalid/'
@@ -740,7 +736,7 @@ def test_bad_expires_in
     end
   end
 
-  class TestExtractAssociationDiffieHellman < Test::Unit::TestCase
+  class TestExtractAssociationDiffieHellman < Minitest::Test
     include ProtocolErrorMixin
 
     SECRET = 'x' * 20
@@ -799,7 +795,7 @@ def test_bad_dh_values
     end
   end
 
-  class TestAssocManagerGetAssociation < Test::Unit::TestCase
+  class TestAssocManagerGetAssociation < Minitest::Test
     include FetcherMixin
     include TestUtil
 
@@ -859,7 +855,7 @@ def test_request_assoc_with_status_error
     end
   end
 
-  class TestAssocManagerRequestAssociation < Test::Unit::TestCase
+  class TestAssocManagerRequestAssociation < Minitest::Test
     include FetcherMixin
     include TestUtil
 

test/test_associationmanager.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'openid/extensions/ax'
 require 'openid/message'
 require 'openid/consumer/responses'
@@ -23,7 +23,7 @@ def do_check_mode_new_args
       end
     end
 
-    class AXMessageTest < Test::Unit::TestCase
+    class AXMessageTest < Minitest::Test
       def setup
         @bax = BogusAXMessage.new
       end
@@ -38,7 +38,7 @@ def test_check_mode_new_args
       end
     end
 
-    class AttrInfoTest < Test::Unit::TestCase
+    class AttrInfoTest < Minitest::Test
       def test_construct
         assert_raises(ArgumentError) { AttrInfo.new }
         type_uri = 'uri geller'
@@ -51,7 +51,7 @@ def test_construct
       end
     end
 
-    class ToTypeURIsTest < Test::Unit::TestCase
+    class ToTypeURIsTest < Minitest::Test
       def setup
         @aliases = NamespaceMap.new
       end
@@ -91,7 +91,7 @@ def test_two
       end
     end
 
-    class ParseAXValuesTest < Test::Unit::TestCase
+    class ParseAXValuesTest < Minitest::Test
       def ax_values(ax_args, expected_args)
         msg = KeyValueMessage.new
         msg.parse_extension_args(ax_args)
@@ -221,7 +221,7 @@ def singleton_value
       end
     end
 
-    class FetchRequestTest < Test::Unit::TestCase
+    class FetchRequestTest < Minitest::Test
       def setup
         @msg = FetchRequest.new
         @type_a = 'http://janrain.example.com/a'
@@ -483,7 +483,7 @@ def test_add_extension
       end
     end
 
-    class FetchResponseTest < Test::Unit::TestCase
+    class FetchResponseTest < Minitest::Test
       def setup
         @msg = FetchResponse.new
         @value_a = 'commodity'
@@ -675,7 +675,7 @@ def test_from_empty_success_response
       end
     end
 
-    class StoreRequestTest < Test::Unit::TestCase
+    class StoreRequestTest < Minitest::Test
       def setup
         @msg = StoreRequest.new
         @type_a = 'http://oranges.are.for/'
@@ -729,7 +729,7 @@ def test_get_extension_args_nonempty
       end
     end
 
-    class StoreResponseTest < Test::Unit::TestCase
+    class StoreResponseTest < Minitest::Test
       def test_success
         msg = StoreResponse.new
         assert(msg.succeeded?)