aboutsummaryrefslogtreecommitdiffstats
path: root/ruby/tests/basic.rb
diff options
context:
space:
mode:
authorJoe Bolinger <jbolinger@google.com>2019-03-06 18:58:58 -0800
committerPaul Yang <TeBoring@users.noreply.github.com>2019-03-06 18:58:58 -0800
commitf4f32a5b680111b25234db800b52200e4cdbb884 (patch)
tree9be271fa5b5beb6e5cccdf18d5ba74f391c7230e /ruby/tests/basic.rb
parent1568deab40db055a79fa415d21547eaffbd56d57 (diff)
downloadplatform_external_protobuf-f4f32a5b680111b25234db800b52200e4cdbb884.tar.gz
platform_external_protobuf-f4f32a5b680111b25234db800b52200e4cdbb884.tar.bz2
platform_external_protobuf-f4f32a5b680111b25234db800b52200e4cdbb884.zip
make tests work on older rubies (#5823)
Diffstat (limited to 'ruby/tests/basic.rb')
-rw-r--r--ruby/tests/basic.rb11
1 files changed, 7 insertions, 4 deletions
diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb
index db9761444..591a1c3a6 100644
--- a/ruby/tests/basic.rb
+++ b/ruby/tests/basic.rb
@@ -358,6 +358,9 @@ module BasicTest
assert_equal :proto3, file_descriptor.syntax
end
+ # Ruby 2.5 changed to raise FrozenError instead of RuntimeError
+ FrozenErrorType = Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.5') ? RuntimeError : FrozenError
+
def test_map_freeze
m = proto_module::MapMessage.new
m.map_string_int32['a'] = 5
@@ -369,10 +372,10 @@ module BasicTest
assert m.map_string_int32.frozen?
assert m.map_string_msg.frozen?
- assert_raise(FrozenError) { m.map_string_int32['foo'] = 1 }
- assert_raise(FrozenError) { m.map_string_msg['bar'] = proto_module::TestMessage2.new }
- assert_raise(FrozenError) { m.map_string_int32.delete('a') }
- assert_raise(FrozenError) { m.map_string_int32.clear }
+ assert_raise(FrozenErrorType) { m.map_string_int32['foo'] = 1 }
+ assert_raise(FrozenErrorType) { m.map_string_msg['bar'] = proto_module::TestMessage2.new }
+ assert_raise(FrozenErrorType) { m.map_string_int32.delete('a') }
+ assert_raise(FrozenErrorType) { m.map_string_int32.clear }
end
end
end