Skip to content

Commit bd0d1b2

Browse files
authored
πŸ”€ Merge pull request #515 from ruby/organize-tests
βœ… Organize test files
2 parents 59d06bd + 18e3900 commit bd0d1b2

38 files changed

+977
-993
lines changed

β€Žtest/lib/helper.rbβ€Ž

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,21 @@
3434

3535
Test::Unit::TestCase.include Test::Unit::CoreAssertions
3636

37-
class Test::Unit::TestCase
37+
require "net/imap"
38+
class Net::IMAP::TestCase < Test::Unit::TestCase
39+
def setup
40+
Net::IMAP.config.reset
41+
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
42+
Socket.do_not_reverse_lookup = true
43+
@threads = []
44+
end
45+
46+
def teardown
47+
assert_join_threads(@threads) unless @threads.empty?
48+
ensure
49+
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
50+
end
51+
3852
def wait_for_response_count(imap, type:, count:,
3953
timeout: 0.5, interval: 0.001)
4054
deadline = Time.now + timeout
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require "net/imap"
44
require "test/unit"
55

6-
class IMAPAuthenticatorsTest < Test::Unit::TestCase
6+
class AuthenticatorsTest < Net::IMAP::TestCase
77

88
test "SASL::Authenticators.normalize_name" do
99
authenticators = Net::IMAP::SASL::Authenticators

β€Žtest/net/imap/test_config.rbβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require "net/imap"
44
require "test/unit"
55

6-
class ConfigTest < Test::Unit::TestCase
6+
class ConfigTest < Net::IMAP::TestCase
77
Config = Net::IMAP::Config
88
THIS_VERSION = Net::IMAP::VERSION.to_f
99
NEXT_VERSION = THIS_VERSION + 0.1
Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
# frozen_string_literal: true
2+
3+
require "net/imap"
4+
require "test/unit"
5+
6+
class ConnectionStateTest < Net::IMAP::TestCase
7+
NotAuthenticated = Net::IMAP::ConnectionState::NotAuthenticated
8+
Authenticated = Net::IMAP::ConnectionState::Authenticated
9+
Selected = Net::IMAP::ConnectionState::Selected
10+
Logout = Net::IMAP::ConnectionState::Logout
11+
12+
test "#name" do
13+
assert_equal "not_authenticated", NotAuthenticated[].name
14+
assert_equal "authenticated", Authenticated[] .name
15+
assert_equal "selected", Selected[] .name
16+
assert_equal "logout", Logout[] .name
17+
end
18+
19+
20+
test "#to_sym" do
21+
assert_equal :not_authenticated, NotAuthenticated[].to_sym
22+
assert_equal :authenticated, Authenticated[] .to_sym
23+
assert_equal :selected, Selected[] .to_sym
24+
assert_equal :logout, Logout[] .to_sym
25+
end
26+
27+
test "#deconstruct" do
28+
assert_equal [:not_authenticated], NotAuthenticated[].deconstruct
29+
assert_equal [:authenticated], Authenticated[] .deconstruct
30+
assert_equal [:selected], Selected[] .deconstruct
31+
assert_equal [:logout], Logout[] .deconstruct
32+
end
33+
34+
test "#deconstruct_keys" do
35+
assert_equal({symbol: :not_authenticated}, NotAuthenticated[].deconstruct_keys([:symbol]))
36+
assert_equal({symbol: :authenticated}, Authenticated[] .deconstruct_keys([:symbol]))
37+
assert_equal({symbol: :selected}, Selected[] .deconstruct_keys([:symbol]))
38+
assert_equal({symbol: :logout}, Logout[] .deconstruct_keys([:symbol]))
39+
assert_equal({name: "not_authenticated"}, NotAuthenticated[].deconstruct_keys([:name]))
40+
assert_equal({name: "authenticated"}, Authenticated[] .deconstruct_keys([:name]))
41+
assert_equal({name: "selected"}, Selected[] .deconstruct_keys([:name]))
42+
assert_equal({name: "logout"}, Logout[] .deconstruct_keys([:name]))
43+
end
44+
45+
test "#not_authenticated?" do
46+
assert_equal true, NotAuthenticated[].not_authenticated?
47+
assert_equal false, Authenticated[] .not_authenticated?
48+
assert_equal false, Selected[] .not_authenticated?
49+
assert_equal false, Logout[] .not_authenticated?
50+
end
51+
52+
test "#authenticated?" do
53+
assert_equal false, NotAuthenticated[].authenticated?
54+
assert_equal true, Authenticated[] .authenticated?
55+
assert_equal false, Selected[] .authenticated?
56+
assert_equal false, Logout[] .authenticated?
57+
end
58+
59+
test "#selected?" do
60+
assert_equal false, NotAuthenticated[].selected?
61+
assert_equal false, Authenticated[] .selected?
62+
assert_equal true, Selected[] .selected?
63+
assert_equal false, Logout[] .selected?
64+
end
65+
66+
test "#logout?" do
67+
assert_equal false, NotAuthenticated[].logout?
68+
assert_equal false, Authenticated[] .logout?
69+
assert_equal false, Selected[] .logout?
70+
assert_equal true, Logout[] .logout?
71+
end
72+
73+
end
74+
75+

β€Žtest/net/imap/test_data_lite.rbβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
module Net
3131
class IMAP
32-
class TestData < Test::Unit::TestCase
32+
class TestData < Net::IMAP::TestCase
3333
def test_define
3434
klass = Data.define(:foo, :bar)
3535
assert_kind_of(Class, klass)

β€Žtest/net/imap/test_errors.rbβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require "net/imap"
44
require "test/unit"
55

6-
class IMAPErrorsTest < Test::Unit::TestCase
6+
class IMAPErrorsTest < Net::IMAP::TestCase
77

88
test "ResponseTooLargeError" do
99
err = Net::IMAP::ResponseTooLargeError.new

β€Žtest/net/imap/test_esearch_result.rbβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require "net/imap"
44
require "test/unit"
55

6-
class ESearchResultTest < Test::Unit::TestCase
6+
class ESearchResultTest < Net::IMAP::TestCase
77
ESearchResult = Net::IMAP::ESearchResult
88
SequenceSet = Net::IMAP::SequenceSet
99
ExtensionData = Net::IMAP::ExtensionData

β€Žtest/net/imap/test_fetch_data.rbβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
require "net/imap"
44
require "test/unit"
55

6-
class FetchDataTest < Test::Unit::TestCase
6+
class FetchDataTest < Net::IMAP::TestCase
77
def fetch_data_class
88
Net::IMAP::FetchData
99
end
@@ -19,7 +19,7 @@ def fetch_data_class
1919
end
2020
end
2121

22-
class UIDFetchDataTest < Test::Unit::TestCase
22+
class UIDFetchDataTest < Net::IMAP::TestCase
2323
def fetch_data_class
2424
Net::IMAP::UIDFetchData
2525
end

0 commit comments

Comments
Β (0)