ruby-openid 2.6.0 → 2.7.0

data/test/test_filters.rb

@@ -1,11 +1,11 @@
-require "test/unit"
+require "minitest/autorun"
 require "testutil"
 require "rexml/document"
 require "openid/yadis/xrds"
 require "openid/yadis/filters"
 
 module OpenID
-  class BasicServiceEndpointTest < Test::Unit::TestCase
+  class BasicServiceEndpointTest < Minitest::Test
     def test_match_types
       # Make sure the match_types operation returns the expected
       # results with various inputs.
@@ -39,7 +39,7 @@ module OpenID
     end
   end
 
-  class TransformFilterMakerTest < Test::Unit::TestCase
+  class TransformFilterMakerTest < Minitest::Test
     def make_service_element(types, uris)
       service = REXML::Element.new('Service')
       types.each { |type_text|
@@ -143,7 +143,7 @@ module OpenID
     end
   end
 
-  class CompoundFilterTest < Test::Unit::TestCase
+  class CompoundFilterTest < Minitest::Test
     def test_get_service_endpoints
       first = ["bogus", "test"]
       second = ["third"]
@@ -159,7 +159,7 @@ module OpenID
     end
   end
 
-  class MakeFilterTest < Test::Unit::TestCase
+  class MakeFilterTest < Minitest::Test
     def test_parts_nil
       result = Yadis.make_filter(nil)
       assert result.is_a?(Yadis::TransformFilterMaker)
@@ -182,7 +182,7 @@ module OpenID
     end
   end
 
-  class MakeCompoundFilterTest < Test::Unit::TestCase
+  class MakeCompoundFilterTest < Minitest::Test
     def test_no_filters
       result = Yadis.mk_compound_filter([])
       assert result.subfilters == []
@@ -251,7 +251,7 @@ module OpenID
       # Pass various non-filter objects and make sure the filter
       # machinery explodes.
       [nil, ["bogus"], [1], [nil, "bogus"]].each { |thing|
-        assert_raise(TypeError) {
+        assert_raises(TypeError) {
           Yadis.mk_compound_filter(thing)
         }
       }

data/test/test_idres.rb

@@ -1,4 +1,4 @@
-require "test/unit"
+require "minitest/autorun"
 require "testutil"
 require "util"
 require "openid/consumer/idres"
@@ -18,7 +18,7 @@ module OpenID
         end
       end
 
-      class CheckForFieldsTest < Test::Unit::TestCase
+      class CheckForFieldsTest < Minitest::Test
         include ProtocolErrorMixin
 
         BASE_FIELDS = ['return_to', 'assoc_handle', 'sig', 'signed']
@@ -142,21 +142,17 @@ module OpenID
         def test_success_openid1
           msg = mkMsg(OPENID1_NS, OPENID1_FIELDS, OPENID1_SIGNED)
           idres = IdResHandler.new(msg, nil)
-          assert_nothing_raised {
-            idres.send(:check_for_fields)
-          }
+          idres.send(:check_for_fields)
         end
 
         def test_success_openid1_1
           msg = mkMsg(OPENID11_NS, OPENID1_FIELDS, OPENID1_SIGNED)
           idres = IdResHandler.new(msg, nil)
-          assert_nothing_raised {
-            idres.send(:check_for_fields)
-          }
+          idres.send(:check_for_fields)
         end
       end
 
-      class ReturnToArgsTest < Test::Unit::TestCase
+      class ReturnToArgsTest < Minitest::Test
         include OpenID::ProtocolErrorMixin
 
         def check_return_to_args(query)
@@ -175,13 +171,11 @@ module OpenID
         end
 
         def test_return_to_args_okay
-          assert_nothing_raised {
-            check_return_to_args({
-              'openid.mode' => 'id_res',
-              'openid.return_to' => 'http://example.com/?foo=bar',
-              'foo' => 'bar',
-              })
-          }
+          check_return_to_args({
+            'openid.mode' => 'id_res',
+            'openid.return_to' => 'http://example.com/?foo=bar',
+            'foo' => 'bar',
+            })
         end
 
         def test_unexpected_arg_okay
@@ -206,7 +200,7 @@ module OpenID
         end
       end
 
-      class ReturnToVerifyTest < Test::Unit::TestCase
+      class ReturnToVerifyTest < Minitest::Test
         def test_bad_return_to
           return_to = "http://some.url/path?foo=bar"
 
@@ -250,9 +244,7 @@ module OpenID
             args['openid.return_to'] = return_to
             msg = Message.from_post_args(args)
             idres = IdResHandler.new(msg, base)
-            assert_nothing_raised {
-              idres.send(:verify_return_to)
-            }
+            idres.send(:verify_return_to)
           end
         end
       end
@@ -264,7 +256,7 @@ module OpenID
         end
       end
 
-      class CheckSigTest < Test::Unit::TestCase
+      class CheckSigTest < Minitest::Test
         include ProtocolErrorMixin
         include TestUtil
 
@@ -301,9 +293,7 @@ module OpenID
         end
 
         def test_sign_good
-          assert_nothing_raised {
-            call_check_sig(&method(:no_check_auth))
-          }
+          call_check_sig(&method(:no_check_auth))
         end
 
         def test_bad_sig
@@ -423,7 +413,7 @@ module OpenID
 
       end
 
-      class CheckAuthResponseTest < Test::Unit::TestCase
+      class CheckAuthResponseTest < Minitest::Test
         include TestUtil
         include ProtocolErrorMixin
 
@@ -482,7 +472,7 @@ module OpenID
         end
       end
 
-      class NonceTest < Test::Unit::TestCase
+      class NonceTest < Minitest::Test
         include TestUtil
         include ProtocolErrorMixin
 
@@ -513,9 +503,7 @@ module OpenID
            {'openid.ns' => OPENID1_NS},
            {'openid.ns' => OPENID11_NS}
           ].each do |args|
-            assert_nothing_raised {
-              call_check_nonce({'rp_nonce' => @nonce}.merge(args), true)
-            }
+            call_check_nonce({'rp_nonce' => @nonce}.merge(args), true)
           end
         end
 
@@ -536,10 +524,8 @@ module OpenID
         end
 
         def test_openid2_success
-          assert_nothing_raised {
-            call_check_nonce({'openid.response_nonce' => @nonce,
-                               'openid.ns' => OPENID2_NS}, true)
-          }
+          call_check_nonce({'openid.response_nonce' => @nonce,
+                             'openid.ns' => OPENID2_NS}, true)
         end
 
         def test_openid1_ignore_response_nonce
@@ -555,9 +541,7 @@ module OpenID
 
         def test_no_store
           @store = nil
-          assert_nothing_raised {
-            call_check_nonce({'rp_nonce' => @nonce})
-          }
+          call_check_nonce({'rp_nonce' => @nonce})
         end
 
         def test_already_used
@@ -573,7 +557,7 @@ module OpenID
         end
       end
 
-      class DiscoveryVerificationTest < Test::Unit::TestCase
+      class DiscoveryVerificationTest < Minitest::Test
         include ProtocolErrorMixin
         include TestUtil
 
@@ -875,7 +859,7 @@ module OpenID
         end
       end
 
-      class IdResTopLevelTest < Test::Unit::TestCase
+      class IdResTopLevelTest < Minitest::Test
         def test_id_res
           endpoint = OpenIDServiceEndpoint.new
           endpoint.server_url = 'http://invalid/server'
@@ -919,9 +903,10 @@ module OpenID
       end
 
 
-      class DiscoverAndVerifyTest < Test::Unit::TestCase
+      class DiscoverAndVerifyTest < Minitest::Test
         include ProtocolErrorMixin
         include TestUtil
+        OpenID.extend(OverrideMethodMixin)
 
         def test_no_services
           me = self
@@ -942,7 +927,7 @@ module OpenID
         end
       end
 
-      class VerifyDiscoveredServicesTest < Test::Unit::TestCase
+      class VerifyDiscoveredServicesTest < Minitest::Test
         include ProtocolErrorMixin
         include TestUtil
 

data/test/test_kvform.rb

@@ -1,11 +1,11 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'openid/kvform'
 require 'openid/util'
 require 'util'
 
 include OpenID
 
-class KVFormTests < Test::Unit::TestCase
+class KVFormTests < Minitest::Test
   include OpenID::TestUtil
 
   def test_kvdict
@@ -57,7 +57,7 @@ class KVFormTests < Test::Unit::TestCase
       # Strict mode should raise KVFormError instead of logging
       # messages
       if warnings > 0
-        assert_raise(KVFormError) do
+        assert_raises(KVFormError) do
           Util.kv_to_seq(kv, true)
         end
       end
@@ -120,7 +120,7 @@ class KVFormTests < Test::Unit::TestCase
       # Strict mode should raise KVFormError instead of logging
       # messages
       if warnings > 0
-        assert_raise(KVFormError) do
+        assert_raises(KVFormError) do
           Util.seq_to_kv(seq, true)
         end
       end
@@ -151,7 +151,7 @@ class KVFormTests < Test::Unit::TestCase
   def _run_kvexcTest(case_)
     seq = case_
 
-    assert_raise(KVFormError) do
+    assert_raises(KVFormError) do
       Util.seq_to_kv(seq)
     end
   end

data/test/test_kvpost.rb

@@ -1,11 +1,11 @@
-require "test/unit"
+require "minitest/autorun"
 require "testutil"
 require "openid/kvpost"
 require "openid/kvform"
 require "openid/message"
 
 module OpenID
-  class KVPostTestCase < Test::Unit::TestCase
+  class KVPostTestCase < Minitest::Test
     include FetcherMixin
 
     def mk_resp(status, resp_hash)

data/test/test_linkparse.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'testutil'
 require 'openid/consumer/html_parse'
 
-class LinkParseTestCase < Test::Unit::TestCase
+class LinkParseTestCase < Minitest::Test
   include OpenID::TestDataMixin
 
   def attr_cmp(expected, found)
@@ -105,9 +105,7 @@ class LinkParseTestCase < Test::Unit::TestCase
     else
       html = "<html><body>hello joel\255</body></html>"
     end
-    assert_nothing_raised do 
-      OpenID::parse_link_attrs(html)
-    end
+    OpenID::parse_link_attrs(html)
 
   end
 end

data/test/test_message.rb

@@ -1,5 +1,5 @@
 # last synced with Python openid.test.test_message on 6/29/2007.
-require 'test/unit'
+require 'minitest/autorun'
 require 'util'
 require 'openid/message'
 require 'rexml/document'
@@ -14,7 +14,7 @@ module OpenID
 
       if expected.nil?
         assert_equal(@m.get_arg(ns, key, :a_default), :a_default)
-        assert_raise(Message::KeyNotFound) { @m.get_arg(ns, key, NO_DEFAULT) }
+        assert_raises(Message::KeyNotFound) { @m.get_arg(ns, key, NO_DEFAULT) }
       else
         assert_equal(@m.get_arg(ns, key, :a_default), expected)
         assert_equal(@m.get_arg(ns, key, NO_DEFAULT), expected)
@@ -24,7 +24,7 @@ module OpenID
 
   end
 
-  class EmptyMessageTestCase < Test::Unit::TestCase
+  class EmptyMessageTestCase < Minitest::Test
     include GetArgsMixin
 
     def setup
@@ -77,7 +77,7 @@ module OpenID
     end
 
     def test_get_key_openid
-      assert_raise(UndefinedOpenIDNamespace) {
+      assert_raises(UndefinedOpenIDNamespace) {
         @m.get_key(OPENID_NS, nil)
       }
     end
@@ -99,7 +99,7 @@ module OpenID
     end
 
     def test_has_key
-      assert_raise(UndefinedOpenIDNamespace) {
+      assert_raises(UndefinedOpenIDNamespace) {
         @m.has_key?(OPENID_NS, 'foo')
       }
     end
@@ -121,7 +121,7 @@ module OpenID
     end
 
     def test_get_arg
-      assert_raise(UndefinedOpenIDNamespace) {
+      assert_raises(UndefinedOpenIDNamespace) {
         @m.get_args(OPENID_NS)
       }
     end
@@ -143,7 +143,7 @@ module OpenID
     end
 
     def test_get_args
-      assert_raise(UndefinedOpenIDNamespace) {
+      assert_raises(UndefinedOpenIDNamespace) {
         @m.get_args(OPENID_NS)
       }
     end
@@ -165,7 +165,7 @@ module OpenID
     end
 
     def test_update_args
-      assert_raise(UndefinedOpenIDNamespace) {
+      assert_raises(UndefinedOpenIDNamespace) {
         @m.update_args(OPENID_NS, {'does not'=>'matter'})
       }
     end
@@ -194,7 +194,7 @@ module OpenID
     end
 
     def test_set_arg
-      assert_raise(UndefinedOpenIDNamespace) {
+      assert_raises(UndefinedOpenIDNamespace) {
         @m.set_arg(OPENID_NS,'does not','matter')
       }
     end
@@ -221,7 +221,7 @@ module OpenID
     end
 
     def test_del_arg
-      assert_raise(UndefinedOpenIDNamespace) {
+      assert_raises(UndefinedOpenIDNamespace) {
         @m.set_arg(OPENID_NS, 'does not', 'matter')
       }
     end
@@ -253,13 +253,13 @@ module OpenID
     end
 
     def test_set_openid_namespace
-      assert_raise(InvalidOpenIDNamespace) {
+      assert_raises(InvalidOpenIDNamespace) {
         @m.set_openid_namespace('http://invalid/', false)
       }
     end
   end
 
-  class OpenID1MessageTest < Test::Unit::TestCase
+  class OpenID1MessageTest < Minitest::Test
     include GetArgsMixin
 
     def setup
@@ -497,7 +497,7 @@ module OpenID
 
     def test_equal
       assert_equal(Message.new, Message.new)
-      assert_not_equal(Message.new, nil)
+      refute_equal(Message.new, nil)
     end
 
     def test_from_openid_args_undefined_ns
@@ -520,7 +520,7 @@ module OpenID
     end
   end
 
-  class OpenID1ExplicitMessageTest < Test::Unit::TestCase
+  class OpenID1ExplicitMessageTest < Minitest::Test
     # XXX - check to make sure the test suite will get built the way this
     # expects.
     def setup
@@ -586,7 +586,7 @@ module OpenID
 
   end
 
-  class OpenID2MessageTest < Test::Unit::TestCase
+  class OpenID2MessageTest < Minitest::Test
     include TestUtil
 
     def setup
@@ -837,7 +837,7 @@ module OpenID
         # .fromPostArgs covers .fromPostArgs, .fromOpenIDArgs,
         # ._fromOpenIDArgs, and .fromOpenIDArgs (since it calls
         # .fromPostArgs).
-        assert_raise(AssertionError) {
+        assert_raises(AssertionError) {
           Message.from_post_args(args)
         }
       }
@@ -877,7 +877,7 @@ module OpenID
     end
 
     def test_argList
-      assert_raise(ArgumentError) {
+      assert_raises(ArgumentError) {
         Message.from_post_args({'arg' => [1, 2, 3]})
       }
     end
@@ -891,7 +891,7 @@ module OpenID
     end
   end
 
-  class MessageTest < Test::Unit::TestCase
+  class MessageTest < Minitest::Test
     def setup
       @postargs = {
         'openid.ns' => OPENID2_NS,
@@ -1042,7 +1042,7 @@ module OpenID
     end
   end
 
-  class NamespaceMapTestCase < Test::Unit::TestCase
+  class NamespaceMapTestCase < Minitest::Test
 
     def test_onealias
       nsm = NamespaceMap.new