From d0535cc09e6eac1bddddd51c20b5738c0e841765 Mon Sep 17 00:00:00 2001 From: Harshit Chopra Date: Fri, 25 Aug 2017 12:11:15 -0700 Subject: Adds support for proto2 syntax for Ruby gem. This change only adds basic proto2 support without advanced features like extensions, custom options, maps, etc. The protoc binary now generates ruby code for proto2 syntax. However, for now, it is restricted to proto2 files without advanced features like extensions, in which case it still errors out. This change also modifies the DSL to add proto messages to the DescriptorPool. There is a new DSL Builder#add_file to create a new FileDescriptor. With this, the generated ruby DSL looks something like: Google::Protobuf::DescriptorPool.generated_pool.build do add_file "test.proto" do add_message "foo" do optional :val, :int32, 1 end end end --- ruby/tests/basic.rb | 1325 +++++---------------------------------------------- 1 file changed, 125 insertions(+), 1200 deletions(-) (limited to 'ruby/tests/basic.rb') diff --git a/ruby/tests/basic.rb b/ruby/tests/basic.rb index f174402b..b93480b1 100644 --- a/ruby/tests/basic.rb +++ b/ruby/tests/basic.rb @@ -1,5 +1,10 @@ #!/usr/bin/ruby +# basic_test_pb.rb is in the same directory as this test. +$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) + +require 'basic_test_pb' +require 'common_tests' require 'google/protobuf' require 'json' require 'test/unit' @@ -9,696 +14,152 @@ require 'test/unit' module BasicTest pool = Google::Protobuf::DescriptorPool.new pool.build do - add_message "Foo" do - optional :bar, :message, 1, "Bar" - repeated :baz, :message, 2, "Baz" - end - - add_message "Bar" do - optional :msg, :string, 1 - end - - add_message "Baz" do - optional :msg, :string, 1 - end - - add_message "TestMessage" do - optional :optional_int32, :int32, 1 - optional :optional_int64, :int64, 2 - optional :optional_uint32, :uint32, 3 - optional :optional_uint64, :uint64, 4 - optional :optional_bool, :bool, 5 - optional :optional_float, :float, 6 - optional :optional_double, :double, 7 - optional :optional_string, :string, 8 - optional :optional_bytes, :bytes, 9 - optional :optional_msg, :message, 10, "TestMessage2" - optional :optional_enum, :enum, 11, "TestEnum" - - repeated :repeated_int32, :int32, 12 - repeated :repeated_int64, :int64, 13 - repeated :repeated_uint32, :uint32, 14 - repeated :repeated_uint64, :uint64, 15 - repeated :repeated_bool, :bool, 16 - repeated :repeated_float, :float, 17 - repeated :repeated_double, :double, 18 - repeated :repeated_string, :string, 19 - repeated :repeated_bytes, :bytes, 20 - repeated :repeated_msg, :message, 21, "TestMessage2" - repeated :repeated_enum, :enum, 22, "TestEnum" - end - add_message "TestMessage2" do - optional :foo, :int32, 1 - end - - add_message "TestEmbeddedMessageParent" do - optional :child_msg, :message, 1, "TestEmbeddedMessageChild" - optional :number, :int32, 2 - - repeated :repeated_msg, :message, 3, "TestEmbeddedMessageChild" - repeated :repeated_number, :int32, 4 - end - add_message "TestEmbeddedMessageChild" do - optional :sub_child, :message, 1, "TestMessage" - end - - add_message "Recursive1" do - optional :foo, :message, 1, "Recursive2" - end - add_message "Recursive2" do - optional :foo, :message, 1, "Recursive1" - end - - add_enum "TestEnum" do - value :Default, 0 - value :A, 1 - value :B, 2 - value :C, 3 - end - add_message "BadFieldNames" do optional :dup, :int32, 1 optional :class, :int32, 2 optional :"a.b", :int32, 3 end - - add_message "MapMessage" do - map :map_string_int32, :string, :int32, 1 - map :map_string_msg, :string, :message, 2, "TestMessage2" - end - add_message "MapMessageWireEquiv" do - repeated :map_string_int32, :message, 1, "MapMessageWireEquiv_entry1" - repeated :map_string_msg, :message, 2, "MapMessageWireEquiv_entry2" - end - add_message "MapMessageWireEquiv_entry1" do - optional :key, :string, 1 - optional :value, :int32, 2 - end - add_message "MapMessageWireEquiv_entry2" do - optional :key, :string, 1 - optional :value, :message, 2, "TestMessage2" - end - - add_message "OneofMessage" do - oneof :my_oneof do - optional :a, :string, 1 - optional :b, :int32, 2 - optional :c, :message, 3, "TestMessage2" - optional :d, :enum, 4, "TestEnum" - end - end - - add_message "repro.Outer" do - map :items, :int32, :message, 1, "repro.Inner" - end - - add_message "repro.Inner" do - end end - - Outer = pool.lookup("repro.Outer").msgclass - Inner = pool.lookup("repro.Inner").msgclass - Foo = pool.lookup("Foo").msgclass - Bar = pool.lookup("Bar").msgclass - Baz = pool.lookup("Baz").msgclass - TestMessage = pool.lookup("TestMessage").msgclass - TestMessage2 = pool.lookup("TestMessage2").msgclass - TestEmbeddedMessageParent = pool.lookup("TestEmbeddedMessageParent").msgclass - TestEmbeddedMessageChild = pool.lookup("TestEmbeddedMessageChild").msgclass - Recursive1 = pool.lookup("Recursive1").msgclass - Recursive2 = pool.lookup("Recursive2").msgclass - TestEnum = pool.lookup("TestEnum").enummodule BadFieldNames = pool.lookup("BadFieldNames").msgclass - MapMessage = pool.lookup("MapMessage").msgclass - MapMessageWireEquiv = pool.lookup("MapMessageWireEquiv").msgclass - MapMessageWireEquiv_entry1 = - pool.lookup("MapMessageWireEquiv_entry1").msgclass - MapMessageWireEquiv_entry2 = - pool.lookup("MapMessageWireEquiv_entry2").msgclass - OneofMessage = pool.lookup("OneofMessage").msgclass # ------------ test cases --------------- class MessageContainerTest < Test::Unit::TestCase - - def test_defaults - m = TestMessage.new - assert m.optional_int32 == 0 - assert m.optional_int64 == 0 - assert m.optional_uint32 == 0 - assert m.optional_uint64 == 0 - assert m.optional_bool == false - assert m.optional_float == 0.0 - assert m.optional_double == 0.0 - assert m.optional_string == "" - assert m.optional_bytes == "" - assert m.optional_msg == nil - assert m.optional_enum == :Default - end - - def test_setters - m = TestMessage.new - m.optional_int32 = -42 - assert m.optional_int32 == -42 - m.optional_int64 = -0x1_0000_0000 - assert m.optional_int64 == -0x1_0000_0000 - m.optional_uint32 = 0x9000_0000 - assert m.optional_uint32 == 0x9000_0000 - m.optional_uint64 = 0x9000_0000_0000_0000 - assert m.optional_uint64 == 0x9000_0000_0000_0000 - m.optional_bool = true - assert m.optional_bool == true - m.optional_float = 0.5 - assert m.optional_float == 0.5 - m.optional_double = 0.5 - m.optional_string = "hello" - assert m.optional_string == "hello" - m.optional_string = :hello - assert m.optional_string == "hello" - m.optional_bytes = "world".encode!('ASCII-8BIT') - assert m.optional_bytes == "world" - m.optional_msg = TestMessage2.new(:foo => 42) - assert m.optional_msg == TestMessage2.new(:foo => 42) - m.optional_msg = nil - assert m.optional_msg == nil - m.optional_enum = :C - assert m.optional_enum == :C - m.optional_enum = 'C' - assert m.optional_enum == :C - end - - def test_ctor_args - m = TestMessage.new(:optional_int32 => -42, - :optional_msg => TestMessage2.new, - :optional_enum => :C, - :repeated_string => ["hello", "there", "world"]) - assert m.optional_int32 == -42 - assert m.optional_msg.class == TestMessage2 - assert m.repeated_string.length == 3 - assert m.optional_enum == :C - assert m.repeated_string[0] == "hello" - assert m.repeated_string[1] == "there" - assert m.repeated_string[2] == "world" - end - - def test_ctor_string_symbol_args - m = TestMessage.new(:optional_enum => 'C', :repeated_enum => ['A', 'B']) - assert_equal :C, m.optional_enum - assert_equal [:A, :B], m.repeated_enum - - m = TestMessage.new(:optional_string => :foo, :repeated_string => [:foo, :bar]) - assert_equal 'foo', m.optional_string - assert_equal ['foo', 'bar'], m.repeated_string - end - - def test_ctor_nil_args - m = TestMessage.new(:optional_enum => nil, :optional_int32 => nil, :optional_string => nil, :optional_msg => nil) - - assert_equal :Default, m.optional_enum - assert_equal 0, m.optional_int32 - assert_equal "", m.optional_string - assert_nil m.optional_msg - end - - def test_embeddedmsg_hash_init - m = TestEmbeddedMessageParent.new(:child_msg => {sub_child: {optional_int32: 1}}, - :number => 2, - :repeated_msg => [{sub_child: {optional_int32: 3}}], - :repeated_number => [10, 20, 30]) - - assert_equal 2, m.number - assert_equal [10, 20, 30], m.repeated_number - - assert_not_nil m.child_msg - assert_not_nil m.child_msg.sub_child - assert_equal m.child_msg.sub_child.optional_int32, 1 - - assert_not_nil m.repeated_msg - assert_equal 1, m.repeated_msg.length - assert_equal 3, m.repeated_msg.first.sub_child.optional_int32 - end - - def test_inspect - m = TestMessage.new(:optional_int32 => -42, - :optional_enum => :A, - :optional_msg => TestMessage2.new, - :repeated_string => ["hello", "there", "world"]) - expected = ', optional_enum: :A, repeated_int32: [], repeated_int64: [], repeated_uint32: [], repeated_uint64: [], repeated_bool: [], repeated_float: [], repeated_double: [], repeated_string: ["hello", "there", "world"], repeated_bytes: [], repeated_msg: [], repeated_enum: []>' - assert_equal expected, m.inspect - end - - def test_hash - m1 = TestMessage.new(:optional_int32 => 42) - m2 = TestMessage.new(:optional_int32 => 102, repeated_string: ['please', 'work', 'ok?']) - m3 = TestMessage.new(:optional_int32 => 102, repeated_string: ['please', 'work', 'ok?']) - assert m1.hash != 0 - assert m2.hash != 0 - assert m3.hash != 0 - # relying on the randomness here -- if hash function changes and we are - # unlucky enough to get a collision, then change the values above. - assert m1.hash != m2.hash - assert_equal m2.hash, m3.hash - end - - def test_unknown_field_errors - e = assert_raise NoMethodError do - TestMessage.new.hello - end - assert_match(/hello/, e.message) - - e = assert_raise NoMethodError do - TestMessage.new.hello = "world" - end - assert_match(/hello/, e.message) - end - - def test_initialization_map_errors - e = assert_raise ArgumentError do - TestMessage.new(:hello => "world") - end - assert_match(/hello/, e.message) - - e = assert_raise ArgumentError do - MapMessage.new(:map_string_int32 => "hello") - end - assert_equal e.message, "Expected Hash object as initializer value for map field 'map_string_int32'." - - e = assert_raise ArgumentError do - TestMessage.new(:repeated_uint32 => "hello") - end - assert_equal e.message, "Expected array as initializer value for repeated field 'repeated_uint32'." + # Required by CommonTests module to resolve proto3 proto classes used in tests. + def proto_module + ::BasicTest end + include CommonTests - def test_type_errors + def test_has_field m = TestMessage.new - e = assert_raise Google::Protobuf::TypeError do - m.optional_int32 = "hello" - end - - # Google::Protobuf::TypeError should inherit from TypeError for backwards compatibility - # TODO: This can be removed when we can safely migrate to Google::Protobuf::TypeError - assert_true e.is_a?(::TypeError) - - assert_raise Google::Protobuf::TypeError do - m.optional_string = 42 - end - assert_raise Google::Protobuf::TypeError do - m.optional_string = nil - end - assert_raise Google::Protobuf::TypeError do - m.optional_bool = 42 + assert_false m.has_optional_msg? + m.optional_msg = TestMessage2.new + assert_true m.has_optional_msg? + assert_true TestMessage.descriptor.lookup('optional_msg').has?(m) + + m = OneofMessage.new + assert_false m.has_my_oneof? + m.a = "foo" + assert_true m.has_my_oneof? + assert_raise NoMethodError do + m.has_a? end - assert_raise Google::Protobuf::TypeError do - m.optional_msg = TestMessage.new # expects TestMessage2 - end - - assert_raise Google::Protobuf::TypeError do - m.repeated_int32 = [] # needs RepeatedField - end - - assert_raise Google::Protobuf::TypeError do - m.repeated_int32.push "hello" - end - - assert_raise Google::Protobuf::TypeError do - m.repeated_msg.push TestMessage.new + assert_raise ArgumentError do + OneofMessage.descriptor.lookup('a').has?(m) end - end - def test_string_encoding m = TestMessage.new - - # Assigning a normal (ASCII or UTF8) string to a bytes field, or - # ASCII-8BIT to a string field will convert to the proper encoding. - m.optional_bytes = "Test string ASCII".encode!('ASCII') - assert m.optional_bytes.frozen? - assert_equal Encoding::ASCII_8BIT, m.optional_bytes.encoding - assert_equal "Test string ASCII", m.optional_bytes - - assert_raise Encoding::UndefinedConversionError do - m.optional_bytes = "Test string UTF-8 \u0100".encode!('UTF-8') - end - - assert_raise Encoding::UndefinedConversionError do - m.optional_string = ["FFFF"].pack('H*') - end - - # "Ordinary" use case. - m.optional_bytes = ["FFFF"].pack('H*') - m.optional_string = "\u0100" - - # strings are immutable so we can't do this, but serialize should catch it. - m.optional_string = "asdf".encode!('UTF-8') - # Ruby 2.5 changed to raise FrozenError. However, assert_raise don't - # accept subclass. Don't specify type here. - assert_raise do - m.optional_string.encode!('ASCII-8BIT') - end - end - - def test_rptfield_int32 - l = Google::Protobuf::RepeatedField.new(:int32) - assert l.count == 0 - l = Google::Protobuf::RepeatedField.new(:int32, [1, 2, 3]) - assert l.count == 3 - assert_equal [1, 2, 3], l - assert_equal l, [1, 2, 3] - l.push 4 - assert l == [1, 2, 3, 4] - dst_list = [] - l.each { |val| dst_list.push val } - assert dst_list == [1, 2, 3, 4] - assert l.to_a == [1, 2, 3, 4] - assert l[0] == 1 - assert l[3] == 4 - l[0] = 5 - assert l == [5, 2, 3, 4] - - l2 = l.dup - assert l == l2 - assert l.object_id != l2.object_id - l2.push 6 - assert l.count == 4 - assert l2.count == 5 - - assert l.inspect == '[5, 2, 3, 4]' - - l.concat([7, 8, 9]) - assert l == [5, 2, 3, 4, 7, 8, 9] - assert l.pop == 9 - assert l == [5, 2, 3, 4, 7, 8] - - assert_raise Google::Protobuf::TypeError do - m = TestMessage.new - l.push m + assert_raise NoMethodError do + m.has_optional_int32? end - - m = TestMessage.new - m.repeated_int32 = l - assert m.repeated_int32 == [5, 2, 3, 4, 7, 8] - assert m.repeated_int32.object_id == l.object_id - l.push 42 - assert m.repeated_int32.pop == 42 - - l3 = l + l.dup - assert l3.count == l.count * 2 - l.count.times do |i| - assert l3[i] == l[i] - assert l3[l.count + i] == l[i] + assert_raise ArgumentError do + TestMessage.descriptor.lookup('optional_int32').has?(m) end - l.clear - assert l.count == 0 - l += [1, 2, 3, 4] - l.replace([5, 6, 7, 8]) - assert l == [5, 6, 7, 8] - - l4 = Google::Protobuf::RepeatedField.new(:int32) - l4[5] = 42 - assert l4 == [0, 0, 0, 0, 0, 42] - - l4 << 100 - assert l4 == [0, 0, 0, 0, 0, 42, 100] - l4 << 101 << 102 - assert l4 == [0, 0, 0, 0, 0, 42, 100, 101, 102] - end - - def test_parent_rptfield - #make sure we set the RepeatedField and can add to it - m = TestMessage.new - assert m.repeated_string == [] - m.repeated_string << 'ok' - m.repeated_string.push('ok2') - assert m.repeated_string == ['ok', 'ok2'] - m.repeated_string += ['ok3'] - assert m.repeated_string == ['ok', 'ok2', 'ok3'] - end - - def test_rptfield_msg - l = Google::Protobuf::RepeatedField.new(:message, TestMessage) - l.push TestMessage.new - assert l.count == 1 - assert_raise Google::Protobuf::TypeError do - l.push TestMessage2.new - end - assert_raise Google::Protobuf::TypeError do - l.push 42 + assert_raise NoMethodError do + m.has_optional_string? end - - l2 = l.dup - assert l2[0] == l[0] - assert l2[0].object_id == l[0].object_id - - l2 = Google::Protobuf.deep_copy(l) - assert l2[0] == l[0] - assert l2[0].object_id != l[0].object_id - - l3 = l + l2 - assert l3.count == 2 - assert l3[0] == l[0] - assert l3[1] == l2[0] - l3[0].optional_int32 = 1000 - assert l[0].optional_int32 == 1000 - - new_msg = TestMessage.new(:optional_int32 => 200) - l4 = l + [new_msg] - assert l4.count == 2 - new_msg.optional_int32 = 1000 - assert l4[1].optional_int32 == 1000 - end - - def test_rptfield_enum - l = Google::Protobuf::RepeatedField.new(:enum, TestEnum) - l.push :A - l.push :B - l.push :C - assert l.count == 3 - assert_raise RangeError do - l.push :D + assert_raise ArgumentError do + TestMessage.descriptor.lookup('optional_string').has?(m) end - assert l[0] == :A - - l.push 4 - assert l[3] == 4 - end - def test_rptfield_initialize - assert_raise ArgumentError do - l = Google::Protobuf::RepeatedField.new + assert_raise NoMethodError do + m.has_optional_bool? end assert_raise ArgumentError do - l = Google::Protobuf::RepeatedField.new(:message) + TestMessage.descriptor.lookup('optional_bool').has?(m) end - assert_raise ArgumentError do - l = Google::Protobuf::RepeatedField.new([1, 2, 3]) + + assert_raise NoMethodError do + m.has_repeated_msg? end assert_raise ArgumentError do - l = Google::Protobuf::RepeatedField.new(:message, [TestMessage2.new]) + TestMessage.descriptor.lookup('repeated_msg').has?(m) end end - def test_rptfield_array_ducktyping - l = Google::Protobuf::RepeatedField.new(:int32) - length_methods = %w(count length size) - length_methods.each do |lm| - assert l.send(lm) == 0 - end - # out of bounds returns a nil - assert l[0] == nil - assert l[1] == nil - assert l[-1] == nil - l.push 4 - length_methods.each do |lm| - assert l.send(lm) == 1 - end - assert l[0] == 4 - assert l[1] == nil - assert l[-1] == 4 - assert l[-2] == nil - - l.push 2 - length_methods.each do |lm| - assert l.send(lm) == 2 - end - assert l[0] == 4 - assert l[1] == 2 - assert l[2] == nil - assert l[-1] == 2 - assert l[-2] == 4 - assert l[-3] == nil + def test_set_clear_defaults + m = TestMessage.new - #adding out of scope will backfill with empty objects - end + m.optional_int32 = -42 + assert_equal -42, m.optional_int32 + m.clear_optional_int32 + assert_equal 0, m.optional_int32 - def test_map_basic - # allowed key types: - # :int32, :int64, :uint32, :uint64, :bool, :string, :bytes. + m.optional_int32 = 50 + assert_equal 50, m.optional_int32 + TestMessage.descriptor.lookup('optional_int32').clear(m) + assert_equal 0, m.optional_int32 - m = Google::Protobuf::Map.new(:string, :int32) - m["asdf"] = 1 - assert m["asdf"] == 1 - m["jkl;"] = 42 - assert m == { "jkl;" => 42, "asdf" => 1 } - assert m.has_key?("asdf") - assert !m.has_key?("qwerty") - assert m.length == 2 + m.optional_string = "foo bar" + assert_equal "foo bar", m.optional_string + m.clear_optional_string + assert_equal "", m.optional_string - m2 = m.dup - assert_equal m, m2 - assert m.hash != 0 - assert_equal m.hash, m2.hash + m.optional_string = "foo" + assert_equal "foo", m.optional_string + TestMessage.descriptor.lookup('optional_string').clear(m) + assert_equal "", m.optional_string - collected = {} - m.each { |k,v| collected[v] = k } - assert collected == { 42 => "jkl;", 1 => "asdf" } + m.optional_msg = TestMessage2.new(:foo => 42) + assert_equal TestMessage2.new(:foo => 42), m.optional_msg + assert_true m.has_optional_msg? + m.clear_optional_msg + assert_equal nil, m.optional_msg + assert_false m.has_optional_msg? - assert m.delete("asdf") == 1 - assert !m.has_key?("asdf") - assert m["asdf"] == nil - assert !m.has_key?("asdf") + m.optional_msg = TestMessage2.new(:foo => 42) + assert_equal TestMessage2.new(:foo => 42), m.optional_msg + TestMessage.descriptor.lookup('optional_msg').clear(m) + assert_equal nil, m.optional_msg - # We only assert on inspect value when there is one map entry because the - # order in which elements appear is unspecified (depends on the internal - # hash function). We don't want a brittle test. - assert m.inspect == "{\"jkl;\"=>42}" + m.repeated_int32.push(1) + assert_equal [1], m.repeated_int32 + m.clear_repeated_int32 + assert_equal [], m.repeated_int32 - assert m.keys == ["jkl;"] - assert m.values == [42] + m.repeated_int32.push(1) + assert_equal [1], m.repeated_int32 + TestMessage.descriptor.lookup('repeated_int32').clear(m) + assert_equal [], m.repeated_int32 - m.clear - assert m.length == 0 - assert m == {} + m = OneofMessage.new + m.a = "foo" + assert_equal "foo", m.a + assert_true m.has_my_oneof? + m.clear_a + assert_false m.has_my_oneof? - assert_raise TypeError do - m[1] = 1 - end - assert_raise RangeError do - m["asdf"] = 0x1_0000_0000 - end - end + m.a = "foobar" + assert_true m.has_my_oneof? + m.clear_my_oneof + assert_false m.has_my_oneof? - def test_map_ctor - m = Google::Protobuf::Map.new(:string, :int32, - {"a" => 1, "b" => 2, "c" => 3}) - assert m == {"a" => 1, "c" => 3, "b" => 2} + m.a = "bar" + assert_equal "bar", m.a + assert_true m.has_my_oneof? + OneofMessage.descriptor.lookup('a').clear(m) + assert_false m.has_my_oneof? end - def test_map_keytypes - m = Google::Protobuf::Map.new(:int32, :int32) - m[1] = 42 - m[-1] = 42 - assert_raise RangeError do - m[0x8000_0000] = 1 - end - assert_raise Google::Protobuf::TypeError do - m["asdf"] = 1 - end - - m = Google::Protobuf::Map.new(:int64, :int32) - m[0x1000_0000_0000_0000] = 1 - assert_raise RangeError do - m[0x1_0000_0000_0000_0000] = 1 - end - assert_raise Google::Protobuf::TypeError do - m["asdf"] = 1 - end - - m = Google::Protobuf::Map.new(:uint32, :int32) - m[0x8000_0000] = 1 - assert_raise RangeError do - m[0x1_0000_0000] = 1 - end - assert_raise RangeError do - m[-1] = 1 - end - - m = Google::Protobuf::Map.new(:uint64, :int32) - m[0x8000_0000_0000_0000] = 1 - assert_raise RangeError do - m[0x1_0000_0000_0000_0000] = 1 - end - assert_raise RangeError do - m[-1] = 1 - end - - m = Google::Protobuf::Map.new(:bool, :int32) - m[true] = 1 - m[false] = 2 - assert_raise Google::Protobuf::TypeError do - m[1] = 1 - end - assert_raise Google::Protobuf::TypeError do - m["asdf"] = 1 - end - - m = Google::Protobuf::Map.new(:string, :int32) - m["asdf"] = 1 - assert_raise TypeError do - m[1] = 1 - end - assert_raise Encoding::UndefinedConversionError do - bytestring = ["FFFF"].pack("H*") - m[bytestring] = 1 - end - m = Google::Protobuf::Map.new(:bytes, :int32) - bytestring = ["FFFF"].pack("H*") - m[bytestring] = 1 - # Allowed -- we will automatically convert to ASCII-8BIT. - m["asdf"] = 1 - assert_raise TypeError do - m[1] = 1 + def test_initialization_map_errors + e = assert_raise ArgumentError do + TestMessage.new(:hello => "world") end - end + assert_match(/hello/, e.message) - def test_map_msg_enum_valuetypes - m = Google::Protobuf::Map.new(:string, :message, TestMessage) - m["asdf"] = TestMessage.new - assert_raise Google::Protobuf::TypeError do - m["jkl;"] = TestMessage2.new + e = assert_raise ArgumentError do + MapMessage.new(:map_string_int32 => "hello") end + assert_equal e.message, "Expected Hash object as initializer value for map field 'map_string_int32'." - m = Google::Protobuf::Map.new( - :string, :message, TestMessage, - { "a" => TestMessage.new(:optional_int32 => 42), - "b" => TestMessage.new(:optional_int32 => 84) }) - assert m.length == 2 - assert m.values.map{|msg| msg.optional_int32}.sort == [42, 84] - - m = Google::Protobuf::Map.new(:string, :enum, TestEnum, - { "x" => :A, "y" => :B, "z" => :C }) - assert m.length == 3 - assert m["z"] == :C - m["z"] = 2 - assert m["z"] == :B - m["z"] = 4 - assert m["z"] == 4 - assert_raise RangeError do - m["z"] = :Z - end - assert_raise RangeError do - m["z"] = "z" + e = assert_raise ArgumentError do + TestMessage.new(:repeated_uint32 => "hello") end - end - - def test_map_dup_deep_copy - m = Google::Protobuf::Map.new( - :string, :message, TestMessage, - { "a" => TestMessage.new(:optional_int32 => 42), - "b" => TestMessage.new(:optional_int32 => 84) }) - - m2 = m.dup - assert m == m2 - assert m.object_id != m2.object_id - assert m["a"].object_id == m2["a"].object_id - assert m["b"].object_id == m2["b"].object_id - - m2 = Google::Protobuf.deep_copy(m) - assert m == m2 - assert m.object_id != m2.object_id - assert m["a"].object_id != m2["a"].object_id - assert m["b"].object_id != m2["b"].object_id + assert_equal e.message, "Expected array as initializer value for repeated field 'repeated_uint32'." end def test_map_field @@ -741,6 +202,15 @@ module BasicTest end end + def test_map_inspect + m = MapMessage.new( + :map_string_int32 => {"a" => 1, "b" => 2}, + :map_string_msg => {"a" => TestMessage2.new(:foo => 1), + "b" => TestMessage2.new(:foo => 2)}) + expected = "2, \"a\"=>1}, map_string_msg: {\"b\"=>, \"a\"=>}>" + assert_equal expected, m.inspect + end + def test_map_corruption # This pattern led to a crash in a previous version of upb/protobuf. m = MapMessage.new(map_string_int32: { "aaa" => 1 }) @@ -784,211 +254,6 @@ module BasicTest "b" => TestMessage2.new(:foo => 2)} end - def test_oneof_descriptors - d = OneofMessage.descriptor - o = d.lookup_oneof("my_oneof") - assert o != nil - assert o.class == Google::Protobuf::OneofDescriptor - assert o.name == "my_oneof" - oneof_count = 0 - d.each_oneof{ |oneof| - oneof_count += 1 - assert oneof == o - } - assert oneof_count == 1 - assert o.count == 4 - field_names = o.map{|f| f.name}.sort - assert field_names == ["a", "b", "c", "d"] - end - - def test_oneof - d = OneofMessage.new - assert d.a == "" - assert d.b == 0 - assert d.c == nil - 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 == :Default - assert d.my_oneof == :a - - d.b = 42 - assert d.a == "" - assert d.b == 42 - assert d.c == nil - 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 == :Default - assert d.my_oneof == :c - - d.d = :C - assert d.a == "" - assert d.b == 0 - assert d.c == nil - assert d.d == :C - assert d.my_oneof == :d - - d2 = OneofMessage.decode(OneofMessage.encode(d)) - assert d2 == d - - encoded_field_a = OneofMessage.encode(OneofMessage.new(:a => "string")) - encoded_field_b = OneofMessage.encode(OneofMessage.new(:b => 1000)) - encoded_field_c = OneofMessage.encode( - OneofMessage.new(:c => TestMessage2.new(:foo => 1))) - encoded_field_d = OneofMessage.encode(OneofMessage.new(:d => :B)) - - d3 = OneofMessage.decode( - encoded_field_c + encoded_field_a + encoded_field_d) - assert d3.a == "" - assert d3.b == 0 - assert d3.c == nil - assert d3.d == :B - - d4 = OneofMessage.decode( - encoded_field_c + encoded_field_a + encoded_field_d + - encoded_field_c) - assert d4.a == "" - assert d4.b == 0 - assert d4.c.foo == 1 - assert d4.d == :Default - - d5 = OneofMessage.new(:a => "hello") - assert d5.a == "hello" - d5.a = nil - assert d5.a == "" - assert OneofMessage.encode(d5) == '' - assert d5.my_oneof == nil - end - - def test_enum_field - m = TestMessage.new - assert m.optional_enum == :Default - m.optional_enum = :A - assert m.optional_enum == :A - assert_raise RangeError do - m.optional_enum = :ASDF - end - m.optional_enum = 1 - assert m.optional_enum == :A - m.optional_enum = 100 - assert m.optional_enum == 100 - end - - def test_dup - m = TestMessage.new - m.optional_string = "hello" - m.optional_int32 = 42 - tm1 = TestMessage2.new(:foo => 100) - tm2 = TestMessage2.new(:foo => 200) - m.repeated_msg.push tm1 - assert m.repeated_msg[-1] == tm1 - m.repeated_msg.push tm2 - assert m.repeated_msg[-1] == tm2 - m2 = m.dup - assert m == m2 - m.optional_int32 += 1 - assert m != m2 - assert m.repeated_msg[0] == m2.repeated_msg[0] - assert m.repeated_msg[0].object_id == m2.repeated_msg[0].object_id - end - - def test_deep_copy - m = TestMessage.new(:optional_int32 => 42, - :repeated_msg => [TestMessage2.new(:foo => 100)]) - m2 = Google::Protobuf.deep_copy(m) - assert m == m2 - assert m.repeated_msg == m2.repeated_msg - assert m.repeated_msg.object_id != m2.repeated_msg.object_id - assert m.repeated_msg[0].object_id != m2.repeated_msg[0].object_id - end - - def test_eq - m = TestMessage.new(:optional_int32 => 42, - :repeated_int32 => [1, 2, 3]) - m2 = TestMessage.new(:optional_int32 => 43, - :repeated_int32 => [1, 2, 3]) - assert m != m2 - end - - def test_enum_lookup - assert TestEnum::A == 1 - assert TestEnum::B == 2 - assert TestEnum::C == 3 - - assert TestEnum::lookup(1) == :A - assert TestEnum::lookup(2) == :B - assert TestEnum::lookup(3) == :C - - assert TestEnum::resolve(:A) == 1 - assert TestEnum::resolve(:B) == 2 - assert TestEnum::resolve(:C) == 3 - end - - def test_parse_serialize - m = TestMessage.new(:optional_int32 => 42, - :optional_string => "hello world", - :optional_enum => :B, - :repeated_string => ["a", "b", "c"], - :repeated_int32 => [42, 43, 44], - :repeated_enum => [:A, :B, :C, 100], - :repeated_msg => [TestMessage2.new(:foo => 1), - TestMessage2.new(:foo => 2)]) - data = TestMessage.encode m - m2 = TestMessage.decode data - assert m == m2 - - data = Google::Protobuf.encode m - m2 = Google::Protobuf.decode(TestMessage, data) - assert m == m2 - end - - def test_encode_decode_helpers - m = TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2']) - assert_equal 'foo', m.optional_string - assert_equal ['bar1', 'bar2'], m.repeated_string - - json = m.to_json - m2 = TestMessage.decode_json(json) - assert_equal 'foo', m2.optional_string - assert_equal ['bar1', 'bar2'], m2.repeated_string - if RUBY_PLATFORM != "java" - assert m2.optional_string.frozen? - assert m2.repeated_string[0].frozen? - end - - proto = m.to_proto - m2 = TestMessage.decode(proto) - assert_equal 'foo', m2.optional_string - assert_equal ['bar1', 'bar2'], m2.repeated_string - end - - def test_protobuf_encode_decode_helpers - m = TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2']) - encoded_msg = Google::Protobuf.encode(m) - assert_equal m.to_proto, encoded_msg - - decoded_msg = Google::Protobuf.decode(TestMessage, encoded_msg) - assert_equal TestMessage.decode(m.to_proto), decoded_msg - end - - def test_protobuf_encode_decode_json_helpers - m = TestMessage.new(:optional_string => 'foo', :repeated_string => ['bar1', 'bar2']) - encoded_msg = Google::Protobuf.encode_json(m) - assert_equal m.to_json, encoded_msg - - decoded_msg = Google::Protobuf.decode_json(TestMessage, encoded_msg) - assert_equal TestMessage.decode_json(m.to_json), decoded_msg - end - def test_to_h m = TestMessage.new(:optional_bool => true, :optional_double => -10.100001, :optional_string => 'foo', :repeated_string => ['bar1', 'bar2'], :repeated_msg => [TestMessage2.new(:foo => 100)]) expected_result = { @@ -1029,359 +294,6 @@ module BasicTest end - def test_def_errors - s = Google::Protobuf::DescriptorPool.new - assert_raise Google::Protobuf::TypeError do - s.build do - # enum with no default (integer value 0) - add_enum "MyEnum" do - value :A, 1 - end - end - end - assert_raise Google::Protobuf::TypeError do - s.build do - # message with required field (unsupported in proto3) - add_message "MyMessage" do - required :foo, :int32, 1 - end - end - end - end - - def test_corecursive - # just be sure that we can instantiate types with corecursive field-type - # references. - m = Recursive1.new(:foo => Recursive2.new(:foo => Recursive1.new)) - assert Recursive1.descriptor.lookup("foo").subtype == - Recursive2.descriptor - assert Recursive2.descriptor.lookup("foo").subtype == - Recursive1.descriptor - - serialized = Recursive1.encode(m) - m2 = Recursive1.decode(serialized) - assert m == m2 - end - - def test_serialize_cycle - m = Recursive1.new(:foo => Recursive2.new) - m.foo.foo = m - assert_raise RuntimeError do - serialized = Recursive1.encode(m) - end - end - - def test_bad_field_names - m = BadFieldNames.new(:dup => 1, :class => 2) - m2 = m.dup - assert m == m2 - assert m['dup'] == 1 - assert m['class'] == 2 - m['dup'] = 3 - assert m['dup'] == 3 - m['a.b'] = 4 - assert m['a.b'] == 4 - end - - def test_int_ranges - m = TestMessage.new - - m.optional_int32 = 0 - m.optional_int32 = -0x8000_0000 - m.optional_int32 = +0x7fff_ffff - m.optional_int32 = 1.0 - m.optional_int32 = -1.0 - m.optional_int32 = 2e9 - assert_raise RangeError do - m.optional_int32 = -0x8000_0001 - end - assert_raise RangeError do - m.optional_int32 = +0x8000_0000 - end - assert_raise RangeError do - m.optional_int32 = +0x1000_0000_0000_0000_0000_0000 # force Bignum - end - assert_raise RangeError do - m.optional_int32 = 1e12 - end - assert_raise RangeError do - m.optional_int32 = 1.5 - end - - m.optional_uint32 = 0 - m.optional_uint32 = +0xffff_ffff - m.optional_uint32 = 1.0 - m.optional_uint32 = 4e9 - assert_raise RangeError do - m.optional_uint32 = -1 - end - assert_raise RangeError do - m.optional_uint32 = -1.5 - end - assert_raise RangeError do - m.optional_uint32 = -1.5e12 - end - assert_raise RangeError do - m.optional_uint32 = -0x1000_0000_0000_0000 - end - assert_raise RangeError do - m.optional_uint32 = +0x1_0000_0000 - end - assert_raise RangeError do - m.optional_uint32 = +0x1000_0000_0000_0000_0000_0000 # force Bignum - end - assert_raise RangeError do - m.optional_uint32 = 1e12 - end - assert_raise RangeError do - m.optional_uint32 = 1.5 - end - - m.optional_int64 = 0 - m.optional_int64 = -0x8000_0000_0000_0000 - m.optional_int64 = +0x7fff_ffff_ffff_ffff - m.optional_int64 = 1.0 - m.optional_int64 = -1.0 - m.optional_int64 = 8e18 - m.optional_int64 = -8e18 - assert_raise RangeError do - m.optional_int64 = -0x8000_0000_0000_0001 - end - assert_raise RangeError do - m.optional_int64 = +0x8000_0000_0000_0000 - end - assert_raise RangeError do - m.optional_int64 = +0x1000_0000_0000_0000_0000_0000 # force Bignum - end - assert_raise RangeError do - m.optional_int64 = 1e50 - end - assert_raise RangeError do - m.optional_int64 = 1.5 - end - - m.optional_uint64 = 0 - m.optional_uint64 = +0xffff_ffff_ffff_ffff - m.optional_uint64 = 1.0 - m.optional_uint64 = 16e18 - assert_raise RangeError do - m.optional_uint64 = -1 - end - assert_raise RangeError do - m.optional_uint64 = -1.5 - end - assert_raise RangeError do - m.optional_uint64 = -1.5e12 - end - assert_raise RangeError do - m.optional_uint64 = -0x1_0000_0000_0000_0000 - end - assert_raise RangeError do - m.optional_uint64 = +0x1_0000_0000_0000_0000 - end - assert_raise RangeError do - m.optional_uint64 = +0x1000_0000_0000_0000_0000_0000 # force Bignum - end - assert_raise RangeError do - m.optional_uint64 = 1e50 - end - assert_raise RangeError do - m.optional_uint64 = 1.5 - end - end - - def test_stress_test - m = TestMessage.new - m.optional_int32 = 42 - m.optional_int64 = 0x100000000 - m.optional_string = "hello world" - 10.times do m.repeated_msg.push TestMessage2.new(:foo => 42) end - 10.times do m.repeated_string.push "hello world" end - - data = TestMessage.encode(m) - - l = 0 - 10_000.times do - m = TestMessage.decode(data) - data_new = TestMessage.encode(m) - assert data_new == data - data = data_new - end - end - - def test_reflection - m = TestMessage.new(:optional_int32 => 1234) - msgdef = m.class.descriptor - assert msgdef.class == Google::Protobuf::Descriptor - assert msgdef.any? {|field| field.name == "optional_int32"} - optional_int32 = msgdef.lookup "optional_int32" - assert optional_int32.class == Google::Protobuf::FieldDescriptor - assert optional_int32 != nil - assert optional_int32.name == "optional_int32" - assert optional_int32.type == :int32 - optional_int32.set(m, 5678) - assert m.optional_int32 == 5678 - m.optional_int32 = 1000 - assert optional_int32.get(m) == 1000 - - optional_msg = msgdef.lookup "optional_msg" - assert optional_msg.subtype == TestMessage2.descriptor - - optional_msg.set(m, optional_msg.subtype.msgclass.new) - - assert msgdef.msgclass == TestMessage - - optional_enum = msgdef.lookup "optional_enum" - assert optional_enum.subtype == TestEnum.descriptor - assert optional_enum.subtype.class == Google::Protobuf::EnumDescriptor - optional_enum.subtype.each do |k, v| - # set with integer, check resolution to symbolic name - optional_enum.set(m, v) - assert optional_enum.get(m) == k - end - end - - def test_json - # TODO: Fix JSON in JRuby version. - return if RUBY_PLATFORM == "java" - m = TestMessage.new(:optional_int32 => 1234, - :optional_int64 => -0x1_0000_0000, - :optional_uint32 => 0x8000_0000, - :optional_uint64 => 0xffff_ffff_ffff_ffff, - :optional_bool => true, - :optional_float => 1.0, - :optional_double => -1e100, - :optional_string => "Test string", - :optional_bytes => ["FFFFFFFF"].pack('H*'), - :optional_msg => TestMessage2.new(:foo => 42), - :repeated_int32 => [1, 2, 3, 4], - :repeated_string => ["a", "b", "c"], - :repeated_bool => [true, false, true, false], - :repeated_msg => [TestMessage2.new(:foo => 1), - TestMessage2.new(:foo => 2)]) - - json_text = TestMessage.encode_json(m) - m2 = TestMessage.decode_json(json_text) - puts m.inspect - puts m2.inspect - assert m == m2 - - # Crash case from GitHub issue 283. - bar = Bar.new(msg: "bar") - baz1 = Baz.new(msg: "baz") - baz2 = Baz.new(msg: "quux") - Foo.encode_json(Foo.new) - Foo.encode_json(Foo.new(bar: bar)) - Foo.encode_json(Foo.new(bar: bar, baz: [baz1, baz2])) - end - - def test_json_empty - assert TestMessage.encode_json(TestMessage.new) == '{}' - end - - def test_json_emit_defaults - # TODO: Fix JSON in JRuby version. - return if RUBY_PLATFORM == "java" - m = TestMessage.new - - expected = { - optionalInt32: 0, - optionalInt64: 0, - optionalUint32: 0, - optionalUint64: 0, - optionalBool: false, - optionalFloat: 0, - optionalDouble: 0, - optionalString: "", - optionalBytes: "", - optionalEnum: "Default", - repeatedInt32: [], - repeatedInt64: [], - repeatedUint32: [], - repeatedUint64: [], - repeatedBool: [], - repeatedFloat: [], - repeatedDouble: [], - repeatedString: [], - repeatedBytes: [], - repeatedMsg: [], - repeatedEnum: [] - } - - actual = TestMessage.encode_json(m, :emit_defaults => true) - - assert JSON.parse(actual, :symbolize_names => true) == expected - end - - def test_json_emit_defaults_submsg - # TODO: Fix JSON in JRuby version. - return if RUBY_PLATFORM == "java" - m = TestMessage.new(optional_msg: TestMessage2.new) - - expected = { - optionalInt32: 0, - optionalInt64: 0, - optionalUint32: 0, - optionalUint64: 0, - optionalBool: false, - optionalFloat: 0, - optionalDouble: 0, - optionalString: "", - optionalBytes: "", - optionalMsg: {foo: 0}, - optionalEnum: "Default", - repeatedInt32: [], - repeatedInt64: [], - repeatedUint32: [], - repeatedUint64: [], - repeatedBool: [], - repeatedFloat: [], - repeatedDouble: [], - repeatedString: [], - repeatedBytes: [], - repeatedMsg: [], - repeatedEnum: [] - } - - actual = TestMessage.encode_json(m, :emit_defaults => true) - - assert JSON.parse(actual, :symbolize_names => true) == expected - end - - def test_json_emit_defaults_repeated_submsg - # TODO: Fix JSON in JRuby version. - return if RUBY_PLATFORM == "java" - m = TestMessage.new(repeated_msg: [TestMessage2.new]) - - expected = { - optionalInt32: 0, - optionalInt64: 0, - optionalUint32: 0, - optionalUint64: 0, - optionalBool: false, - optionalFloat: 0, - optionalDouble: 0, - optionalString: "", - optionalBytes: "", - optionalEnum: "Default", - repeatedInt32: [], - repeatedInt64: [], - repeatedUint32: [], - repeatedUint64: [], - repeatedBool: [], - repeatedFloat: [], - repeatedDouble: [], - repeatedString: [], - repeatedBytes: [], - repeatedMsg: [{foo: 0}], - repeatedEnum: [] - } - - actual = TestMessage.encode_json(m, :emit_defaults => true) - - assert JSON.parse(actual, :symbolize_names => true) == expected - end - def test_json_maps # TODO: Fix JSON in JRuby version. return if RUBY_PLATFORM == "java" @@ -1408,10 +320,6 @@ module BasicTest assert JSON.parse(actual, :symbolize_names => true) == expected end - def test_comparison_with_arbitrary_object - assert MapMessage.new != nil - end - def test_respond_to # This test fails with JRuby 1.7.23, likely because of an old JRuby bug. return if RUBY_PLATFORM == "java" @@ -1419,5 +327,22 @@ module BasicTest assert msg.respond_to?(:map_string_int32) assert !msg.respond_to?(:bacon) end + + def test_file_descriptor + file_descriptor = TestMessage.descriptor.file_descriptor + assert_true nil != file_descriptor + assert_equal "tests/basic_test.proto", file_descriptor.name + assert_equal :proto3, file_descriptor.syntax + + file_descriptor = TestEnum.descriptor.file_descriptor + assert_true nil != file_descriptor + assert_equal "tests/basic_test.proto", file_descriptor.name + assert_equal :proto3, file_descriptor.syntax + + file_descriptor = BadFieldNames.descriptor.file_descriptor + assert_true nil != file_descriptor + assert_equal nil, file_descriptor.name + assert_equal :proto3, file_descriptor.syntax + end end end -- cgit v1.2.3