Skip to content

Commit 1a0c1a7

Browse files
nevansnevans
committed
✅♻️ Extract setup/teardown to TestCase superclass
1 parent 69a6512 commit 1a0c1a7

12 files changed

+18
-132
lines changed

‎test/lib/helper.rb‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,19 @@
3636

3737
require "net/imap"
3838
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+
3952
def wait_for_response_count(imap, type:, count:,
4053
timeout: 0.5, interval: 0.001)
4154
deadline = Time.now + timeout

‎test/net/imap/test_imap.rb‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,6 @@ class IMAPTest < Net::IMAP::TestCase
1111

1212
include Net::IMAP::FakeServer::TestHelper
1313

14-
def setup
15-
Net::IMAP.config.reset
16-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
17-
Socket.do_not_reverse_lookup = true
18-
@threads = []
19-
end
20-
21-
def teardown
22-
if !@threads.empty?
23-
assert_join_threads(@threads)
24-
end
25-
ensure
26-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
27-
end
28-
2914
if defined?(OpenSSL::SSL::SSLError)
3015
def test_imaps_unknown_ca
3116
assert_raise(OpenSSL::SSL::SSLError) do

‎test/net/imap/test_imap_capabilities.rb‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,6 @@ class IMAPCapabilitiesTest < Net::IMAP::TestCase
88

99
include Net::IMAP::FakeServer::TestHelper
1010

11-
def setup
12-
Net::IMAP.config.reset
13-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
14-
Socket.do_not_reverse_lookup = true
15-
@threads = []
16-
end
17-
18-
def teardown
19-
if !@threads.empty?
20-
assert_join_threads(@threads)
21-
end
22-
ensure
23-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
24-
end
25-
2611
test "#capabilities returns cached CAPABILITY data" do
2712
with_fake_server do |server, imap|
2813
imap.clear_cached_capabilities

‎test/net/imap/test_imap_connection_state.rb‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@
77
class IMAPConnectionStateTest < Net::IMAP::TestCase
88
include Net::IMAP::FakeServer::TestHelper
99

10-
def setup
11-
Net::IMAP.config.reset
12-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
13-
Socket.do_not_reverse_lookup = true
14-
@threads = []
15-
end
16-
17-
def teardown
18-
if !@threads.empty?
19-
assert_join_threads(@threads)
20-
end
21-
ensure
22-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
23-
end
24-
2510
test "#connection_state after AUTHENTICATE, SELECT, CLOSE successes" do
2611
with_fake_server(preauth: false) do |server, imap|
2712
# AUTHENTICATE, SELECT, CLOSE

‎test/net/imap/test_imap_deprecated_client_options.rb‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,6 @@
77
class IMAPDeprecatedClientOptionsTest < Net::IMAP::TestCase
88
include Net::IMAP::FakeServer::TestHelper
99

10-
def setup
11-
Net::IMAP.config.reset
12-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
13-
Socket.do_not_reverse_lookup = true
14-
@threads = []
15-
end
16-
17-
def teardown
18-
assert_join_threads(@threads) unless @threads.empty?
19-
ensure
20-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
21-
end
22-
2310
class InitializeTests < IMAPDeprecatedClientOptionsTest
2411

2512
test "Convert obsolete options hash to keywords" do

‎test/net/imap/test_imap_login.rb‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@
77
class IMAPLoginTest < Net::IMAP::TestCase
88
include Net::IMAP::FakeServer::TestHelper
99

10-
def setup
11-
Net::IMAP.config.reset
12-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
13-
Socket.do_not_reverse_lookup = true
14-
@threads = []
15-
end
16-
17-
def teardown
18-
if !@threads.empty?
19-
assert_join_threads(@threads)
20-
end
21-
ensure
22-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
23-
end
24-
2510
test "#login doesn't send CAPABILITY when it is already cached" do
2611
with_fake_server(
2712
preauth: false, cleartext_login: true, greeting_capabilities: true

‎test/net/imap/test_imap_max_response_size.rb‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@
77
class IMAPMaxResponseSizeTest < Net::IMAP::TestCase
88
include Net::IMAP::FakeServer::TestHelper
99

10-
def setup
11-
Net::IMAP.config.reset
12-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
13-
Socket.do_not_reverse_lookup = true
14-
@threads = []
15-
end
16-
17-
def teardown
18-
if !@threads.empty?
19-
assert_join_threads(@threads)
20-
end
21-
ensure
22-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
23-
end
24-
2510
test "#max_response_size reading literals" do
2611
with_fake_server(preauth: true) do |server, imap|
2712
imap.max_response_size = 12_345 + 30

‎test/net/imap/test_imap_response_handlers.rb‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,6 @@
77
class IMAPResponseHandlersTest < Net::IMAP::TestCase
88
include Net::IMAP::FakeServer::TestHelper
99

10-
def setup
11-
Net::IMAP.config.reset
12-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
13-
Socket.do_not_reverse_lookup = true
14-
@threads = []
15-
end
16-
17-
def teardown
18-
if !@threads.empty?
19-
assert_join_threads(@threads)
20-
end
21-
ensure
22-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
23-
end
24-
2510
test "#add_response_handlers" do
2611
responses = []
2712
with_fake_server do |server, imap|

‎test/net/imap/test_imap_responses.rb‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,6 @@ class IMAPResponsesTest < Net::IMAP::TestCase
1313
raise
1414
].freeze
1515

16-
def setup
17-
Net::IMAP.config.reset
18-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
19-
Socket.do_not_reverse_lookup = true
20-
@threads = []
21-
end
22-
23-
def teardown
24-
if !@threads.empty?
25-
assert_join_threads(@threads)
26-
end
27-
ensure
28-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
29-
end
30-
3116
def for_each_config_option(imap)
3217
original = imap.config.responses_without_block
3318
CONFIG_OPTIONS.each do |option|

‎test/net/imap/test_response_parser.rb‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ class ResponseParserTest < Net::IMAP::TestCase
1010
include NetIMAPTestHelpers
1111
extend NetIMAPTestHelpers::TestFixtureGenerators
1212

13-
def setup
14-
Net::IMAP.config.reset
15-
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
16-
Socket.do_not_reverse_lookup = true
17-
end
18-
19-
def teardown
20-
Socket.do_not_reverse_lookup = @do_not_reverse_lookup
21-
end
22-
2313
############################################################################
2414
# Tests that do no more than parse an example response and assert the result
2515
# data has the correct values have been moved to yml test fixtures.

0 commit comments

Comments
 (0)