Manage skipping instance variable IDs in one place

1 files changed, 8 insertions, 2 deletions

diff --git a/test/-ext-/marshal/test_internal_ivar.rb b/test/-ext-/marshal/test_internal_ivar.rb
index faabe14ab2..8b4667fdf9 100644
--- a/test/-ext-/marshal/test_internal_ivar.rb
+++ b/test/-ext-/marshal/test_internal_ivar.rb
@@ -7,11 +7,16 @@ module Bug end
 module Bug::Marshal
   class TestInternalIVar < Test::Unit::TestCase
     def test_marshal
-      v = InternalIVar.new("hello", "world", "bye")
+      v = InternalIVar.new("hello", "world", "bye", "hi")
       assert_equal("hello", v.normal)
       assert_equal("world", v.internal)
       assert_equal("bye", v.encoding_short)
-      dump = assert_warn(/instance variable 'E' on class \S+ is not dumped/) {
+      assert_equal("hi", v.encoding_long)
+      warnings = ->(s) {
+        w = s.scan(/instance variable '(.+?)' on class \S+ is not dumped/)
+        assert_equal(%w[E K encoding], w.flatten.sort)
+      }
+      dump = assert_warn(warnings) {
         ::Marshal.dump(v)
       }
       v = assert_nothing_raised {break ::Marshal.load(dump)}
@@ -19,6 +24,7 @@ module Bug::Marshal
       assert_equal("hello", v.normal)
       assert_nil(v.internal)
       assert_nil(v.encoding_short)
+      assert_nil(v.encoding_long)
     end
   end
 end