Skip to content
This repository was archived by the owner on Jul 24, 2023. It is now read-only.

Commit 866204b

Browse files
dennisreimanndennisreimann
committed
Fixed test suite. Closes #30 and #34 
1 parent 8e979da commit 866204b

31 files changed

+184
-185
lines changed

‎Rakefile

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/usr/bin/env rake
2+
require 'rake/testtask'
3+
4+
desc "Run tests"
5+
Rake::TestTask.new('test') do |t|
6+
t.libs << 'lib'
7+
t.libs << 'test'
8+
t.test_files = FileList["test/**/test_*.rb"]
9+
t.verbose = false
10+
end
11+
12+
task :default => :test

‎lib/openid/trustroot.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ def TrustRoot.parse(trust_root)
210210
return nil if parts.nil?
211211

212212
proto, host, port, path = parts
213+
return nil if host[0] == '.'
213214

214215
# check for URI fragment
215216
if path and !path.index('#').nil?

‎test/data/trustroot.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ http://foo.com\/
2525
http://π.pi.com/
2626
http://lambda.com/Λ
2727

28-
29-
28+
29+
3030
5
3131

3232
----------------------------------------

‎test/test_accept.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
21
require 'test/unit'
2+
require 'testutil'
33
require 'openid/yadis/accept'
44
require 'openid/extras'
55
require 'openid/util'

‎test/test_associationmanager.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
require "test/unit"
12
require "openid/consumer/associationmanager"
23
require "openid/association"
34
require "openid/dh"
45
require "openid/util"
56
require "openid/cryptutil"
67
require "openid/message"
78
require "openid/store/memory"
8-
require "test/unit"
99
require "util"
1010
require "time"
1111

‎test/test_ax.rb

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
require 'test/unit'
12
require 'openid/extensions/ax'
23
require 'openid/message'
34
require 'openid/consumer/responses'
@@ -119,7 +120,7 @@ def test_count_present_but_not_value
119120
def test_invalid_count_value
120121
msg = FetchRequest.new
121122
assert_raises(Error) {
122-
msg.parse_extension_args({'type.foo'=>'urn:foo',
123+
msg.parse_extension_args({'type.foo'=>'urn:foo',
123124
'count.foo' => 'bogus'})
124125
}
125126
end
@@ -216,7 +217,7 @@ def singleton_value
216217
'value.foo'=>'something',
217218
},
218219
{'urn:foo'=>['something']}
219-
)
220+
)
220221
end
221222
end
222223

