9abf6e2ab0
* WIP. * WIP. * WIP. * WIP. * WIP. * WIP. * Added some missing files. * WIP. * WIP. * Updated upb. * Extension loads, but crashes immediately. * Gets through the test suite without SEGV! Still a lot of bugs to fix, but it is a major step! 214 tests, 378 assertions, 37 failures, 147 errors, 0 pendings, 0 omissions, 0 notifications 14.0187% passed * Test and build for Ruby 3.0 * Fixed a few more bugs, efficient #inspect is almost done. 214 tests, 134243 assertions, 30 failures, 144 errors, 0 pendings, 0 omissions, 0 notifications 18.6916% passed * Fixed message hash initialization and encode depth checking. 214 tests, 124651 assertions, 53 failures, 70 errors, 0 pendings, 0 omissions, 0 notifications 42.5234% passed * A bunch of fixes to failing tests, now 70% passing. 214 tests, 202091 assertions, 41 failures, 23 errors, 0 pendings, 0 omissions, 0 notifications 70.0935% passed * More than 80% of tests are passing now. 214 tests, 322331 assertions, 30 failures, 9 errors, 0 pendings, 0 omissions, 0 notifications 81.7757% passed Unfortunately there is also a sporadic bug/segfault hanging around that appears to be GC-related. * Add linux/ruby30 and macos/ruby30 * Use rvm master for 3.0.0-preview2 * Over 90% of tests are passing! 214 tests, 349898 assertions, 15 failures, 1 errors, 0 pendings, 0 omissions, 0 notifications 92.5234% passed * Passes all tests! 214 tests, 369388 assertions, 0 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications 100% passed * A bunch of cleanup. 1. Removed a bunch of internal-only symbols from headers. 2. Required a frozen check to get a non-const pointer to a map or array. 3. De-duplicated the code to get a type argument for Map/RepeatedField. * Removed a bunch more stuff from protobuf.h. There is an intermittent assert failure. Intermittent failure: ruby: ../../../../ext/google/protobuf_c/protobuf.c:263: ObjectCache_Add: Assertion `rb_funcall(obj_cache2, (__builtin_constant_p("[]") ? __extension__ ({ static ID rb_intern_id_cache; if (!rb_intern_id_cache) rb_intern_id_cache = rb_intern2((("[]") ), (long)strlen(("[]"))); (ID) rb_intern_id_cache; }) : rb_intern("[]")), 1, key_rb) == val' failed * Removed a few more things from protobuf.h. * Ruby 3.0.0-preview2 to 3.0.0 * Require rake-compiler-dock >= 1.1.0 * More progress, fighting with the object cache. * Passes on all Ruby versions! * Updated and clarified comment regarding WeakMap. * Fixed the wyhash compile. * Fixed conformance tests for Ruby. Conformance results now look like: RUBYLIB=../ruby/lib:. ./conformance-test-runner --enforce_recommended --failure_list failure_list_ruby.txt --text_format_failure_list text_format_failure_list_ruby.txt ./conformance_ruby.rb CONFORMANCE TEST BEGIN ==================================== CONFORMANCE SUITE PASSED: 1955 successes, 0 skipped, 58 expected failures, 0 unexpected failures. CONFORMANCE TEST BEGIN ==================================== CONFORMANCE SUITE PASSED: 0 successes, 111 skipped, 8 expected failures, 0 unexpected failures. Fixes include: - Changed Ruby compiler to no longer reject proto2 maps. - Changed Ruby compiler to emit a warning when proto2 extensions are present instead of rejecting the .proto file completely. - Fixed conformance tests to allow proto2 and look up message by name instead of hardcoding a specific list of messages. - Fixed conformance test to support the "ignore unknown" option for JSON. - Fixed conformance test to properly report serialization errors. * Removed debug printf and fixed #inspect for floats. * Fixed compatibility test to have proper semantics for #to_json. * Updated Makefile.am with new file list. * Don't try to copy wyhash when inside Docker. * Fixed bug where we would forget that a sub-object is frozen in Ruby >=2.7. * Avoid exporting unneeded symbols and refactored a bit of code. * Some more refactoring. * Simplified and added more comments. * Some more comments and simplification. Added a missing license block. Co-authored-by: Masaki Hara <hara@wantedly.com>
260 lines
7.9 KiB
Ruby
Executable File
260 lines
7.9 KiB
Ruby
Executable File
#!/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_proto2_pb'
|
|
require 'common_tests'
|
|
require 'google/protobuf'
|
|
require 'json'
|
|
require 'test/unit'
|
|
|
|
# ------------- generated code --------------
|
|
|
|
module BasicTestProto2
|
|
pool = Google::Protobuf::DescriptorPool.new
|
|
pool.build do
|
|
add_file "test_proto2.proto", syntax: :proto2 do
|
|
add_message "BadFieldNames" do
|
|
optional :dup, :int32, 1
|
|
optional :class, :int32, 2
|
|
end
|
|
end
|
|
end
|
|
|
|
BadFieldNames = pool.lookup("BadFieldNames").msgclass
|
|
|
|
# ------------ test cases ---------------
|
|
|
|
class MessageContainerTest < Test::Unit::TestCase
|
|
# Required by CommonTests module to resolve proto2 proto classes used in tests.
|
|
def proto_module
|
|
::BasicTestProto2
|
|
end
|
|
include CommonTests
|
|
|
|
def test_has_field
|
|
m = TestMessage.new
|
|
assert !m.has_optional_int32?
|
|
assert !TestMessage.descriptor.lookup('optional_int32').has?(m)
|
|
assert !m.has_optional_int64?
|
|
assert !TestMessage.descriptor.lookup('optional_int64').has?(m)
|
|
assert !m.has_optional_uint32?
|
|
assert !TestMessage.descriptor.lookup('optional_uint32').has?(m)
|
|
assert !m.has_optional_uint64?
|
|
assert !TestMessage.descriptor.lookup('optional_uint64').has?(m)
|
|
assert !m.has_optional_bool?
|
|
assert !TestMessage.descriptor.lookup('optional_bool').has?(m)
|
|
assert !m.has_optional_float?
|
|
assert !TestMessage.descriptor.lookup('optional_float').has?(m)
|
|
assert !m.has_optional_double?
|
|
assert !TestMessage.descriptor.lookup('optional_double').has?(m)
|
|
assert !m.has_optional_string?
|
|
assert !TestMessage.descriptor.lookup('optional_string').has?(m)
|
|
assert !m.has_optional_bytes?
|
|
assert !TestMessage.descriptor.lookup('optional_bytes').has?(m)
|
|
assert !m.has_optional_enum?
|
|
assert !TestMessage.descriptor.lookup('optional_enum').has?(m)
|
|
|
|
m = TestMessage.new(:optional_int32 => nil)
|
|
assert !m.has_optional_int32?
|
|
|
|
assert_raise NoMethodError do
|
|
m.has_repeated_msg?
|
|
end
|
|
assert_raise ArgumentError do
|
|
TestMessage.descriptor.lookup('repeated_msg').has?(m)
|
|
end
|
|
|
|
m.optional_msg = TestMessage2.new
|
|
assert m.has_optional_msg?
|
|
assert TestMessage.descriptor.lookup('optional_msg').has?(m)
|
|
|
|
m = OneofMessage.new
|
|
assert !m.has_my_oneof?
|
|
m.a = "foo"
|
|
assert m.has_my_oneof?
|
|
assert_equal :a, m.my_oneof
|
|
assert m.has_a?
|
|
assert OneofMessage.descriptor.lookup('a').has?(m)
|
|
assert_equal "foo", m.a
|
|
assert !m.has_b?
|
|
assert !OneofMessage.descriptor.lookup('b').has?(m)
|
|
assert !m.has_c?
|
|
assert !OneofMessage.descriptor.lookup('c').has?(m)
|
|
assert !m.has_d?
|
|
assert !OneofMessage.descriptor.lookup('d').has?(m)
|
|
|
|
m = OneofMessage.new
|
|
m.b = 100
|
|
assert m.has_b?
|
|
assert_equal 100, m.b
|
|
assert m.has_my_oneof?
|
|
assert !m.has_a?
|
|
assert !m.has_c?
|
|
assert !m.has_d?
|
|
|
|
m = OneofMessage.new
|
|
m.c = TestMessage2.new
|
|
assert m.has_c?
|
|
assert_equal TestMessage2.new, m.c
|
|
assert m.has_my_oneof?
|
|
assert !m.has_a?
|
|
assert !m.has_b?
|
|
assert !m.has_d?
|
|
|
|
m = OneofMessage.new
|
|
m.d = :A
|
|
assert m.has_d?
|
|
assert_equal :A, m.d
|
|
assert m.has_my_oneof?
|
|
assert !m.has_a?
|
|
assert !m.has_b?
|
|
assert !m.has_c?
|
|
end
|
|
|
|
def test_defined_defaults
|
|
m = TestMessageDefaults.new
|
|
assert_equal 1, m.optional_int32
|
|
assert_equal 2, m.optional_int64
|
|
assert_equal 3, m.optional_uint32
|
|
assert_equal 4, m.optional_uint64
|
|
assert_equal true, m.optional_bool
|
|
assert_equal 6.0, m.optional_float
|
|
assert_equal 7.0, m.optional_double
|
|
assert_equal "Default Str", m.optional_string
|
|
assert_equal "\xCF\xA5s\xBD\xBA\xE6fubar".force_encoding("ASCII-8BIT"), m.optional_bytes
|
|
assert_equal :B2, m.optional_enum
|
|
|
|
assert !m.has_optional_int32?
|
|
assert !m.has_optional_int64?
|
|
assert !m.has_optional_uint32?
|
|
assert !m.has_optional_uint64?
|
|
assert !m.has_optional_bool?
|
|
assert !m.has_optional_float?
|
|
assert !m.has_optional_double?
|
|
assert !m.has_optional_string?
|
|
assert !m.has_optional_bytes?
|
|
assert !m.has_optional_enum?
|
|
end
|
|
|
|
def test_set_clear_defaults
|
|
m = TestMessageDefaults.new
|
|
|
|
m.optional_int32 = -42
|
|
assert_equal -42, m.optional_int32
|
|
assert m.has_optional_int32?
|
|
m.clear_optional_int32
|
|
assert_equal 1, m.optional_int32
|
|
assert !m.has_optional_int32?
|
|
|
|
m.optional_string = "foo bar"
|
|
assert_equal "foo bar", m.optional_string
|
|
assert m.has_optional_string?
|
|
m.clear_optional_string
|
|
assert_equal "Default Str", m.optional_string
|
|
assert !m.has_optional_string?
|
|
|
|
m.optional_msg = TestMessage2.new(:foo => 42)
|
|
assert_equal TestMessage2.new(:foo => 42), m.optional_msg
|
|
assert m.has_optional_msg?
|
|
|
|
m.clear_optional_msg
|
|
assert_equal nil, m.optional_msg
|
|
assert !m.has_optional_msg?
|
|
|
|
m.optional_msg = TestMessage2.new(:foo => 42)
|
|
assert_equal TestMessage2.new(:foo => 42), m.optional_msg
|
|
assert TestMessageDefaults.descriptor.lookup('optional_msg').has?(m)
|
|
|
|
TestMessageDefaults.descriptor.lookup('optional_msg').clear(m)
|
|
assert_equal nil, m.optional_msg
|
|
assert !TestMessageDefaults.descriptor.lookup('optional_msg').has?(m)
|
|
|
|
m = TestMessage.new
|
|
m.repeated_int32.push(1)
|
|
assert_equal [1], m.repeated_int32
|
|
m.clear_repeated_int32
|
|
assert_equal [], m.repeated_int32
|
|
|
|
m = OneofMessage.new
|
|
m.a = "foo"
|
|
assert_equal "foo", m.a
|
|
assert m.has_a?
|
|
m.clear_a
|
|
assert !m.has_a?
|
|
|
|
m = OneofMessage.new
|
|
m.a = "foobar"
|
|
assert m.has_my_oneof?
|
|
m.clear_my_oneof
|
|
assert !m.has_my_oneof?
|
|
|
|
m = OneofMessage.new
|
|
m.a = "bar"
|
|
assert_equal "bar", m.a
|
|
assert m.has_my_oneof?
|
|
OneofMessage.descriptor.lookup('a').clear(m)
|
|
assert !m.has_my_oneof?
|
|
end
|
|
|
|
def test_assign_nil
|
|
m = TestMessageDefaults.new
|
|
m.optional_msg = TestMessage2.new(:foo => 42)
|
|
|
|
assert_equal TestMessage2.new(:foo => 42), m.optional_msg
|
|
assert m.has_optional_msg?
|
|
m.optional_msg = nil
|
|
assert_equal nil, m.optional_msg
|
|
assert !m.has_optional_msg?
|
|
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
|
|
TestMessage.new(:repeated_uint32 => "hello")
|
|
end
|
|
assert_equal e.message, "Expected array as initializer value for repeated field 'repeated_uint32' (given String)."
|
|
end
|
|
|
|
|
|
def test_to_h
|
|
m = TestMessage.new(:optional_bool => true, :optional_double => -10.100001, :optional_string => 'foo', :repeated_string => ['bar1', 'bar2'])
|
|
expected_result = {
|
|
:optional_bool=>true,
|
|
:optional_double=>-10.100001,
|
|
:optional_string=>"foo",
|
|
:repeated_string=>["bar1", "bar2"],
|
|
}
|
|
assert_equal expected_result, m.to_h
|
|
|
|
m = OneofMessage.new(:a => "foo")
|
|
expected_result = {:a => "foo"}
|
|
assert_equal expected_result, m.to_h
|
|
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"
|
|
msg = TestMessage.new
|
|
assert !msg.respond_to?(:bacon)
|
|
end
|
|
|
|
def test_file_descriptor
|
|
file_descriptor = TestMessage.descriptor.file_descriptor
|
|
assert nil != file_descriptor
|
|
assert_equal "tests/basic_test_proto2.proto", file_descriptor.name
|
|
assert_equal :proto2, file_descriptor.syntax
|
|
|
|
file_descriptor = TestEnum.descriptor.file_descriptor
|
|
assert nil != file_descriptor
|
|
assert_equal "tests/basic_test_proto2.proto", file_descriptor.name
|
|
assert_equal :proto2, file_descriptor.syntax
|
|
end
|
|
end
|
|
end
|