✅ Convert TestCase monkeypatch to a subclass

nevans · nevans · commit 69a651268fdc · 2025-08-29T14:59:24.000-04:00
diff --git a/test/lib/helper.rb b/test/lib/helper.rb
@@ -34,7 +34,8 @@
 
 Test::Unit::TestCase.include Test::Unit::CoreAssertions
 
-class Test::Unit::TestCase
+require "net/imap"
+class Net::IMAP::TestCase < Test::Unit::TestCase
   def wait_for_response_count(imap, type:, count:,
                               timeout: 0.5, interval: 0.001)
     deadline = Time.now + timeout
diff --git a/test/net/imap/test_authenticators.rb b/test/net/imap/test_authenticators.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class AuthenticatorsTest < Test::Unit::TestCase
+class AuthenticatorsTest < Net::IMAP::TestCase
 
   test "SASL::Authenticators.normalize_name" do
     authenticators = Net::IMAP::SASL::Authenticators
diff --git a/test/net/imap/test_config.rb b/test/net/imap/test_config.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class ConfigTest < Test::Unit::TestCase
+class ConfigTest < Net::IMAP::TestCase
   Config = Net::IMAP::Config
   THIS_VERSION   = Net::IMAP::VERSION.to_f
   NEXT_VERSION   = THIS_VERSION + 0.1
diff --git a/test/net/imap/test_connection_state.rb b/test/net/imap/test_connection_state.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class ConnectionStateTest < Test::Unit::TestCase
+class ConnectionStateTest < Net::IMAP::TestCase
   NotAuthenticated = Net::IMAP::ConnectionState::NotAuthenticated
   Authenticated    = Net::IMAP::ConnectionState::Authenticated
   Selected         = Net::IMAP::ConnectionState::Selected
diff --git a/test/net/imap/test_data_lite.rb b/test/net/imap/test_data_lite.rb
@@ -29,7 +29,7 @@
 
 module Net
   class IMAP
-    class TestData < Test::Unit::TestCase
+    class TestData < Net::IMAP::TestCase
       def test_define
         klass = Data.define(:foo, :bar)
         assert_kind_of(Class, klass)
diff --git a/test/net/imap/test_errors.rb b/test/net/imap/test_errors.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class IMAPErrorsTest < Test::Unit::TestCase
+class IMAPErrorsTest < Net::IMAP::TestCase
 
   test "ResponseTooLargeError" do
     err = Net::IMAP::ResponseTooLargeError.new
diff --git a/test/net/imap/test_esearch_result.rb b/test/net/imap/test_esearch_result.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class ESearchResultTest < Test::Unit::TestCase
+class ESearchResultTest < Net::IMAP::TestCase
   ESearchResult = Net::IMAP::ESearchResult
   SequenceSet   = Net::IMAP::SequenceSet
   ExtensionData = Net::IMAP::ExtensionData
diff --git a/test/net/imap/test_fetch_data.rb b/test/net/imap/test_fetch_data.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class FetchDataTest < Test::Unit::TestCase
+class FetchDataTest < Net::IMAP::TestCase
   def fetch_data_class
     Net::IMAP::FetchData
   end
@@ -19,7 +19,7 @@ def fetch_data_class
   end
 end
 
-class UIDFetchDataTest < Test::Unit::TestCase
+class UIDFetchDataTest < Net::IMAP::TestCase
   def fetch_data_class
     Net::IMAP::UIDFetchData
   end
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "fake_server"
 
-class IMAPTest < Test::Unit::TestCase
+class IMAPTest < Net::IMAP::TestCase
   CA_FILE = File.expand_path("../fixtures/cacert.pem", __dir__)
   SERVER_KEY = File.expand_path("../fixtures/server.key", __dir__)
   SERVER_CERT = File.expand_path("../fixtures/server.crt", __dir__)
diff --git a/test/net/imap/test_imap_capabilities.rb b/test/net/imap/test_imap_capabilities.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "fake_server"
 
