From fb48a97ca091820264f9a61c5ed1babbb6270a96 Mon Sep 17 00:00:00 2001 From: Ryan Davis Date: Fri, 25 Feb 2022 14:35:03 -0800 Subject: [PATCH] Updated the test suite to handle ASCII-8BIT renaming. (casperisfine) [git-p4: depot-paths = "//src/minitest/dev/": change = 13319] --- test/minitest/test_minitest_assertions.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/minitest/test_minitest_assertions.rb b/test/minitest/test_minitest_assertions.rb index 283dff56..5f518068 100644 --- a/test/minitest/test_minitest_assertions.rb +++ b/test/minitest/test_minitest_assertions.rb @@ -354,7 +354,7 @@ def test_assert_equal_string_encodings @@ -1,3 +1,3 @@ -# encoding: UTF-8 -# valid: false - +# encoding: ASCII-8BIT + +# encoding: #{Encoding::BINARY.name} +# valid: true "bad-utf8-\\xF1.txt" EOM @@ -373,7 +373,7 @@ def test_assert_equal_string_encodings_both_different @@ -1,3 +1,3 @@ -# encoding: US-ASCII -# valid: false - +# encoding: ASCII-8BIT + +# encoding: #{Encoding::BINARY.name} +# valid: true "bad-utf8-\\xF1.txt" EOM @@ -1528,14 +1528,14 @@ def test_mu_pp_for_diff_str_bad_encoding_both def test_mu_pp_for_diff_str_encoding str = "A\nB".b - exp = "# encoding: ASCII-8BIT\n# valid: true\n\"A\nB\"" + exp = "# encoding: #{Encoding::BINARY.name}\n# valid: true\n\"A\nB\"" assert_mu_pp_for_diff exp, str, :raw end def test_mu_pp_for_diff_str_encoding_both str = "A\\n\nB".b - exp = "# encoding: ASCII-8BIT\n# valid: true\n\"A\\\\n\\nB\"" + exp = "# encoding: #{Encoding::BINARY.name}\n# valid: true\n\"A\\\\n\\nB\"" assert_mu_pp_for_diff exp, str, :raw end @@ -1575,7 +1575,7 @@ def test_mu_pp_str_bad_encoding def test_mu_pp_str_encoding str = "A\nB".b - exp = "# encoding: ASCII-8BIT\n# valid: true\n\"A\\nB\"" + exp = "# encoding: #{Encoding::BINARY.name}\n# valid: true\n\"A\\nB\"" assert_mu_pp exp, str, :raw end