refactor: Split tests with excessive assertions

Split test methods that exceeded the Minitest/MultipleAssertions limit
into smaller, more focused tests.

Author: weppos

.rubocop.yml

@@ -20,6 +20,13 @@ AllCops:
     - 'test/profilers/**/*'
   TargetRubyVersion: 3.0
 
+# Dear Rubocop, I don't want to use String#strip_heredoc
+Layout/HeredocIndentation:
+  Enabled: false
+
+Minitest/MultipleAssertions:
+  Max: 10
+
 # I often use @_variable to avoid clashing.
 Naming/MemoizedInstanceVariableName:
   Enabled: false
@@ -29,14 +36,10 @@ Style/ClassAndModuleChildren:
     - 'spec/**/*_spec.rb'
     - 'test/**/*_test.rb'
 
-# Dear Rubocop, I don't want to use String#strip_heredoc
-Layout/HeredocIndentation:
-  Enabled: false
-
-Style/WordArray:
+Style/SymbolArray:
   Enabled: false
   MinSize: 3
 
-Style/SymbolArray:
+Style/WordArray:
   Enabled: false
   MinSize: 3

.rubocop_todo.yml

@@ -5,7 +5,3 @@
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 19
-Minitest/MultipleAssertions:
-  Max: 12

test/acceptance_test.rb

@@ -15,20 +15,29 @@ class AcceptanceTest < Minitest::Test
     ["foo.parliament.uk",       "parliament.uk",      ["foo", "parliament", "uk"]],
   ].freeze
 
-  def test_valid
-    VALID_CASES.each do |input, domain, results|
+  def test_valid_parsing
+    VALID_CASES.each do |input, _domain, results|
       parsed = PublicSuffix.parse(input)
       trd, sld, tld = results
 
-      assert_equal tld, parsed.tld, "Invalid tld for `#{name}`"
-      assert_equal sld, parsed.sld, "Invalid sld for `#{name}`"
+      assert_equal tld, parsed.tld, "Invalid tld for `#{input}`"
+      assert_equal sld, parsed.sld, "Invalid sld for `#{input}`"
       if trd.nil?
-        assert_nil parsed.trd, "Invalid trd for `#{name}`"
+        assert_nil parsed.trd, "Invalid trd for `#{input}`"
       else
-        assert_equal trd, parsed.trd, "Invalid trd for `#{name}`"
+        assert_equal trd, parsed.trd, "Invalid trd for `#{input}`"
       end
+    end
+  end
 
+  def test_valid_domain
+    VALID_CASES.each do |input, domain, _results|
       assert_equal domain, PublicSuffix.domain(input)
+    end
+  end
+
+  def test_valid_validation
+    VALID_CASES.each do |input, _domain, _results|
       assert PublicSuffix.valid?(input)
     end
   end

test/unit/list_test.rb

@@ -96,8 +96,47 @@ def test_clear
   end
 
 
-  def test_find
-    list = PublicSuffix::List.parse(<<LIST)
+  def test_find_iana
+    list = build_test_list
+
+    assert_equal PublicSuffix::Rule.factory("com"), list.find("example.com")
+    assert_equal PublicSuffix::Rule.factory("com"), list.find("foo.example.com")
+  end
+
+  def test_find_wildcard
+    list = build_test_list
+
+    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("example.uk")
+    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("example.co.uk")
+    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("foo.example.co.uk")
+  end
+
+  def test_find_exception
+    list = build_test_list
+
+    assert_equal PublicSuffix::Rule.factory("!british-library.uk"), list.find("british-library.uk")
+    assert_equal PublicSuffix::Rule.factory("!british-library.uk"), list.find("foo.british-library.uk")
+  end
+
+  def test_find_default
+    list = build_test_list
+
+    assert_equal PublicSuffix::Rule.factory("*"), list.find("test")
+    assert_equal PublicSuffix::Rule.factory("*"), list.find("example.test")
+    assert_equal PublicSuffix::Rule.factory("*"), list.find("foo.example.test")
+  end
+
+  def test_find_private
+    list = build_test_list
+
+    assert_equal PublicSuffix::Rule.factory("blogspot.com", private: true), list.find("blogspot.com")
+    assert_equal PublicSuffix::Rule.factory("blogspot.com", private: true), list.find("foo.blogspot.com")
+  end
+
+  private
+
+  def build_test_list
+    PublicSuffix::List.parse(<<LIST)
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
@@ -124,28 +163,6 @@ def test_find
 
 // ===END PRIVATE DOMAINS===
 LIST
