1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support old versions of Ruby with FrozenError.

Browse Source 
They should work separatedly from Ruby core repository.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
hsbt 2018-08-07 12:47:11 +00:00
parent d59fc41fba
commit 1380aa04a6
6 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ostruct.rb
View File

@ -156,7 +156,8 @@ class OpenStruct
begin begin
@modifiable = true @modifiable = true
rescue rescue
raise FrozenError, "can't modify frozen #{self.class}", caller(3) exception_class = defined?(FrozenError) ? FrozenError : RuntimeError
raise exception_class, "can't modify frozen #{self.class}", caller(3)
end end
@table @table
end end

6
test/date/test_date_marshal.rb
View File

@ -30,13 +30,15 @@ class TestDateMarshal < Test::Unit::TestCase
a = d.marshal_dump a = d.marshal_dump
d.freeze d.freeze
assert(d.frozen?) assert(d.frozen?)
assert_raise(FrozenError){d.marshal_load(a)} expected_error = defined?(FrozenError) ? FrozenError : RuntimeError
assert_raise(expected_error){d.marshal_load(a)}
d = DateTime.now d = DateTime.now
a = d.marshal_dump a = d.marshal_dump
d.freeze d.freeze
assert(d.frozen?) assert(d.frozen?)
assert_raise(FrozenError){d.marshal_load(a)} expected_error = defined?(FrozenError) ? FrozenError : RuntimeError
assert_raise(expected_error){d.marshal_load(a)}
end end
end end

3
test/dbm/test_dbm.rb
View File

@ -625,9 +625,10 @@ if defined? DBM
end end
def test_freeze def test_freeze
expected_error = defined?(FrozenError) ? FrozenError : RuntimeError
DBM.open("#{@tmproot}/a") {|d| DBM.open("#{@tmproot}/a") {|d|
d.freeze d.freeze
assert_raise(FrozenError) { d["k"] = "v" } assert_raise(expected_error) { d["k"] = "v" }
} }
end end
end end

3
test/gdbm/test_gdbm.rb
View File

@ -726,7 +726,8 @@ if defined? GDBM
def test_freeze def test_freeze
GDBM.open("#{@tmproot}/a.dbm") {|d| GDBM.open("#{@tmproot}/a.dbm") {|d|
d.freeze d.freeze
assert_raise(FrozenError) { d["k"] = "v" } expected_error = defined?(FrozenError) ? FrozenError : RuntimeError
assert_raise(expected_error) { d["k"] = "v" }
} }
end end
end end

7
test/ostruct/test_ostruct.rb
View File

@ -66,15 +66,16 @@ class TC_OpenStruct < Test::Unit::TestCase
o = OpenStruct.new(foo: 42) o = OpenStruct.new(foo: 42)
o.a = 'a' o.a = 'a'
o.freeze o.freeze
assert_raise(FrozenError) {o.b = 'b'} expected_error = defined?(FrozenError) ? FrozenError : RuntimeError
assert_raise(expected_error) {o.b = 'b'}
assert_not_respond_to(o, :b) assert_not_respond_to(o, :b)
assert_raise(FrozenError) {o.a = 'z'} assert_raise(expected_error) {o.a = 'z'}
assert_equal('a', o.a) assert_equal('a', o.a)
assert_equal(42, o.foo) assert_equal(42, o.foo)
o = OpenStruct.new :a => 42 o = OpenStruct.new :a => 42
def o.frozen?; nil end def o.frozen?; nil end
o.freeze o.freeze
assert_raise(FrozenError, '[ruby-core:22559]') {o.a = 1764} assert_raise(expected_error, '[ruby-core:22559]') {o.a = 1764}
end end
def test_delete_field def test_delete_field

7
test/stringio/test_stringio.rb
View File

@ -722,9 +722,10 @@ class TestStringIO < Test::Unit::TestCase
s = StringIO.new s = StringIO.new
s.freeze s.freeze
bug = '[ruby-core:33648]' bug = '[ruby-core:33648]'
assert_raise(FrozenError, bug) {s.puts("foo")} exception_class = defined?(FrozenError) ? FrozenError : RuntimeError
assert_raise(FrozenError, bug) {s.string = "foo"} assert_raise(exception_class, bug) {s.puts("foo")}
assert_raise(FrozenError, bug) {s.reopen("")} assert_raise(exception_class, bug) {s.string = "foo"}
assert_raise(exception_class, bug) {s.reopen("")}
end end
def test_frozen_string def test_frozen_string