ruby-openid 2.6.0 → 2.7.0

data/test/test_checkid_request.rb

@@ -1,4 +1,4 @@
-require "test/unit"
+require "minitest/autorun"
 require "openid/consumer/checkid_request"
 require "openid/message"
 require "testutil"
@@ -135,7 +135,7 @@ module OpenID
         end
       end
 
-      class TestCheckIDRequestOpenID2 < Test::Unit::TestCase
+      class TestCheckIDRequestOpenID2 < Minitest::Test
         include CheckIDTestMixin
 
         def immediate
@@ -167,8 +167,8 @@ module OpenID
         # OpenID Checkid_Requests should be able to set 'anonymous' to true.
         def test_set_anonymous_works_for_openid2
           assert(@checkid_req.message.is_openid2)
-          assert_nothing_raised {@checkid_req.anonymous = true}
-          assert_nothing_raised {@checkid_req.anonymous = false}
+          @checkid_req.anonymous = true
+          @checkid_req.anonymous = false
         end
 
         def test_user_anonymous_ignores_identfier
@@ -207,7 +207,7 @@ module OpenID
         end
       end
 
-      class TestCheckIDRequestOpenID1 < Test::Unit::TestCase
+      class TestCheckIDRequestOpenID1 < Minitest::Test
         include CheckIDTestMixin
 
         def immediate
@@ -248,9 +248,7 @@ module OpenID
           assert_raises(ArgumentError) {
             @checkid_req.anonymous = true
           }
-          assert_nothing_raised{
-            @checkid_req.anonymous = false
-          }
+          @checkid_req.anonymous = false
         end
 
         # Identfier select SHOULD NOT be sent, but this pathway is in

data/test/test_consumer.rb

@@ -1,11 +1,11 @@
-require "test/unit"
+require "minitest/autorun"
 require "testutil"
 require "openid/consumer"
 
 module OpenID
   class Consumer
     module TestConsumer
-      class TestLastEndpoint < Test::Unit::TestCase
+      class TestLastEndpoint < Minitest::Test
         def test_set_get
           session = {}
           consumer = Consumer.new(session, nil)
@@ -20,7 +20,7 @@ module OpenID
         end
       end
 
-      class TestBegin < Test::Unit::TestCase
+      class TestBegin < Minitest::Test
         attr_accessor :user_input, :anonymous, :services,
           :discovered_identifier, :checkid_request, :service
 
@@ -79,7 +79,7 @@ module OpenID
         end
       end
 
-      class TestBeginWithoutDiscovery < Test::Unit::TestCase
+      class TestBeginWithoutDiscovery < Minitest::Test
         attr_reader :assoc
         def setup
           @session = {}
@@ -154,7 +154,7 @@ module OpenID
         end
       end
 
-      class TestComplete < Test::Unit::TestCase
+      class TestComplete < Minitest::Test
         def setup
           @session = {}
           @consumer = Consumer.new(@session, nil)

data/test/test_cryptutil.rb

@@ -1,9 +1,9 @@
 # coding: ASCII-8BIT
-require "test/unit"
+require "minitest/autorun"
 require "openid/cryptutil"
 require "pathname"
 
-class CryptUtilTestCase < Test::Unit::TestCase
+class CryptUtilTestCase < Minitest::Test
   BIG = 2 ** 256
 
   def test_rand
@@ -16,7 +16,7 @@ class CryptUtilTestCase < Test::Unit::TestCase
     b = OpenID::CryptUtil.rand(BIG)
     assert(a.is_a?(Bignum))
     assert(b.is_a?(Bignum))
-    assert_not_equal(a, b)
+    refute_equal(a, b)
   end
 
   def test_rand_doesnt_depend_on_srand
@@ -24,7 +24,7 @@ class CryptUtilTestCase < Test::Unit::TestCase
     a = OpenID::CryptUtil.rand(BIG)
     Kernel.srand(1)
     b = OpenID::CryptUtil.rand(BIG)