-
-    # match IANA
-    assert_equal PublicSuffix::Rule.factory("com"), list.find("example.com")
-    assert_equal PublicSuffix::Rule.factory("com"), list.find("foo.example.com")
-
-    # match wildcard
-    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("example.uk")
-    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("example.co.uk")
-    assert_equal PublicSuffix::Rule.factory("*.uk"), list.find("foo.example.co.uk")
-
-    # match exception
-    assert_equal PublicSuffix::Rule.factory("!british-library.uk"), list.find("british-library.uk")
-    assert_equal PublicSuffix::Rule.factory("!british-library.uk"), list.find("foo.british-library.uk")
-
-    # match default rule
-    assert_equal PublicSuffix::Rule.factory("*"), list.find("test")
-    assert_equal PublicSuffix::Rule.factory("*"), list.find("example.test")
-    assert_equal PublicSuffix::Rule.factory("*"), list.find("foo.example.test")
-
-    # match private
-    assert_equal PublicSuffix::Rule.factory("blogspot.com", private: true), list.find("blogspot.com")
-    assert_equal PublicSuffix::Rule.factory("blogspot.com", private: true), list.find("foo.blogspot.com")
   end
 
 

test/unit/rule_test.rb

@@ -76,39 +76,58 @@ def test_equality_with_internals
   end
   # rubocop:enable Style/SingleLineMethods
 
-  def test_match
+  def test_match_standard
     [
-      # standard match
       [PublicSuffix::Rule.factory("uk"), "uk", true],
       [PublicSuffix::Rule.factory("uk"), "example.uk", true],
       [PublicSuffix::Rule.factory("uk"), "example.co.uk", true],
       [PublicSuffix::Rule.factory("co.uk"), "example.co.uk", true],
+    ].each do |rule, input, expected|
+      assert_equal expected, rule.match?(input)
+    end
+  end
 
+  def test_match_wildcard_and_exception
+    [
       # FIXME
       # [PublicSuffix::Rule.factory("*.com"), "com", false],
       [PublicSuffix::Rule.factory("*.com"), "example.com", true],
       [PublicSuffix::Rule.factory("*.com"), "foo.example.com", true],
       [PublicSuffix::Rule.factory("!example.com"), "com", false],
       [PublicSuffix::Rule.factory("!example.com"), "example.com", true],
       [PublicSuffix::Rule.factory("!example.com"), "foo.example.com", true],
+    ].each do |rule, input, expected|
+      assert_equal expected, rule.match?(input)
+    end
+  end
 
-      # TLD mismatch
+  def test_match_tld_mismatch
+    [
       [PublicSuffix::Rule.factory("gk"), "example.uk", false],
       [PublicSuffix::Rule.factory("gk"), "example.co.uk", false],
       [PublicSuffix::Rule.factory("co.uk"), "uk", false],
+    ].each do |rule, input, expected|
+      assert_equal expected, rule.match?(input)
+    end
+  end
 
-      # general mismatch
+  def test_match_general_mismatch
+    [
       [PublicSuffix::Rule.factory("uk.co"), "example.co.uk", false],
       [PublicSuffix::Rule.factory("go.uk"), "example.co.uk", false],
       [PublicSuffix::Rule.factory("co.uk"), "uk", false],
+    ].each do |rule, input, expected|
+      assert_equal expected, rule.match?(input)
+    end
+  end
 
-      # partial matches/mismatches
+  def test_match_partial
+    [
       [PublicSuffix::Rule.factory("co"), "example.co.uk", false],
       [PublicSuffix::Rule.factory("example"), "example.uk", false],
       [PublicSuffix::Rule.factory("le.it"), "example.it", false],
       [PublicSuffix::Rule.factory("le.it"), "le.it", true],
       [PublicSuffix::Rule.factory("le.it"), "foo.le.it", true],
-
     ].each do |rule, input, expected|
       assert_equal expected, rule.match?(input)
     end