-class IMAPCapabilitiesTest < Test::Unit::TestCase
+class IMAPCapabilitiesTest < Net::IMAP::TestCase
 
   include Net::IMAP::FakeServer::TestHelper
 
diff --git a/test/net/imap/test_imap_connection_state.rb b/test/net/imap/test_imap_connection_state.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "fake_server"
 
-class IMAPConnectionStateTest < Test::Unit::TestCase
+class IMAPConnectionStateTest < Net::IMAP::TestCase
   include Net::IMAP::FakeServer::TestHelper
 
   def setup
diff --git a/test/net/imap/test_imap_data_encoding.rb b/test/net/imap/test_imap_data_encoding.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class DataEncodingTest < Test::Unit::TestCase
+class DataEncodingTest < Net::IMAP::TestCase
 
   def test_encode_utf7
     assert_equal("foo", Net::IMAP.encode_utf7("foo"))
diff --git a/test/net/imap/test_imap_deprecated_client_options.rb b/test/net/imap/test_imap_deprecated_client_options.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "fake_server"
 
-class IMAPDeprecatedClientOptionsTest < Test::Unit::TestCase
+class IMAPDeprecatedClientOptionsTest < Net::IMAP::TestCase
   include Net::IMAP::FakeServer::TestHelper
 
   def setup
diff --git a/test/net/imap/test_imap_login.rb b/test/net/imap/test_imap_login.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "fake_server"
 
-class IMAPLoginTest < Test::Unit::TestCase
+class IMAPLoginTest < Net::IMAP::TestCase
   include Net::IMAP::FakeServer::TestHelper
 
   def setup
diff --git a/test/net/imap/test_imap_max_response_size.rb b/test/net/imap/test_imap_max_response_size.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "fake_server"
 
-class IMAPMaxResponseSizeTest < Test::Unit::TestCase
+class IMAPMaxResponseSizeTest < Net::IMAP::TestCase
   include Net::IMAP::FakeServer::TestHelper
 
   def setup
diff --git a/test/net/imap/test_imap_response_handlers.rb b/test/net/imap/test_imap_response_handlers.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "fake_server"
 
-class IMAPResponseHandlersTest < Test::Unit::TestCase
+class IMAPResponseHandlersTest < Net::IMAP::TestCase
   include Net::IMAP::FakeServer::TestHelper
 
   def setup
diff --git a/test/net/imap/test_imap_responses.rb b/test/net/imap/test_imap_responses.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "fake_server"
 