-    assert_not_equal(a, b)
+    refute_equal(a, b)
   end
 
   def test_random_binary_convert
@@ -89,7 +89,7 @@ class CryptUtilTestCase < Test::Unit::TestCase
     assert_equal(42, s1.length)
     s2 = OpenID::CryptUtil.random_string(42)
     assert_equal(42, s2.length)
-    assert_not_equal(s1, s2)
+    refute_equal(s1, s2)
   end
 
   def test_randomstring_population

data/test/test_dh.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'testutil'
 require 'openid/dh'
 
@@ -9,7 +9,7 @@ module OpenID
     end
   end
 
-  class DiffieHellmanTestCase < Test::Unit::TestCase
+  class DiffieHellmanTestCase < Minitest::Test
     include OpenID::TestDataMixin
 
     NUL = "\x00"

data/test/test_discover.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'testutil'
 require 'util'
 require 'openid/fetchers'
@@ -26,7 +26,7 @@ module OpenID
     end
   end
 
-  class TestDiscoveryFailure < Test::Unit::TestCase
+  class TestDiscoveryFailure < Minitest::Test
     def initialize(*args)
       super(*args)
 
@@ -80,7 +80,7 @@ module OpenID
     # Custom exception just to make sure it's not handled differently
   end
 
-  class TestFetchException < Test::Unit::TestCase
+  class TestFetchException < Minitest::Test
     # Discovery should only raise DiscoveryFailure
 
     def initialize(*args)
@@ -107,7 +107,7 @@ module OpenID
 
   ### Tests for openid.consumer.discover.discover
 
-  class TestNormalization < Test::Unit::TestCase
+  class TestNormalization < Minitest::Test
     def test_addingProtocol
       f = ErrorRaisingFetcher.new(RuntimeError.new())
       OpenID.fetcher = f
@@ -152,7 +152,7 @@ module OpenID
     end
   end
 
-  class BaseTestDiscovery < Test::Unit::TestCase
+  class BaseTestDiscovery < Minitest::Test
     attr_accessor :id_url, :fetcher_class
 
     def initialize(*args)
@@ -247,7 +247,7 @@ module OpenID
     end
 
     def test_404
