summaryrefslogtreecommitdiff
path: root/test/-ext-/marshal
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-04 02:40:30 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-04 02:40:30 +0000
commit81a0c608eb73f1a250ec9ec11107280b8d086ef8 (patch)
treef790c121eede11e7838189e798ffff60038b97da /test/-ext-/marshal
parent2493e48d40bb984f315be0e478bf3b9f0dec588c (diff)
compatible loader
* marshal.c (r_object0): also load TYPE_USRMARSHAL, TYPE_DATA using compatible loader. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/-ext-/marshal')
-rw-r--r--test/-ext-/marshal/test_usrmarshal.rb34
1 files changed, 34 insertions, 0 deletions
diff --git a/test/-ext-/marshal/test_usrmarshal.rb b/test/-ext-/marshal/test_usrmarshal.rb
new file mode 100644
index 0000000000..54adace7d6
--- /dev/null
+++ b/test/-ext-/marshal/test_usrmarshal.rb
@@ -0,0 +1,34 @@
+require 'test/unit'
+require_relative '../../ruby/envutil'
+require '-test-/marshal/usr'
+
+module Bug end
+
+module Bug::Marshal
+ class TestUsrMarshal < Test::Unit::TestCase
+ def old_dump
+ @old_dump ||=
+ begin
+ src = "module Bug; module Marshal; class UsrMarshal; def initialize(val) @value = val; end; end; ::Marshal.dump(UsrMarshal.new(42), STDOUT); end; end"
+ EnvUtil.invoke_ruby([], src, true)[0]
+ end
+ end
+
+ def test_marshal
+ v = ::Marshal.load(::Marshal.dump(UsrMarshal.new(42)))
+ assert_instance_of(UsrMarshal, v)
+ assert_equal(42, v.value)
+ end
+
+ def test_incompat
+ e = assert_raise(ArgumentError) {::Marshal.load(old_dump)}
+ assert_equal("dump format error", e.message)
+ end
+
+ def test_compat
+ out, err = EnvUtil.invoke_ruby(["-r-test-/marshal/usr", "-r-test-/marshal/compat", "-e", "::Marshal.dump(::Marshal.load(STDIN), STDOUT)"], old_dump, true, true)
+ assert_equal(::Marshal.dump(UsrMarshal.new(42)), out)
+ assert_equal("", err)
+ end
+ end
+end