@@ -371,12 +372,12 @@ def test_from_openid_request_no_ax
371372
ax_req = FetchRequest.from_openid_request(openid_req)
372373
assert(ax_req.nil?)
373374
end
374-
375+
375376
def test_from_openid_request_wrong_ax_mode
376377
uri = 'http://under.the.sea/'
377378
name = 'ext0'
378379
value = 'snarfblat'
379-
380+
380381
message = OpenID::Message.from_openid_args({
381382
'mode' => 'id_res',
382383
'ns' => OPENID2_NS,
@@ -392,7 +393,7 @@ def test_from_openid_request_wrong_ax_mode
392393
ax_req = FetchRequest.from_openid_request(openid_req)
393394
assert(ax_req.nil?)
394395
end
395-
396+
396397
def test_openid_update_url_verification_error
397398
openid_req_msg = Message.from_openid_args({
398399
'mode' => 'checkid_setup',
@@ -404,7 +405,7 @@ def test_openid_update_url_verification_error
404405
})
405406
openid_req = Server::OpenIDRequest.new
406407
openid_req.message = openid_req_msg
407-
assert_raises(Error) {
408+
assert_raises(Error) {
408409
FetchRequest.from_openid_request(openid_req)
409410
}
410411
end
@@ -419,7 +420,7 @@ def test_openid_no_realm
419420
})
420421
openid_req = Server::OpenIDRequest.new
421422
openid_req.message = openid_req_msg
422-
assert_raises(Error) {
423+
assert_raises(Error) {
423424
FetchRequest.from_openid_request(openid_req)
424425
}
425426
end
@@ -623,12 +624,12 @@ def test_get_extension_args_empty
623624
}
624625
assert_equal(eargs, @msg.get_extension_args)
625626
end
626-
627+
627628
def test_from_openid_request_wrong_ax_mode
628629
uri = 'http://under.the.sea/'
629630
name = 'ext0'
630631
value = 'snarfblat'
631-
632+
632633
message = OpenID::Message.from_openid_args({
633634
'mode' => 'id_res',
634635
'ns' => OPENID2_NS,
@@ -644,7 +645,7 @@ def test_from_openid_request_wrong_ax_mode
644645
ax_req = StoreRequest.from_openid_request(openid_req)
645646
assert(ax_req.nil?)
646647
end
647-
648+
648649
def test_get_extension_args_nonempty
649650
@msg.set_values(@type_a, ['foo','bar'])
650651
aliases = NamespaceMap.new
@@ -665,15 +666,15 @@ def test_success
665666
msg = StoreResponse.new
666667
assert(msg.succeeded?)
667668
assert(!msg.error_message)
668-
assert_equal({'mode' => 'store_response_success'},
669+
assert_equal({'mode' => 'store_response_success'},
669670
msg.get_extension_args)
670671
end
671672

672673
def test_fail_nomsg
673674
msg = StoreResponse.new(false)
674675
assert(! msg.succeeded? )
675676
assert(! msg.error_message )
676-
assert_equal({'mode' => 'store_response_failure'},
677+
assert_equal({'mode' => 'store_response_failure'},
677678
msg.get_extension_args)
678679
end
679680

@@ -682,7 +683,7 @@ def test_fail_msg
682683
msg = StoreResponse.new(false, reason)
683684
assert(! msg.succeeded? )
684685
assert_equal(reason, msg.error_message)
685-
assert_equal({'mode' => 'store_response_failure', 'error' => reason},
686+
assert_equal({'mode' => 'store_response_failure', 'error' => reason},
686687
msg.get_extension_args)
687688
end
688689
end

‎test/test_checkid_request.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
require "test/unit"
12
require "openid/consumer/checkid_request"
23
require "openid/message"
3-
require "test/unit"
44
require "testutil"
55
require "util"
66

‎test/test_consumer.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
require "openid/consumer"
21
require "test/unit"
32
require "testutil"
3+
require "openid/consumer"
44

55
module OpenID
66
class Consumer

‎test/test_cryptutil.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# coding: ASCII-8BIT
2-
require 'test/unit'
2+
require "test/unit"
33
require "openid/cryptutil"
44
require "pathname"
55

‎test/test_dh.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
require 'test/unit'
2-
require 'openid/dh'
32
require 'testutil'
3+
require 'openid/dh'
44

55
module OpenID
66
class DiffieHellmanExposed < OpenID::DiffieHellman

‎test/test_discover.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
1+
require 'test/unit'
22
require 'testutil'
33
require 'util'
4-
5-
require 'test/unit'
64
require 'openid/fetchers'
75
require 'openid/yadis/discovery'
86
require 'openid/consumer/discovery'
@@ -48,7 +46,7 @@ def test_discovery_failure
4846
@responses.each { |response_set|
4947
@url = response_set[0].final_url
5048
OpenID.fetcher = SimpleMockFetcher.new(self, response_set)
51-
49+
5250
expected_status = response_set[-1].code
5351
begin
5452
OpenID.discover(@url)

‎test/test_discovery_manager.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
21
require 'test/unit'
32
require 'openid/consumer/discovery_manager'
43
require 'openid/extras'
5-
64
require 'testutil'
75

86
module OpenID
@@ -41,7 +39,7 @@ def test_started
4139
@disco_services.next
4240
assert(@disco_services.started?)
4341
@disco_services.next
44-
assert(@disco_services.started?)
42+
assert(@disco_services.started?)
4543
@disco_services.next
4644
assert(!@disco_services.started?)
4745
end

‎test/test_extension.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
require 'test/unit'
12
require 'openid/extension'
23
require 'openid/message'
3-
require 'test/unit'
44

55
module OpenID
66
class DummyExtension < OpenID::Extension
@@ -29,7 +29,7 @@ def test_OpenID1
2929
assert_equal(DummyExtension::TEST_ALIAS,
3030
namespaces.get_alias(DummyExtension::TEST_URI))
3131
end
32-
32+
3333
def test_OpenID2
3434
oid2_msg = Message.new(OPENID2_NS)
3535
ext = DummyExtension.new

‎test/test_fetchers.rb

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
# -*- coding: utf-8 -*-
2-
1+
# encoding: utf-8
32
require 'test/unit'
43
require 'net/http'
54
require 'webrick'
6-
75
require 'testutil'
86
require 'util'
9-
107
require 'openid/fetchers'
11-
128
require 'stringio'
139

1410
begin
@@ -412,7 +408,7 @@ def test_fetchingerror
412408
f.fetch("https://bogus.com/")
413409
}
414410
end
415-
411+
416412
class TestingException < OpenID::FetchingError; end
417413

418414
class NoSSLSupportConnection
@@ -543,7 +539,7 @@ def test_proxy_unreachable
543539
def test_proxy_env
544540
ENV['http_proxy'] = 'http://127.0.0.1:3128/'
545541
OpenID.fetcher_use_env_http_proxy
546-
542+
547543
# make_http just to give us something with readable attributes to inspect.
548544
conn = OpenID.fetcher.make_http(URI.parse('http://127.0.0.2'))
549545
assert_equal('127.0.0.1', conn.proxy_address)

0 commit comments

Comments
 (0)