-      assert_raise(DiscoveryFailure) {
+      assert_raises(DiscoveryFailure) {
         OpenID.discover(@id_url + '/404')
       }
     end
@@ -475,7 +475,7 @@ module OpenID
     end
 
     def test_yadis2BadLocalID
-      assert_raise(DiscoveryFailure) {
+      assert_raises(DiscoveryFailure) {
         _discover('application/xrds+xml',
                   read_data_file('test_discover/yadis_2_bad_local_id.xml', false),
                   1)
@@ -497,7 +497,7 @@ module OpenID
     end
 
     def test_yadis1And2BadLocalID
-      assert_raise(DiscoveryFailure) {
+      assert_raises(DiscoveryFailure) {
         _discover('application/xrds+xml',
                   read_data_file('test_discover/openid_1_and_2_xrds_bad_delegate.xml', false),
                   1)
@@ -525,7 +525,7 @@ module OpenID
                                 "mean to do that.")
       end
 
-      if xri.starts_with?('/')
+      if xri.start_with?('/')
         xri = xri[1..-1]
       end
 
@@ -641,7 +641,7 @@ module OpenID
     end
   end
 
-  class TestPreferredNamespace < Test::Unit::TestCase
+  class TestPreferredNamespace < Minitest::Test
     def initialize(*args)
       super(*args)
 
@@ -670,7 +670,7 @@ module OpenID
     end
   end
 
-  class TestIsOPIdentifier < Test::Unit::TestCase
+  class TestIsOPIdentifier < Minitest::Test
     def setup
       @endpoint = OpenIDServiceEndpoint.new()
     end
@@ -713,7 +713,7 @@ module OpenID
     end
   end
 
-  class TestFromOPEndpointURL < Test::Unit::TestCase
+  class TestFromOPEndpointURL < Minitest::Test
     def setup
       @op_endpoint_url = 'http://example.com/op/endpoint'
       @endpoint = OpenIDServiceEndpoint.from_op_endpoint_url(@op_endpoint_url)
@@ -741,18 +741,14 @@ module OpenID
     end
   end
 
-  class TestDiscoverFunction < Test::Unit::TestCase
+  class TestDiscoverFunction < Minitest::Test
     def test_discover_function
       # XXX these were all different tests in python, but they're
       # combined here so I only have to use with_method_overridden
       # once.
-      discoverXRI = Proc.new { |identifier|
-        return 'XRI'
-      }
+      discoverXRI = Proc.new { |identifier| 'XRI' }
 
-      discoverURI = Proc.new { |identifier|
-        return 'URI'
-      }
+      discoverURI = Proc.new { |identifier| 'URI' }
 
       OpenID.extend(OverrideMethodMixin)
 
@@ -767,7 +763,7 @@ module OpenID
     end
   end
 
-  class TestEndpointSupportsType < Test::Unit::TestCase
+  class TestEndpointSupportsType < Minitest::Test
     def setup
       @endpoint = OpenIDServiceEndpoint.new()
     end
@@ -830,7 +826,7 @@ module OpenID
     end
   end
 
-  class TestEndpointDisplayIdentifier < Test::Unit::TestCase
+  class TestEndpointDisplayIdentifier < Minitest::Test
     def test_strip_fragment
       @endpoint = OpenIDServiceEndpoint.new()
       @endpoint.claimed_id = 'http://recycled.invalid/#123'
@@ -839,9 +835,9 @@ module OpenID
   end
 
 
-  class TestNormalizeURL < Test::Unit::TestCase
+  class TestNormalizeURL < Minitest::Test
     def test_no_host
-      assert_raise(DiscoveryFailure) {
+      assert_raises(DiscoveryFailure) {
         OpenID::normalize_url('http:///too-many.invalid/slashes')
       }
     end

data/test/test_discovery_manager.rb

@@ -1,10 +1,9 @@
-require 'test/unit'
-require 'openid/consumer/discovery_manager'
-require 'openid/extras'
+require 'minitest/autorun'
+require 'openid/consumer'
 require 'testutil'
 
 module OpenID
-  class TestDiscoveredServices < Test::Unit::TestCase
+  class TestDiscoveredServices < Minitest::Test
     def setup
       @starting_url = "http://starting.url.com/"
       @yadis_url = "http://starting.url.com/xrds"
@@ -64,7 +63,7 @@ module OpenID
     end
   end
 
-  class TestDiscoveryManager < Test::Unit::TestCase
+  class TestDiscoveryManager < Minitest::Test
     def setup
       session = {}
       @session = OpenID::Consumer::Session.new(session, OpenID::Consumer::DiscoveredServices)
@@ -198,7 +197,7 @@ module OpenID
 
       # Calling create_manager with a preexisting manager should
       # result in StandardError.
-      assert_raise(StandardError) {
+      assert_raises(StandardError) {
         @manager.create_manager(@yadis_url, services)
       }
 
@@ -234,7 +233,7 @@ module OpenID
     end
 
     def test_session_key
-      assert(@manager.session_key.ends_with?(
+      assert(@manager.session_key.end_with?(
                @manager.instance_variable_get("@session_key_suffix")))
     end
 

data/test/test_extension.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'openid/extension'
 require 'openid/message'
 
@@ -16,7 +16,7 @@ module OpenID
     end
   end
 
-  class ToMessageTest < Test::Unit::TestCase
+  class ToMessageTest < Minitest::Test
      def test_OpenID1
        oid1_msg = Message.new(OPENID1_NS)
        ext = DummyExtension.new

data/test/test_fetchers.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'test/unit'
+require 'minitest/autorun'
 require 'net/http'
 require 'webrick'
 require 'testutil'
@@ -35,7 +35,7 @@ class BogusFetcher
   end
 end
 
-class FetcherTestCase < Test::Unit::TestCase
+class FetcherTestCase < Minitest::Test
   include HttpResultAssertions
   include OpenID::TestUtil
 
@@ -107,7 +107,7 @@ class FetcherTestCase < Test::Unit::TestCase
       resp.status = 302
       resp['Location'] = _uri_build('/redirect_loop')
       resp.body = "Fetched #{@_redirect_counter} times."
-      assert_block("Fetched too many times.") { @_redirect_counter < 10 }
+      assert @_redirect_counter < 10, "Fetched too many times."
     }
   end
 
@@ -243,8 +243,8 @@ EOHTML
   def test_redirect_limit
     @_redirect_counter = 0
     uri = _uri_build('/redirect_loop')
-    assert_raise(OpenID::HTTPRedirectLimitReached) {
-      @fetcher.fetch(uri)
+    assert_raises(OpenID::HTTPRedirectLimitReached) {
+      @fetcher.fetch(uri, body=nil, headers=nil, redirect_limit=0)
     }
   end
 
@@ -294,7 +294,7 @@ EOHTML
 
       begin
         assert_http_result_is expected, result
-      rescue Test::Unit::AssertionFailedError => err
+      rescue Minitest::Assertion => err
         if result.code == '500' && expected_code != 500
           # Looks like our WEBrick harness broke.
           msg = <<EOF
@@ -306,7 +306,7 @@ EOF
 
         # Wrap failure messages so we can tell which case failed.
         new_msg = "#{path}: #{err.message.to_s}"
-        new_err = Test::Unit::AssertionFailedError.new(new_msg)
+        new_err = Minitest::Assertion.new(new_msg)
         new_err.set_backtrace(err.backtrace)
         raise new_err
       end
@@ -399,7 +399,7 @@ EOF
       nil
     end
 
-    assert_raise(RuntimeError) {
+    assert_raises(RuntimeError) {
       f.make_connection(URI::parse("http://example.com/"))
     }
   end
@@ -412,7 +412,7 @@ EOF
       "not a Net::HTTP object"
     end
 
-    assert_raise(RuntimeError) {
+    assert_raises(RuntimeError) {
       f.make_connection(URI::parse("http://example.com/"))
     }
   end
@@ -431,7 +431,7 @@ EOF
       BrokenSSLConnection.new
     end
 
-    assert_raise(OpenID::SSLFetchingError) {
+    assert_raises(OpenID::SSLFetchingError) {
       f.fetch("https://bogus.com/")
     }
   end
@@ -450,7 +450,7 @@ EOF
       TimeoutConnection.new
     end
 
-    assert_raise(OpenID::FetchingError) {
+    assert_raises(OpenID::FetchingError) {
       f.fetch("https://bogus.com/")
     }
   end
@@ -494,7 +494,7 @@ EOF
     end
 
     # post_connection_check should not be called.
-    assert_raise(TestingException) {
+    assert_raises(TestingException) {
       f.fetch("https://bogus.com/")
     }
   end
@@ -508,7 +508,7 @@ EOF
     end
 
     # post_connection_check should not be called.
-    assert_raise(TestingException) {
+    assert_raises(TestingException) {
       f.fetch("https://bogus.com/")
     }
   end
@@ -538,13 +538,13 @@ EOF
     end
 
     # post_connection_check should be called.
-    assert_raise(PostConnectionCheckException) {
+    assert_raises(PostConnectionCheckException) {
       f.fetch("https://bogus.com/")
     }
   end
 end
 
-class DefaultFetcherTest < Test::Unit::TestCase
+class DefaultFetcherTest < Minitest::Test
   def setup
     OpenID.fetcher = nil
   end
@@ -564,7 +564,7 @@ class DefaultFetcherTest < Test::Unit::TestCase
   end
 end
 
-class ProxyTest < Test::Unit::TestCase
+class ProxyTest < Minitest::Test
   def test_proxy_unreachable
     begin
       f = OpenID::StandardFetcher.new('127.0.0.1', 1)