aboutsummaryrefslogtreecommitdiffhomepage
path: root/ruby/tests
diff options
context:
space:
mode:
authorGravatar Josh Haberman <jhaberman@gmail.com>2016-05-18 15:39:29 -0700
committerGravatar Josh Haberman <jhaberman@gmail.com>2016-05-18 15:39:29 -0700
commit2d514ce2d8b1f5fb00c6031a1a8e4dab968e4927 (patch)
tree3fcda3102a191c257fcefefede684f87d9507d56 /ruby/tests
parent545527e8cfedc43dc6b862af23691affcb1285f7 (diff)
Fixed oneof behavior for enums and fixed JRuby.
Diffstat (limited to 'ruby/tests')
-rw-r--r--ruby/tests/basic.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb
index db6a3c75..fee07e33 100644
--- a/ruby/tests/basic.rb
+++ b/ruby/tests/basic.rb
@@ -706,28 +706,28 @@ module BasicTest
assert d.a == ""
assert d.b == 0
assert d.c == nil
- assert d.d == 0
+ assert d.d == :Default
assert d.my_oneof == nil
d.a = "hi"
assert d.a == "hi"
assert d.b == 0
assert d.c == nil
- assert d.d == 0
+ assert d.d == :Default
assert d.my_oneof == :a
d.b = 42
assert d.a == ""
assert d.b == 42
assert d.c == nil
- assert d.d == 0
+ assert d.d == :Default
assert d.my_oneof == :b
d.c = TestMessage2.new(:foo => 100)
assert d.a == ""
assert d.b == 0
assert d.c.foo == 100
- assert d.d == 0
+ assert d.d == :Default
assert d.my_oneof == :c
d.d = :C
@@ -759,7 +759,7 @@ module BasicTest
assert d4.a == ""
assert d4.b == 0
assert d4.c.foo == 1
- assert d4.d == 0
+ assert d4.d == :Default
d5 = OneofMessage.new(:a => "hello")
assert d5.a == "hello"