diff --git a/test/testutil.rb b/test/support/test_data_mixin.rb similarity index 98% rename from test/testutil.rb rename to test/support/test_data_mixin.rb index 7676fb95..6036a649 100644 --- a/test/testutil.rb +++ b/test/support/test_data_mixin.rb @@ -3,7 +3,7 @@ module OpenID module TestDataMixin TESTS_DIR = Pathname.new(__FILE__).dirname - TEST_DATA_DIR = Pathname.new('data') + TEST_DATA_DIR = Pathname.new('yadis_data') def read_data_file(filename, lines=true, data_dir=TEST_DATA_DIR) fname = TESTS_DIR.join(data_dir, filename) diff --git a/test/util.rb b/test/support/test_util.rb similarity index 100% rename from test/util.rb rename to test/support/test_util.rb diff --git a/test/discoverdata.rb b/test/support/yadis_data.rb similarity index 99% rename from test/discoverdata.rb rename to test/support/yadis_data.rb index 7b21749f..a5714eb9 100644 --- a/test/discoverdata.rb +++ b/test/support/yadis_data.rb @@ -7,10 +7,10 @@ module OpenID - module DiscoverData + module YadisData include TestDataMixin - include Util + include TestUtil TESTLIST = [ # success, input_name, id_name, result_name diff --git a/test/data/accept.txt b/test/support/yadis_data/accept.txt similarity index 100% rename from test/data/accept.txt rename to test/support/yadis_data/accept.txt diff --git a/test/data/dh.txt b/test/support/yadis_data/dh.txt similarity index 100% rename from test/data/dh.txt rename to test/support/yadis_data/dh.txt diff --git a/test/data/example-xrds.xml b/test/support/yadis_data/example-xrds.xml similarity index 100% rename from test/data/example-xrds.xml rename to test/support/yadis_data/example-xrds.xml diff --git a/test/data/linkparse.txt b/test/support/yadis_data/linkparse.txt similarity index 100% rename from test/data/linkparse.txt rename to test/support/yadis_data/linkparse.txt diff --git a/test/data/n2b64 b/test/support/yadis_data/n2b64 similarity index 100% rename from test/data/n2b64 rename to test/support/yadis_data/n2b64 diff --git a/test/data/test1-discover.txt b/test/support/yadis_data/test1-discover.txt similarity index 100% rename from test/data/test1-discover.txt rename to test/support/yadis_data/test1-discover.txt diff --git a/test/data/test1-parsehtml.txt b/test/support/yadis_data/test1-parsehtml.txt similarity index 100% rename from test/data/test1-parsehtml.txt rename to test/support/yadis_data/test1-parsehtml.txt diff --git a/test/data/test_discover/malformed_meta_tag.html b/test/support/yadis_data/test_discover/malformed_meta_tag.html similarity index 100% rename from test/data/test_discover/malformed_meta_tag.html rename to test/support/yadis_data/test_discover/malformed_meta_tag.html diff --git a/test/data/test_discover/openid.html b/test/support/yadis_data/test_discover/openid.html similarity index 100% rename from test/data/test_discover/openid.html rename to test/support/yadis_data/test_discover/openid.html diff --git a/test/data/test_discover/openid2.html b/test/support/yadis_data/test_discover/openid2.html similarity index 100% rename from test/data/test_discover/openid2.html rename to test/support/yadis_data/test_discover/openid2.html diff --git a/test/data/test_discover/openid2_xrds.xml b/test/support/yadis_data/test_discover/openid2_xrds.xml similarity index 100% rename from test/data/test_discover/openid2_xrds.xml rename to test/support/yadis_data/test_discover/openid2_xrds.xml diff --git a/test/data/test_discover/openid2_xrds_no_local_id.xml b/test/support/yadis_data/test_discover/openid2_xrds_no_local_id.xml similarity index 100% rename from test/data/test_discover/openid2_xrds_no_local_id.xml rename to test/support/yadis_data/test_discover/openid2_xrds_no_local_id.xml diff --git a/test/data/test_discover/openid_1_and_2.html b/test/support/yadis_data/test_discover/openid_1_and_2.html similarity index 100% rename from test/data/test_discover/openid_1_and_2.html rename to test/support/yadis_data/test_discover/openid_1_and_2.html diff --git a/test/data/test_discover/openid_1_and_2_xrds.xml b/test/support/yadis_data/test_discover/openid_1_and_2_xrds.xml similarity index 100% rename from test/data/test_discover/openid_1_and_2_xrds.xml rename to test/support/yadis_data/test_discover/openid_1_and_2_xrds.xml diff --git a/test/data/test_discover/openid_1_and_2_xrds_bad_delegate.xml b/test/support/yadis_data/test_discover/openid_1_and_2_xrds_bad_delegate.xml similarity index 100% rename from test/data/test_discover/openid_1_and_2_xrds_bad_delegate.xml rename to test/support/yadis_data/test_discover/openid_1_and_2_xrds_bad_delegate.xml diff --git a/test/data/test_discover/openid_and_yadis.html b/test/support/yadis_data/test_discover/openid_and_yadis.html similarity index 100% rename from test/data/test_discover/openid_and_yadis.html rename to test/support/yadis_data/test_discover/openid_and_yadis.html diff --git a/test/data/test_discover/openid_no_delegate.html b/test/support/yadis_data/test_discover/openid_no_delegate.html similarity index 100% rename from test/data/test_discover/openid_no_delegate.html rename to test/support/yadis_data/test_discover/openid_no_delegate.html diff --git a/test/data/test_discover/yadis_0entries.xml b/test/support/yadis_data/test_discover/yadis_0entries.xml similarity index 100% rename from test/data/test_discover/yadis_0entries.xml rename to test/support/yadis_data/test_discover/yadis_0entries.xml diff --git a/test/data/test_discover/yadis_2_bad_local_id.xml b/test/support/yadis_data/test_discover/yadis_2_bad_local_id.xml similarity index 100% rename from test/data/test_discover/yadis_2_bad_local_id.xml rename to test/support/yadis_data/test_discover/yadis_2_bad_local_id.xml diff --git a/test/data/test_discover/yadis_2entries_delegate.xml b/test/support/yadis_data/test_discover/yadis_2entries_delegate.xml similarity index 100% rename from test/data/test_discover/yadis_2entries_delegate.xml rename to test/support/yadis_data/test_discover/yadis_2entries_delegate.xml diff --git a/test/data/test_discover/yadis_2entries_idp.xml b/test/support/yadis_data/test_discover/yadis_2entries_idp.xml similarity index 100% rename from test/data/test_discover/yadis_2entries_idp.xml rename to test/support/yadis_data/test_discover/yadis_2entries_idp.xml diff --git a/test/data/test_discover/yadis_another_delegate.xml b/test/support/yadis_data/test_discover/yadis_another_delegate.xml similarity index 100% rename from test/data/test_discover/yadis_another_delegate.xml rename to test/support/yadis_data/test_discover/yadis_another_delegate.xml diff --git a/test/data/test_discover/yadis_idp.xml b/test/support/yadis_data/test_discover/yadis_idp.xml similarity index 100% rename from test/data/test_discover/yadis_idp.xml rename to test/support/yadis_data/test_discover/yadis_idp.xml diff --git a/test/data/test_discover/yadis_idp_delegate.xml b/test/support/yadis_data/test_discover/yadis_idp_delegate.xml similarity index 100% rename from test/data/test_discover/yadis_idp_delegate.xml rename to test/support/yadis_data/test_discover/yadis_idp_delegate.xml diff --git a/test/data/test_discover/yadis_no_delegate.xml b/test/support/yadis_data/test_discover/yadis_no_delegate.xml similarity index 100% rename from test/data/test_discover/yadis_no_delegate.xml rename to test/support/yadis_data/test_discover/yadis_no_delegate.xml diff --git a/test/data/test_xrds/=j3h.2007.11.14.xrds b/test/support/yadis_data/test_xrds/=j3h.2007.11.14.xrds similarity index 100% rename from test/data/test_xrds/=j3h.2007.11.14.xrds rename to test/support/yadis_data/test_xrds/=j3h.2007.11.14.xrds diff --git a/test/data/test_xrds/README b/test/support/yadis_data/test_xrds/README similarity index 100% rename from test/data/test_xrds/README rename to test/support/yadis_data/test_xrds/README diff --git a/test/data/test_xrds/delegated-20060809-r1.xrds b/test/support/yadis_data/test_xrds/delegated-20060809-r1.xrds similarity index 100% rename from test/data/test_xrds/delegated-20060809-r1.xrds rename to test/support/yadis_data/test_xrds/delegated-20060809-r1.xrds diff --git a/test/data/test_xrds/delegated-20060809-r2.xrds b/test/support/yadis_data/test_xrds/delegated-20060809-r2.xrds similarity index 100% rename from test/data/test_xrds/delegated-20060809-r2.xrds rename to test/support/yadis_data/test_xrds/delegated-20060809-r2.xrds diff --git a/test/data/test_xrds/delegated-20060809.xrds b/test/support/yadis_data/test_xrds/delegated-20060809.xrds similarity index 100% rename from test/data/test_xrds/delegated-20060809.xrds rename to test/support/yadis_data/test_xrds/delegated-20060809.xrds diff --git a/test/data/test_xrds/no-xrd.xml b/test/support/yadis_data/test_xrds/no-xrd.xml similarity index 100% rename from test/data/test_xrds/no-xrd.xml rename to test/support/yadis_data/test_xrds/no-xrd.xml diff --git a/test/data/test_xrds/not-xrds.xml b/test/support/yadis_data/test_xrds/not-xrds.xml similarity index 100% rename from test/data/test_xrds/not-xrds.xml rename to test/support/yadis_data/test_xrds/not-xrds.xml diff --git a/test/data/test_xrds/prefixsometimes.xrds b/test/support/yadis_data/test_xrds/prefixsometimes.xrds similarity index 100% rename from test/data/test_xrds/prefixsometimes.xrds rename to test/support/yadis_data/test_xrds/prefixsometimes.xrds diff --git a/test/data/test_xrds/ref.xrds b/test/support/yadis_data/test_xrds/ref.xrds similarity index 100% rename from test/data/test_xrds/ref.xrds rename to test/support/yadis_data/test_xrds/ref.xrds diff --git a/test/data/test_xrds/sometimesprefix.xrds b/test/support/yadis_data/test_xrds/sometimesprefix.xrds similarity index 100% rename from test/data/test_xrds/sometimesprefix.xrds rename to test/support/yadis_data/test_xrds/sometimesprefix.xrds diff --git a/test/data/test_xrds/spoof1.xrds b/test/support/yadis_data/test_xrds/spoof1.xrds similarity index 100% rename from test/data/test_xrds/spoof1.xrds rename to test/support/yadis_data/test_xrds/spoof1.xrds diff --git a/test/data/test_xrds/spoof2.xrds b/test/support/yadis_data/test_xrds/spoof2.xrds similarity index 100% rename from test/data/test_xrds/spoof2.xrds rename to test/support/yadis_data/test_xrds/spoof2.xrds diff --git a/test/data/test_xrds/spoof3.xrds b/test/support/yadis_data/test_xrds/spoof3.xrds similarity index 100% rename from test/data/test_xrds/spoof3.xrds rename to test/support/yadis_data/test_xrds/spoof3.xrds diff --git a/test/data/test_xrds/status222.xrds b/test/support/yadis_data/test_xrds/status222.xrds similarity index 100% rename from test/data/test_xrds/status222.xrds rename to test/support/yadis_data/test_xrds/status222.xrds diff --git a/test/data/test_xrds/subsegments.xrds b/test/support/yadis_data/test_xrds/subsegments.xrds similarity index 100% rename from test/data/test_xrds/subsegments.xrds rename to test/support/yadis_data/test_xrds/subsegments.xrds diff --git a/test/data/test_xrds/valid-populated-xrds.xml b/test/support/yadis_data/test_xrds/valid-populated-xrds.xml similarity index 100% rename from test/data/test_xrds/valid-populated-xrds.xml rename to test/support/yadis_data/test_xrds/valid-populated-xrds.xml diff --git a/test/data/trustroot.txt b/test/support/yadis_data/trustroot.txt similarity index 100% rename from test/data/trustroot.txt rename to test/support/yadis_data/trustroot.txt diff --git a/test/data/urinorm.txt b/test/support/yadis_data/urinorm.txt similarity index 100% rename from test/data/urinorm.txt rename to test/support/yadis_data/urinorm.txt diff --git a/test/test_accept.rb b/test/test_accept.rb index 06db85bf..ce1cf159 100644 --- a/test/test_accept.rb +++ b/test/test_accept.rb @@ -1,5 +1,4 @@ - -require 'test/unit' +require "test_helper" require 'openid/yadis/accept' require 'openid/extras' require 'openid/util' diff --git a/test/test_association.rb b/test/test_association.rb index 1b273321..3a390ee7 100644 --- a/test/test_association.rb +++ b/test/test_association.rb @@ -1,4 +1,5 @@ -require "test/unit" +require 'test_helper' +require 'support/test_util' require "openid/association" module OpenID diff --git a/test/test_associationmanager.rb b/test/test_associationmanager.rb index 041449ff..d9743297 100644 --- a/test/test_associationmanager.rb +++ b/test/test_associationmanager.rb @@ -1,3 +1,5 @@ +require 'test_helper' +require 'support/test_util' require "openid/consumer/associationmanager" require "openid/association" require "openid/dh" @@ -5,8 +7,6 @@ require "openid/cryptutil" require "openid/message" require "openid/store/memory" -require "test/unit" -require "util" require "time" module OpenID diff --git a/test/test_checkid_request.rb b/test/test_checkid_request.rb index e1d95c91..6c06249c 100644 --- a/test/test_checkid_request.rb +++ b/test/test_checkid_request.rb @@ -1,8 +1,7 @@ +require 'test_helper' +require 'support/test_util' require "openid/consumer/checkid_request" require "openid/message" -require "test/unit" -require "testutil" -require "util" module OpenID class Consumer diff --git a/test/test_consumer.rb b/test/test_consumer.rb index dc4a09e6..52604c76 100644 --- a/test/test_consumer.rb +++ b/test/test_consumer.rb @@ -1,6 +1,6 @@ +require 'test_helper' +require 'support/test_util' require "openid/consumer" -require "test/unit" -require "testutil" module OpenID class Consumer diff --git a/test/test_cryptutil.rb b/test/test_cryptutil.rb index f6a38a0d..312350b2 100644 --- a/test/test_cryptutil.rb +++ b/test/test_cryptutil.rb @@ -1,119 +1,119 @@ # coding: ASCII-8BIT -require 'test/unit' +require "test_helper" require "openid/cryptutil" require "pathname" -class CryptUtilTestCase < Test::Unit::TestCase - BIG = 2 ** 256 +module OpenID + class CryptUtilTestCase < Test::Unit::TestCase + include TestDataMixin - def test_rand - # If this is not true, the rest of our test won't work - assert(BIG.is_a?(Bignum)) + BIG = 2 ** 256 - # It's possible that these will be small enough for fixnums, but - # extraorindarily unlikely. - a = OpenID::CryptUtil.rand(BIG) - b = OpenID::CryptUtil.rand(BIG) - assert(a.is_a?(Bignum)) - assert(b.is_a?(Bignum)) - assert_not_equal(a, b) - end + def test_rand + # If this is not true, the rest of our test won't work + assert(BIG.is_a?(Bignum)) - def test_rand_doesnt_depend_on_srand - Kernel.srand(1) - a = OpenID::CryptUtil.rand(BIG) - Kernel.srand(1) - b = OpenID::CryptUtil.rand(BIG) - assert_not_equal(a, b) - end + # It's possible that these will be small enough for fixnums, but + # extraorindarily unlikely. + a = OpenID::CryptUtil.rand(BIG) + b = OpenID::CryptUtil.rand(BIG) + assert(a.is_a?(Bignum)) + assert(b.is_a?(Bignum)) + assert_not_equal(a, b) + end - def test_random_binary_convert - (0..500).each do - n = (0..10).inject(0) {|sum, element| sum + OpenID::CryptUtil.rand(BIG) } - s = OpenID::CryptUtil.num_to_binary n - assert(s.is_a?(String)) - n_converted_back = OpenID::CryptUtil.binary_to_num(s) - assert_equal(n, n_converted_back) + def test_rand_doesnt_depend_on_srand + Kernel.srand(1) + a = OpenID::CryptUtil.rand(BIG) + Kernel.srand(1) + b = OpenID::CryptUtil.rand(BIG) + assert_not_equal(a, b) end - end - def test_enumerated_binary_convert - { - "\x00" => 0, - "\x01" => 1, - "\x7F" => 127, - "\x00\xFF" => 255, - "\x00\x80" => 128, - "\x00\x81" => 129, - "\x00\x80\x00" => 32768, - "OpenID is cool" => 1611215304203901150134421257416556, - }.each do |str, num| - num_prime = OpenID::CryptUtil.binary_to_num(str) - str_prime = OpenID::CryptUtil.num_to_binary(num) - assert_equal(num, num_prime) - assert_equal(str, str_prime) + def test_random_binary_convert + (0..500).each do + n = (0..10).inject(0) {|sum, element| sum + OpenID::CryptUtil.rand(BIG) } + s = OpenID::CryptUtil.num_to_binary n + assert(s.is_a?(String)) + n_converted_back = OpenID::CryptUtil.binary_to_num(s) + assert_equal(n, n_converted_back) + end + end + + def test_enumerated_binary_convert + { + "\x00" => 0, + "\x01" => 1, + "\x7F" => 127, + "\x00\xFF" => 255, + "\x00\x80" => 128, + "\x00\x81" => 129, + "\x00\x80\x00" => 32768, + "OpenID is cool" => 1611215304203901150134421257416556, + }.each do |str, num| + num_prime = OpenID::CryptUtil.binary_to_num(str) + str_prime = OpenID::CryptUtil.num_to_binary(num) + assert_equal(num, num_prime) + assert_equal(str, str_prime) + end end - end - def with_n2b64 - test_dir = Pathname.new(__FILE__).dirname - filename = test_dir.join('data', 'n2b64') - File.open(filename) do |file| - file.each_line do |line| + def with_n2b64 + read_data_file( 'n2b64').each do |line| base64, base10 = line.chomp.split yield base64, base10.to_i end end - end - def test_base64_to_num - with_n2b64 do |base64, num| - assert_equal(num, OpenID::CryptUtil.base64_to_num(base64)) + def test_base64_to_num + with_n2b64 do |base64, num| + assert_equal(num, OpenID::CryptUtil.base64_to_num(base64)) + end end - end - def test_base64_to_num_invalid - assert_raises(ArgumentError) { - OpenID::CryptUtil.base64_to_num('!@#$') - } - end + def test_base64_to_num_invalid + assert_raises(ArgumentError) { + OpenID::CryptUtil.base64_to_num('!@#$') + } + end - def test_num_to_base64 - with_n2b64 do |base64, num| - assert_equal(base64, OpenID::CryptUtil.num_to_base64(num)) + def test_num_to_base64 + with_n2b64 do |base64, num| + assert_equal(base64, OpenID::CryptUtil.num_to_base64(num)) + end end - end - def test_randomstring - s1 = OpenID::CryptUtil.random_string(42) - assert_equal(42, s1.length) - s2 = OpenID::CryptUtil.random_string(42) - assert_equal(42, s2.length) - assert_not_equal(s1, s2) - end + def test_randomstring + s1 = OpenID::CryptUtil.random_string(42) + assert_equal(42, s1.length) + s2 = OpenID::CryptUtil.random_string(42) + assert_equal(42, s2.length) + assert_not_equal(s1, s2) + end - def test_randomstring_population - s1 = OpenID::CryptUtil.random_string(42, "XO") - assert_match(/[XO]{42}/, s1) - end + def test_randomstring_population + s1 = OpenID::CryptUtil.random_string(42, "XO") + assert_match(/[XO]{42}/, s1) + end - def test_sha1 - assert_equal("\x11\xf6\xad\x8e\xc5*)\x84\xab\xaa\xfd|;Qe\x03x\\ r", - OpenID::CryptUtil.sha1('x')) - end + def test_sha1 + assert_equal("\x11\xf6\xad\x8e\xc5*)\x84\xab\xaa\xfd|;Qe\x03x\\ r", + OpenID::CryptUtil.sha1('x')) + end - def test_hmac_sha1 - assert_equal("\x8bo\xf7O\xa7\x18*\x90\xac ah\x16\xf7\xb8\x81JB\x9f|", - OpenID::CryptUtil.hmac_sha1('x', 'x')) - end + def test_hmac_sha1 + assert_equal("\x8bo\xf7O\xa7\x18*\x90\xac ah\x16\xf7\xb8\x81JB\x9f|", + OpenID::CryptUtil.hmac_sha1('x', 'x')) + end - def test_sha256 - assert_equal("-q\x16B\xb7&\xb0D\x01b|\xa9\xfb\xac2\xf5\xc8S\x0f\xb1\x90<\xc4\xdb\x02%\x87\x17\x92\x1aH\x81", - OpenID::CryptUtil.sha256('x')) - end + def test_sha256 + assert_equal("-q\x16B\xb7&\xb0D\x01b|\xa9\xfb\xac2\xf5\xc8S\x0f\xb1\x90<\xc4\xdb\x02%\x87\x17\x92\x1aH\x81", + OpenID::CryptUtil.sha256('x')) + end - def test_hmac_sha256 - assert_equal("\x94{\xd2w\xb2\xd3\\\xfc\x07\xfb\xc7\xe3b\xf2iuXz1\xf8:}\xffx\x8f\xda\xc1\xfaC\xc4\xb2\x87", - OpenID::CryptUtil.hmac_sha256('x', 'x')) + def test_hmac_sha256 + assert_equal("\x94{\xd2w\xb2\xd3\\\xfc\x07\xfb\xc7\xe3b\xf2iuXz1\xf8:}\xffx\x8f\xda\xc1\xfaC\xc4\xb2\x87", + OpenID::CryptUtil.hmac_sha256('x', 'x')) + end end end diff --git a/test/test_dh.rb b/test/test_dh.rb index 397c15e5..e60e3a99 100644 --- a/test/test_dh.rb +++ b/test/test_dh.rb @@ -1,6 +1,5 @@ -require 'test/unit' +require "test_helper" require 'openid/dh' -require 'testutil' module OpenID class DiffieHellmanExposed < OpenID::DiffieHellman diff --git a/test/test_discover.rb b/test/test_discover.rb index 13b115ce..fd01f310 100644 --- a/test/test_discover.rb +++ b/test/test_discover.rb @@ -1,8 +1,4 @@ - -require 'testutil' -require 'util' - -require 'test/unit' +require 'test_helper' require 'openid/fetchers' require 'openid/yadis/discovery' require 'openid/consumer/discovery' @@ -48,7 +44,7 @@ def test_discovery_failure @responses.each { |response_set| @url = response_set[0].final_url OpenID.fetcher = SimpleMockFetcher.new(self, response_set) - + expected_status = response_set[-1].code begin OpenID.discover(@url) @@ -228,7 +224,7 @@ def test_blank # def readDataFile(filename): # module_directory = os.path.dirname(os.path.abspath(__file__)) # filename = os.path.join( -# module_directory, 'data', 'test_discover', filename) +# module_directory, 'yadis_data', 'test_discover', filename) # return file(filename).read() class TestDiscovery < BaseTestDiscovery diff --git a/test/test_discovery_manager.rb b/test/test_discovery_manager.rb index da966f38..6465f1e1 100644 --- a/test/test_discovery_manager.rb +++ b/test/test_discovery_manager.rb @@ -1,10 +1,7 @@ - -require 'test/unit' +require "test_helper" require 'openid/consumer/discovery_manager' require 'openid/extras' -require 'testutil' - module OpenID class TestDiscoveredServices < Test::Unit::TestCase def setup @@ -41,7 +38,7 @@ def test_started @disco_services.next assert(@disco_services.started?) @disco_services.next - assert(@disco_services.started?) + assert(@disco_services.started?) @disco_services.next assert(!@disco_services.started?) end diff --git a/test/test_extension.rb b/test/test_extension.rb index bfe14e9b..47cbfc75 100644 --- a/test/test_extension.rb +++ b/test/test_extension.rb @@ -1,6 +1,6 @@ +require 'test_helper' require 'openid/extension' require 'openid/message' -require 'test/unit' module OpenID class DummyExtension < OpenID::Extension @@ -29,7 +29,7 @@ def test_OpenID1 assert_equal(DummyExtension::TEST_ALIAS, namespaces.get_alias(DummyExtension::TEST_URI)) end - + def test_OpenID2 oid2_msg = Message.new(OPENID2_NS) ext = DummyExtension.new diff --git a/test/test_extras.rb b/test/test_extras.rb index c30861cc..4228f8fb 100644 --- a/test/test_extras.rb +++ b/test/test_extras.rb @@ -1,4 +1,4 @@ -require 'test/unit' +require "test_helper" require 'openid/extras' class StartsWithTestCase < Test::Unit::TestCase diff --git a/test/test_fetchers.rb b/test/test_fetchers.rb index 7130da55..61b5f9cf 100644 --- a/test/test_fetchers.rb +++ b/test/test_fetchers.rb @@ -1,12 +1,7 @@ -require 'test/unit' +require "test_helper" require 'net/http' require 'webrick' - -require 'testutil' -require 'util' - require 'openid/fetchers' - require 'stringio' begin @@ -112,7 +107,7 @@ def _redirect_loop assert_block("Fetched too many times.") { @_redirect_counter < 10 } } end - + def setup @fetcher = OpenID::StandardFetcher.new @logfile = StringIO.new @@ -375,17 +370,12 @@ def start(&block) def test_fetchingerror f = OpenID::StandardFetcher.new - f.extend(OpenID::InstanceDefExtension) - f.instance_def(:make_connection) do |uri| - TimeoutConnection.new - end - assert_raise(OpenID::FetchingError) { - f.fetch("https://bogus.com/") + f.fetch("https://bogus2010.com/") } end - + class TestingException < OpenID::FetchingError; end class NoSSLSupportConnection @@ -516,7 +506,7 @@ def test_proxy_unreachable def test_proxy_env ENV['http_proxy'] = 'http://127.0.0.1:3128/' OpenID.fetcher_use_env_http_proxy - + # make_http just to give us something with readable attributes to inspect. conn = OpenID.fetcher.make_http(URI.parse('http://127.0.0.2')) assert_equal('127.0.0.1', conn.proxy_address) diff --git a/test/test_filters.rb b/test/test_filters.rb index 990201f0..3602ec15 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -1,5 +1,4 @@ - -require 'test/unit' +require "test_helper" require 'openid/yadis/filters' module OpenID @@ -166,7 +165,7 @@ class MakeFilterTest < Test::Unit::TestCase def test_parts_nil result = Yadis.make_filter(nil) assert(result.is_a?(Yadis::TransformFilterMaker), - result) + result.to_s) end def test_parts_array @@ -175,7 +174,7 @@ def test_parts_array result = Yadis.make_filter([e1, e2]) assert(result.is_a?(Yadis::TransformFilterMaker), - result) + result.to_s) assert(result.filter_procs[0] == e1.method('from_basic_service_endpoint')) assert(result.filter_procs[1] == e2.method('from_basic_service_endpoint')) end @@ -184,7 +183,7 @@ def test_parts_single e = Yadis::BasicServiceEndpoint.new(nil, [], nil, nil) result = Yadis.make_filter(e) assert(result.is_a?(Yadis::TransformFilterMaker), - result) + result.to_s) end end @@ -208,7 +207,7 @@ def test_single_endpoint # from_basic_service_endpoint on the endpoint filter = result.filter_procs[0] assert(filter == e.method('from_basic_service_endpoint'), - filter) + filter.to_s) end def test_single_proc diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 00000000..bb627e5e --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,4 @@ +require 'test/unit' +require 'openid' +require 'support/test_data_mixin' +require 'support/test_util' diff --git a/test/test_idres.rb b/test/test_idres.rb index 9d7364f4..bd67521d 100644 --- a/test/test_idres.rb +++ b/test/test_idres.rb @@ -1,6 +1,4 @@ -require "testutil" -require "util" -require "test/unit" +require 'test_helper' require "openid/consumer/idres" require "openid/protocolerror" require "openid/store/memory" @@ -103,21 +101,21 @@ def mkMsg(ns, fields, signed_fields) end def test_112 - args = {'openid.assoc_handle' => 'fa1f5ff0-cde4-11dc-a183-3714bfd55ca8', - 'openid.claimed_id' => 'http://binkley.lan/user/test01', - 'openid.identity' => 'http://test01.binkley.lan/', - 'openid.mode' => 'id_res', - 'openid.ns' => 'http://specs.openid.net/auth/2.0', - 'openid.ns.pape' => 'http://specs.openid.net/extensions/pape/1.0', - 'openid.op_endpoint' => 'http://binkley.lan/server', - 'openid.pape.auth_policies' => 'none', - 'openid.pape.auth_time' => '2008-01-28T20:42:36Z', - 'openid.pape.nist_auth_level' => '0', - 'openid.response_nonce' => '2008-01-28T21:07:04Z99Q=', - 'openid.return_to' => 'http://binkley.lan:8001/process?janrain_nonce=2008-01-28T21%3A07%3A02Z0tMIKx', - 'openid.sig' => 'YJlWH4U6SroB1HoPkmEKx9AyGGg=', - 'openid.signed' => 'assoc_handle,identity,response_nonce,return_to,claimed_id,op_endpoint,pape.auth_time,ns.pape,pape.nist_auth_level,pape.auth_policies' - } + args = {'openid.assoc_handle' => 'fa1f5ff0-cde4-11dc-a183-3714bfd55ca8', + 'openid.claimed_id' => 'http://binkley.lan/user/test01', + 'openid.identity' => 'http://test01.binkley.lan/', + 'openid.mode' => 'id_res', + 'openid.ns' => 'http://specs.openid.net/auth/2.0', + 'openid.ns.pape' => 'http://specs.openid.net/extensions/pape/1.0', + 'openid.op_endpoint' => 'http://binkley.lan/server', + 'openid.pape.auth_policies' => 'none', + 'openid.pape.auth_time' => '2008-01-28T20:42:36Z', + 'openid.pape.nist_auth_level' => '0', + 'openid.response_nonce' => '2008-01-28T21:07:04Z99Q=', + 'openid.return_to' => 'http://binkley.lan:8001/process?janrain_nonce=2008-01-28T21%3A07%3A02Z0tMIKx', + 'openid.sig' => 'YJlWH4U6SroB1HoPkmEKx9AyGGg=', + 'openid.signed' => 'assoc_handle,identity,response_nonce,return_to,claimed_id,op_endpoint,pape.auth_time,ns.pape,pape.nist_auth_level,pape.auth_policies' + } assert_equal(args['openid.ns'], OPENID2_NS) incoming = Message.from_post_args(args) assert(incoming.is_openid2) @@ -129,7 +127,7 @@ def test_112 assert(expected.is_openid2) assert_equal(expected, car) assert_equal(expected_args, car.to_post_args) - end + end def test_no_signed_list msg = Message.new(OPENID2_NS) @@ -845,7 +843,7 @@ def test_openid2_fragment @endpoint.type_uris = [OPENID_2_0_TYPE] result = assert_log_matches() { - call_verify({'ns' => OPENID2_NS, + call_verify({'ns' => OPENID2_NS, 'identity' => @endpoint.local_id, 'claimed_id' => claimed_id_frag, 'op_endpoint' => @endpoint.server_url}) diff --git a/test/test_kvform.rb b/test/test_kvform.rb index 92260573..b8f11968 100644 --- a/test/test_kvform.rb +++ b/test/test_kvform.rb @@ -1,7 +1,6 @@ -require 'test/unit' +require "test_helper" require 'openid/kvform' require 'openid/util' -require 'util' include OpenID diff --git a/test/test_kvpost.rb b/test/test_kvpost.rb index 8f648049..c0facf97 100644 --- a/test/test_kvpost.rb +++ b/test/test_kvpost.rb @@ -1,8 +1,7 @@ +require 'test_helper' require "openid/kvpost" require "openid/kvform" require "openid/message" -require "test/unit" -require 'testutil' module OpenID class KVPostTestCase < Test::Unit::TestCase diff --git a/test/test_linkparse.rb b/test/test_linkparse.rb index 6360d507..0283b728 100644 --- a/test/test_linkparse.rb +++ b/test/test_linkparse.rb @@ -1,5 +1,4 @@ -require 'test/unit' -require 'testutil' +require "test_helper" require 'openid/consumer/html_parse' class LinkParseTestCase < Test::Unit::TestCase @@ -85,7 +84,7 @@ def test_linkparse end } links = OpenID::parse_link_attrs(html) - + found = links.dup expected = expected_links.dup while(fl = found.shift) diff --git a/test/test_message.rb b/test/test_message.rb index f8ef9187..3169f008 100644 --- a/test/test_message.rb +++ b/test/test_message.rb @@ -1,7 +1,5 @@ -# last synced with Python openid.test.test_message on 6/29/2007. - -require 'test/unit' -require 'util' +require 'test_helper' +require 'support/test_util' require 'openid/message' require 'rexml/document' diff --git a/test/test_nonce.rb b/test/test_nonce.rb index b8a1a054..f8ff41c2 100644 --- a/test/test_nonce.rb +++ b/test/test_nonce.rb @@ -1,4 +1,4 @@ -require 'test/unit' +require "test_helper" require 'openid/store/nonce' module OpenID @@ -78,7 +78,7 @@ def test_check_timestamp # malformed nonce string ['monkeys', 0, 0, false], ] - + cases.each{|c| (nonce_str, allowed_skew, now, expected) = c actual = Nonce::check_timestamp(nonce_str, allowed_skew, now) diff --git a/test/test_oauth.rb b/test/test_oauth.rb index 8c07dfb2..05d904d0 100644 --- a/test/test_oauth.rb +++ b/test/test_oauth.rb @@ -1,3 +1,4 @@ +require 'test_helper' require 'openid/extensions/oauth' require 'openid/message' require 'openid/server' @@ -8,7 +9,7 @@ module OpenID module OAuthTest class OAuthRequestTestCase < Test::Unit::TestCase def setup - @req = OAuth::Request.new + @req = OAuth::Request.new end def test_construct @@ -137,7 +138,7 @@ def test_parse_extension_args_empty end def test_from_success_response - + openid_req_msg = Message.from_openid_args({ 'mode' => 'id_res', 'ns' => OPENID2_NS, diff --git a/test/test_openid_yadis.rb b/test/test_openid_yadis.rb index fb8c71e6..5927b306 100644 --- a/test/test_openid_yadis.rb +++ b/test/test_openid_yadis.rb @@ -1,5 +1,4 @@ - -require 'test/unit' +require "test_helper" require 'openid/consumer/discovery' require 'openid/yadis/services' diff --git a/test/test_pape.rb b/test/test_pape.rb index bd8289c4..9d6a474a 100644 --- a/test/test_pape.rb +++ b/test/test_pape.rb @@ -1,3 +1,4 @@ +require 'test_helper' require 'openid/extensions/pape' require 'openid/message' require 'openid/server' @@ -170,11 +171,11 @@ def test_parse_extension_args_empty assert_equal(nil, @req.auth_time) assert_equal([], @req.auth_policies) end - + def test_parse_extension_args_strict_bogus1 args = {'auth_policies' => 'http://foo http://bar', 'auth_time' => 'this one time'} - assert_raises(ArgumentError) { + assert_raises(ArgumentError) { @req.parse_extension_args(args, true) } end @@ -183,11 +184,11 @@ def test_parse_extension_args_strict_bogus2 args = {'auth_policies' => 'http://foo http://bar', 'auth_time' => '1983-11-05T12:30:24Z', 'nist_auth_level' => 'some'} - assert_raises(ArgumentError) { + assert_raises(ArgumentError) { @req.parse_extension_args(args, true) } end - + def test_parse_extension_args_strict_good args = {'auth_policies' => 'http://foo http://bar', 'auth_time' => '2007-10-11T05:25:18Z', @@ -208,9 +209,9 @@ def test_parse_extension_args_nostrict_bogus assert_equal(nil, @req.nist_auth_level) end - + def test_from_success_response - + openid_req_msg = Message.from_openid_args({ 'mode' => 'id_res', 'ns' => OPENID2_NS, diff --git a/test/test_parsehtml.rb b/test/test_parsehtml.rb index 49542a6a..176cb26d 100644 --- a/test/test_parsehtml.rb +++ b/test/test_parsehtml.rb @@ -1,6 +1,5 @@ -require 'test/unit' +require "test_helper" require "openid/yadis/parsehtml" -require "testutil" module OpenID class ParseHTMLTestCase < Test::Unit::TestCase diff --git a/test/test_responses.rb b/test/test_responses.rb index 61a0e4c1..9ac1daba 100644 --- a/test/test_responses.rb +++ b/test/test_responses.rb @@ -1,4 +1,4 @@ -require "test/unit" +require "test_helper" require "openid/consumer/discovery" require "openid/consumer/responses" diff --git a/test/test_server.rb b/test/test_server.rb index 11d0f567..570169d2 100644 --- a/test/test_server.rb +++ b/test/test_server.rb @@ -1,3 +1,4 @@ +require "test_helper" require 'openid/server' require 'openid/cryptutil' require 'openid/association' @@ -6,10 +7,7 @@ require 'openid/store/memory' require 'openid/dh' require 'openid/consumer/associationmanager' -require 'util' -require "testutil" - -require 'test/unit' +require 'support/test_util' require 'uri' # In general, if you edit or add tests here, try to move in the @@ -208,7 +206,7 @@ def test_dictOfLists begin result = @decode.call(args) rescue ArgumentError => err - assert(!err.to_s.index('values').nil?, err) + assert(!err.to_s.index('values').nil?, err.to_s) else flunk("Expected ArgumentError, but got result #{result}") end @@ -1008,7 +1006,7 @@ def test_cancel assert(webresponse.headers.has_key?('location')) location = webresponse.headers['location'] query = Util.parse_query(URI::parse(location).query) - assert(!query.has_key?('openid.sig'), response.fields.to_post_args()) + assert(!query.has_key?('openid.sig')) end def test_assocReply @@ -1530,7 +1528,7 @@ def test_addField {'blue' => 'star', 'mode' => 'id_res', }) - + assert_equal(@response.fields.get_args(namespace), {'bright' => 'potato'}) end @@ -1613,7 +1611,7 @@ def test_invalid r = @request.answer(@signatory) assert_equal({'is_valid' => 'false'}, r.fields.get_args(OPENID_NS)) - + end def test_replay @@ -1750,7 +1748,7 @@ def test_protoError invalid_s1, invalid_s1_2, ] - + bad_request_argss.each { |request_args| message = Message.from_post_args(request_args) assert_raise(Server::ProtocolError) { @@ -2340,7 +2338,7 @@ def test_getAssocExpired silence_logging { assoc = @signatory.get_association(assoc_handle, true) } - assert(!assoc, assoc) + assert(!assoc) # assert(@messages) end @@ -2428,7 +2426,7 @@ def test_openid1_assoc_checkid 'openid.assoc_type' => 'HMAC-SHA1'} areq = @server.decode_request(assoc_args) aresp = @server.handle_request(areq) - + amess = aresp.fields assert(amess.is_openid1) ahandle = amess.get_arg(OPENID_NS, 'assoc_handle') @@ -2441,7 +2439,7 @@ def test_openid1_assoc_checkid 'openid.return_to' => 'http://example.com/openid/consumer', 'openid.assoc_handle' => ahandle, 'openid.identity' => 'http://foo.com/'} - + cireq = @server.decode_request(checkid_args) ciresp = cireq.answer(true) @@ -2449,7 +2447,7 @@ def test_openid1_assoc_checkid assert_equal(assoc.get_message_signature(signed_resp.fields), signed_resp.fields.get_arg(OPENID_NS, 'sig')) - + assert(assoc.check_message_signature(signed_resp.fields)) end diff --git a/test/test_sreg.rb b/test/test_sreg.rb index 7438d592..ac10c6aa 100644 --- a/test/test_sreg.rb +++ b/test/test_sreg.rb @@ -1,7 +1,7 @@ +require "test_helper" require 'openid/extensions/sreg' require 'openid/message' require 'openid/server' -require 'test/unit' module OpenID module SReg @@ -71,7 +71,7 @@ def initialize @openid1 = false @namespaces = NamespaceMap.new end - + def is_openid1 return @openid1 end @@ -95,7 +95,7 @@ def test_openid1_empty assert_equal('sreg', @msg.namespaces.get_alias(ns_uri)) assert_equal(NS_URI, ns_uri) end - + def test_openid1defined_1_0 @msg.openid1 = true @msg.namespaces.add(NS_URI_1_0) @@ -117,7 +117,7 @@ def test_openid1_defined_1_0_override_alias } } end - + def test_openid1_defined_badly @msg.openid1 = true @msg.namespaces.add_alias('http://invalid/', 'sreg') @@ -182,7 +182,7 @@ def test_from_openid_request_message_copied end def test_from_openid_request_ns_1_0 - message = Message.from_openid_args({'ns.sreg' => NS_URI_1_0, + message = Message.from_openid_args({'ns.sreg' => NS_URI_1_0, "sreg.required" => "nickname"}) openid_req = Server::OpenIDRequest.new openid_req.message = message @@ -214,7 +214,7 @@ def test_parse_extension_args_non_strict req.parse_extension_args({'required' => 'stuff'}) assert_equal([], req.required) end - + def test_parse_extension_args_strict req = Request.new assert_raises(ArgumentError) { @@ -351,7 +351,7 @@ def test_request_fields req.request_fields(fields) assert_equal(fields, req.optional) assert_equal([], req.required) - + # By default, adding the same fields over again has no effect req.request_fields(fields) assert_equal(fields, req.optional) @@ -439,7 +439,7 @@ def test_from_success_response_unsigned }) success_resp = DummySuccessResponse.new(message, {}) sreg_resp = Response.from_success_response(success_resp, false) - assert_equal({'nickname' => 'The Mad Stork'}, + assert_equal({'nickname' => 'The Mad Stork'}, sreg_resp.get_extension_args) end end diff --git a/test/test_stores.rb b/test/test_stores.rb index 115bcc43..048f6f7a 100644 --- a/test/test_stores.rb +++ b/test/test_stores.rb @@ -1,10 +1,4 @@ -require 'test/unit' -require 'openid/store/interface' -require 'openid/store/filesystem' -require 'openid/store/memcache' -require 'openid/store/memory' -require 'openid/util' -require 'openid/store/nonce' +require "test_helper" require 'openid/association' module OpenID @@ -120,7 +114,7 @@ def test_store ret_assoc = @store.get_association(server_url, nil) unexpected = [assoc2.handle, assoc3.handle] assert(ret_assoc.nil? || !unexpected.member?(ret_assoc.handle), - ret_assoc) + ret_assoc.to_s) _check_retrieve(server_url, assoc.handle, assoc) _check_retrieve(server_url, assoc2.handle, nil) diff --git a/test/test_trustroot.rb b/test/test_trustroot.rb index 2616021a..28e2b7b7 100644 --- a/test/test_trustroot.rb +++ b/test/test_trustroot.rb @@ -1,8 +1,6 @@ -require 'test/unit' +require "test_helper" require 'openid/trustroot' -require "testutil" - class TrustRootTest < Test::Unit::TestCase include OpenID::TestDataMixin @@ -10,11 +8,11 @@ def _test_sanity(case_, sanity, desc) tr = OpenID::TrustRoot::TrustRoot.parse(case_) if sanity == 'sane' assert(! tr.nil?) - assert(tr.sane?, [case_, desc]) - assert(OpenID::TrustRoot::TrustRoot.check_sanity(case_), [case_, desc]) + assert(tr.sane?) + assert(OpenID::TrustRoot::TrustRoot.check_sanity(case_)) elsif sanity == 'insane' - assert(!tr.sane?, [case_, desc]) - assert(!OpenID::TrustRoot::TrustRoot.check_sanity(case_), [case_, desc]) + assert(!tr.sane?) + assert(!OpenID::TrustRoot::TrustRoot.check_sanity(case_)) else assert(tr.nil?, case_) end @@ -24,10 +22,10 @@ def _test_match(trust_root, url, expected_match) tr = OpenID::TrustRoot::TrustRoot.parse(trust_root) actual_match = tr.validate_url(url) if expected_match - assert(actual_match, [trust_root, url]) + assert(actual_match) assert(OpenID::TrustRoot::TrustRoot.check_url(trust_root, url)) else - assert(!actual_match, [expected_match, actual_match, trust_root, url]) + assert(!actual_match) assert(!OpenID::TrustRoot::TrustRoot.check_url(trust_root, url)) end end @@ -56,7 +54,7 @@ def getTests(grps, head, dat) top = head.strip() gdat = dat.split('-' * 40 + "\n").collect { |i| i.strip() } assert(gdat[0] == '') - assert(gdat.length == (grps.length * 2 + 1), [gdat, grps]) + assert(gdat.length == (grps.length * 2 + 1), "length match failed: gdat #{gdat}, grps #{grps}") i = 1 grps.each { |x| n, desc = gdat[i].split(': ') @@ -107,7 +105,7 @@ def test_build_discovery_url trust_root, expected_disco_url = case_ tr = OpenID::TrustRoot::TrustRoot.parse(trust_root) actual_disco_url = tr.build_discovery_url() - assert(actual_disco_url == expected_disco_url, case_ + [actual_disco_url]) + assert(actual_disco_url == expected_disco_url) } end end diff --git a/test/test_urinorm.rb b/test/test_urinorm.rb index 55c50e1c..39752536 100644 --- a/test/test_urinorm.rb +++ b/test/test_urinorm.rb @@ -1,7 +1,6 @@ -require 'test/unit' +require "test_helper" require "openid/urinorm" -require "testutil" class URINormTestCase < Test::Unit::TestCase include OpenID::TestDataMixin diff --git a/test/test_util.rb b/test/test_util.rb index ce1138ae..e19cf125 100644 --- a/test/test_util.rb +++ b/test/test_util.rb @@ -1,5 +1,5 @@ # coding: ASCII-8BIT -require 'test/unit' +require "test_helper" require "openid/util" diff --git a/test/test_xrds.rb b/test/test_xrds.rb index ced78028..46bdd87c 100644 --- a/test/test_xrds.rb +++ b/test/test_xrds.rb @@ -1,8 +1,6 @@ - -require 'test/unit' +require "test_helper" require 'openid/yadis/xrds' -require 'testutil' module OpenID module Yadis diff --git a/test/test_xri.rb b/test/test_xri.rb index ba20e9c4..deedf368 100644 --- a/test/test_xri.rb +++ b/test/test_xri.rb @@ -1,4 +1,4 @@ -require 'test/unit' +require "test_helper" require 'openid/yadis/xri' module OpenID diff --git a/test/test_xrires.rb b/test/test_xrires.rb index 3959361b..6bf5dbbd 100644 --- a/test/test_xrires.rb +++ b/test/test_xrires.rb @@ -1,5 +1,4 @@ - -require 'test/unit' +require "test_helper" require 'openid/yadis/xrires' module OpenID @@ -27,6 +26,10 @@ def setup @servicetype_enc = 'xri%3A%2F%2F%2Bi-service%2A%28%2Bforwarding%29%2A%28%24v%2A1.0%29' end + def unesc(s) + CGI::unescape(s) + end + def test_proxy_url st = @servicetype ste = @servicetype_enc @@ -34,17 +37,17 @@ def test_proxy_url pqu = @proxy.method('query_url') h = @proxy_url - assert_equal(h + '=foo?' + args_esc, pqu.call('=foo', st)) - assert_equal(h + '=foo/bar?baz&' + args_esc, - pqu.call('=foo/bar?baz', st)) - assert_equal(h + '=foo/bar?baz=quux&' + args_esc, - pqu.call('=foo/bar?baz=quux', st)) - assert_equal(h + '=foo/bar?mi=fa&so=la&' + args_esc, - pqu.call('=foo/bar?mi=fa&so=la', st)) + assert_equal(unesc(h + '=foo?' + args_esc), unesc(pqu.call('=foo', st))) + assert_equal(unesc(h + '=foo/bar?baz&' + args_esc), + unesc(pqu.call('=foo/bar?baz', st))) + assert_equal(unesc(h + '=foo/bar?baz=quux&' + args_esc), + unesc(pqu.call('=foo/bar?baz=quux', st))) + assert_equal(unesc(h + '=foo/bar?mi=fa&so=la&' + args_esc), + unesc(pqu.call('=foo/bar?mi=fa&so=la', st))) # With no service endpoint selection. args_esc = "_xrd_r=application%2Fxrds%2Bxml%3Bsep%3Dfalse" - assert_equal(h + '=foo?' + args_esc, pqu.call('=foo', nil)) + assert_equal(unesc(h + '=foo?' + args_esc), unesc(pqu.call('=foo', nil))) end def test_proxy_url_qmarks @@ -54,9 +57,10 @@ def test_proxy_url_qmarks pqu = @proxy.method('query_url') h = @proxy_url - assert_equal(h + '=foo/bar??' + args_esc, pqu.call('=foo/bar?', st)) - assert_equal(h + '=foo/bar????' + args_esc, - pqu.call('=foo/bar???', st)) + assert_equal(unesc(h + '=foo/bar?' + args_esc), + unesc(pqu.call('=foo/bar??', st))) + assert_equal(unesc(h + '=foo/bar?' + args_esc), + unesc(pqu.call('=foo/bar???', st))) end end end diff --git a/test/test_yadis_discovery.rb b/test/test_yadis_discovery.rb index b0fdd178..31af3c41 100644 --- a/test/test_yadis_discovery.rb +++ b/test/test_yadis_discovery.rb @@ -1,18 +1,16 @@ - -require 'test/unit' +require "test_helper" require 'uri' -require 'testutil' require 'openid/yadis/discovery' require 'openid/fetchers' require 'openid/util' -require 'discoverdata' +require 'support/yadis_data' module OpenID module YadisDiscovery include FetcherMixin - include DiscoverData + include YadisData STATUS_HEADER_RE = /Status: (\d+) .*?$/m @@ -34,7 +32,7 @@ def self.mkResponse(data) end class TestFetcher - include DiscoverData + include YadisData def initialize(base_url) @base_url = base_url @@ -94,7 +92,7 @@ def test_404 end class DiscoveryTestCase - include DiscoverData + include YadisData include FetcherMixin def initialize(testcase, input_name, id_name, result_name, success) @@ -172,7 +170,7 @@ class TestYadisDiscovery < Test::Unit::TestCase include FetcherMixin def test_yadis_discovery - DiscoverData::TESTLIST.each { |success, input_name, id_name, result_name| + YadisData::TESTLIST.each { |success, input_name, id_name, result_name| test = DiscoveryTestCase.new(self, input_name, id_name, result_name, success) test.runCustomTest }