From 3fe6a5d5104d51d4e1365b36f5d59b59c17bc462 Mon Sep 17 00:00:00 2001
From: Akira Matsuda <ronnie@dio.jp>
Date: Fri, 23 Dec 2016 20:31:57 +0900
Subject: [PATCH] Privatize unneededly protected methods in Active Support
 tests

---
 activesupport/test/descendants_tracker_test_cases.rb          | 2 +-
 activesupport/test/json/encoding_test.rb                      | 2 +-
 activesupport/test/multibyte_conformance_test.rb              | 2 +-
 .../test/multibyte_grapheme_break_conformance_test.rb         | 2 +-
 .../test/multibyte_normalization_conformance_test.rb          | 2 +-
 activesupport/test/notifications_test.rb                      | 2 +-
 activesupport/test/test_case_test.rb                          | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/activesupport/test/descendants_tracker_test_cases.rb b/activesupport/test/descendants_tracker_test_cases.rb
index 09c5ce1f07a..cf349d53ee4 100644
--- a/activesupport/test/descendants_tracker_test_cases.rb
+++ b/activesupport/test/descendants_tracker_test_cases.rb
@@ -40,7 +40,7 @@ module DescendantsTrackerTestCases
     end
   end
 
-  protected
+  private
 
     def assert_equal_sets(expected, actual)
       assert_equal Set.new(expected), Set.new(actual)
diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb
index fa518104c2c..8893b9d4756 100644
--- a/activesupport/test/json/encoding_test.rb
+++ b/activesupport/test/json/encoding_test.rb
@@ -452,7 +452,7 @@ EXPECTED
     assert_equal '{"number":null}', NaNNumber.new.to_json
   end
 
-  protected
+  private
 
     def object_keys(json_object)
       json_object[1..-2].scan(/([^{}:,\s]+):/).flatten.sort
diff --git a/activesupport/test/multibyte_conformance_test.rb b/activesupport/test/multibyte_conformance_test.rb
index bf004d7924a..ef1a26135f2 100644
--- a/activesupport/test/multibyte_conformance_test.rb
+++ b/activesupport/test/multibyte_conformance_test.rb
@@ -82,7 +82,7 @@ class MultibyteConformanceTest < ActiveSupport::TestCase
     end
   end
 
-  protected
+  private
     def each_line_of_norm_tests(&block)
       File.open(File.join(CACHE_DIR, UNIDATA_FILE), "r") do | f |
         until f.eof?
diff --git a/activesupport/test/multibyte_grapheme_break_conformance_test.rb b/activesupport/test/multibyte_grapheme_break_conformance_test.rb
index 04a7d290d99..b3328987aed 100644
--- a/activesupport/test/multibyte_grapheme_break_conformance_test.rb
+++ b/activesupport/test/multibyte_grapheme_break_conformance_test.rb
@@ -28,7 +28,7 @@ class MultibyteGraphemeBreakConformanceTest < ActiveSupport::TestCase
     end
   end
 
-  protected
+  private
     def each_line_of_break_tests(&block)
       lines = 0
       max_test_lines = 0 # Don't limit below 21, because that's the header of the testfile
diff --git a/activesupport/test/multibyte_normalization_conformance_test.rb b/activesupport/test/multibyte_normalization_conformance_test.rb
index e013bd578f3..ebc9f92d23c 100644
--- a/activesupport/test/multibyte_normalization_conformance_test.rb
+++ b/activesupport/test/multibyte_normalization_conformance_test.rb
@@ -83,7 +83,7 @@ class MultibyteNormalizationConformanceTest < ActiveSupport::TestCase
     end
   end
 
-  protected
+  private
     def each_line_of_norm_tests(&block)
       lines = 0
       max_test_lines = 0 # Don't limit below 38, because that's the header of the testfile
diff --git a/activesupport/test/notifications_test.rb b/activesupport/test/notifications_test.rb
index a6f0d82e8aa..11f743519f7 100644
--- a/activesupport/test/notifications_test.rb
+++ b/activesupport/test/notifications_test.rb
@@ -273,7 +273,7 @@ module Notifications
       assert !not_child.parent_of?(parent)
     end
 
-    protected
+    private
       def random_id
         @random_id ||= SecureRandom.hex(10)
       end
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index d769a8c1456..af7fc44d663 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -257,7 +257,7 @@ class SetupAndTeardownTest < ActiveSupport::TestCase
   def teardown
   end
 
-  protected
+  private
 
     def reset_callback_record
       @called_back = []
@@ -282,7 +282,7 @@ class SubclassSetupAndTeardownTest < SetupAndTeardownTest
     assert_equal [:foo, :sentinel, :bar], self.class._teardown_callbacks.map(&:raw_filter)
   end
 
-  protected
+  private
     def bar
       @called_back << :bar
     end