-class IMAPResponsesTest < Test::Unit::TestCase
+class IMAPResponsesTest < Net::IMAP::TestCase
   include Net::IMAP::FakeServer::TestHelper
 
   CONFIG_OPTIONS = %i[
diff --git a/test/net/imap/test_regexps.rb b/test/net/imap/test_regexps.rb
@@ -17,7 +17,7 @@ def to_h; {} end
   end
 end
 
-class IMAPRegexpsTest < Test::Unit::TestCase
+class IMAPRegexpsTest < Net::IMAP::TestCase
 
   data(
     RegexpCollector.new(
diff --git a/test/net/imap/test_response_parser.rb b/test/net/imap/test_response_parser.rb
@@ -4,7 +4,7 @@
 require "test/unit"
 require_relative "net_imap_test_helpers"
 
-class ResponseParserTest < Test::Unit::TestCase
+class ResponseParserTest < Net::IMAP::TestCase
   TEST_FIXTURE_PATH = File.join(__dir__, "fixtures/response_parser")
 
   include NetIMAPTestHelpers
diff --git a/test/net/imap/test_response_reader.rb b/test/net/imap/test_response_reader.rb
@@ -4,7 +4,7 @@
 require "stringio"
 require "test/unit"
 
-class ResponseReaderTest < Test::Unit::TestCase
+class ResponseReaderTest < Net::IMAP::TestCase
   def setup
     Net::IMAP.config.reset
   end
diff --git a/test/net/imap/test_saslprep.rb b/test/net/imap/test_saslprep.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class SASLprepTest < Test::Unit::TestCase
+class SASLprepTest < Net::IMAP::TestCase
   include Net::IMAP::StringPrep
 
   # Test cases from RFC-4013 §3:
diff --git a/test/net/imap/test_search_result.rb b/test/net/imap/test_search_result.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class SearchDataTests < Test::Unit::TestCase
+class SearchDataTests < Net::IMAP::TestCase
   SearchResult = Net::IMAP::SearchResult
 
   test "#modseq" do
diff --git a/test/net/imap/test_sequence_set.rb b/test/net/imap/test_sequence_set.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class IMAPSequenceSetTest < Test::Unit::TestCase
+class IMAPSequenceSetTest < Net::IMAP::TestCase
   # alias for convenience
   SequenceSet     = Net::IMAP::SequenceSet
   DataFormatError = Net::IMAP::DataFormatError
diff --git a/test/net/imap/test_stringprep_nameprep.rb b/test/net/imap/test_stringprep_nameprep.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class StringPrepNamePrepTest < Test::Unit::TestCase
+class StringPrepNamePrepTest < Net::IMAP::TestCase
   include Net::IMAP::StringPrep
   include Net::IMAP::StringPrep::NamePrep
 
diff --git a/test/net/imap/test_stringprep_profiles.rb b/test/net/imap/test_stringprep_profiles.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class StringPrepProfilesTest < Test::Unit::TestCase
+class StringPrepProfilesTest < Net::IMAP::TestCase
   include Net::IMAP::StringPrep
   include Net::IMAP::StringPrep::Trace
 
diff --git a/test/net/imap/test_stringprep_tables.rb b/test/net/imap/test_stringprep_tables.rb
@@ -6,7 +6,7 @@
 
 require_relative "../../../rakelib/string_prep_tables_generator"
 
-class StringPrepTablesTest < Test::Unit::TestCase
+class StringPrepTablesTest < Net::IMAP::TestCase
   include Net::IMAP::StringPrep
 
   # Surrogates are excluded.  They are handled by enforcing valid UTF8 encoding.
diff --git a/test/net/imap/test_thread_member.rb b/test/net/imap/test_thread_member.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class ThreadMemberTest < Test::Unit::TestCase
+class ThreadMemberTest < Net::IMAP::TestCase
 
   test "#to_sequence_set" do
     # copied from the fourth example in RFC5256: (3 6 (4 23)(44 7 96))
diff --git a/test/net/imap/test_uidplus_data.rb b/test/net/imap/test_uidplus_data.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class TestUIDPlusData < Test::Unit::TestCase
+class TestUIDPlusData < Net::IMAP::TestCase
 
   test "#uid_mapping with sorted source_uids" do
     uidplus = Net::IMAP::UIDPlusData.new(
@@ -45,7 +45,7 @@ class TestUIDPlusData < Test::Unit::TestCase
 
 end
 
-class TestAppendUIDData < Test::Unit::TestCase
+class TestAppendUIDData < Net::IMAP::TestCase
   # alias for convenience
   AppendUIDData = Net::IMAP::AppendUIDData
   SequenceSet = Net::IMAP::SequenceSet
@@ -81,7 +81,7 @@ class TestAppendUIDData < Test::Unit::TestCase
 
 end
 
-class TestCopyUIDData < Test::Unit::TestCase
+class TestCopyUIDData < Net::IMAP::TestCase
   # alias for convenience
   CopyUIDData = Net::IMAP::CopyUIDData
   SequenceSet = Net::IMAP::SequenceSet
diff --git a/test/net/imap/test_vanished_data.rb b/test/net/imap/test_vanished_data.rb
@@ -3,7 +3,7 @@
 require "net/imap"
 require "test/unit"
 
-class VanishedDataTest < Test::Unit::TestCase
+class VanishedDataTest < Net::IMAP::TestCase
   VanishedData    = Net::IMAP::VanishedData
   SequenceSet     = Net::IMAP::SequenceSet
   DataFormatError = Net::IMAP::DataFormatError
