Skip to content

Fix silent failure of rb_test rules to run test #21733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix silent failure of rb_test rules to run test #21733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion ruby/src/main/java/com/google/protobuf/jruby/RubyMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,7 +1089,17 @@ private Object convert(
}
break;
case MESSAGE:
val = ((RubyMessage) value).build(context, depth + 1, recursionLimit);
RubyMessage msg;
if (value instanceof RubyHash) {
RubyClass typeClass =
(RubyClass)
((RubyDescriptor) getDescriptorForField(context, fieldDescriptor))
.msgclass(context);
msg = (RubyMessage) typeClass.newInstance(context, value);
} else {
msg = (RubyMessage) value;
}
val = msg.build(context, depth + 1, recursionLimit);
break;
case ENUM:
EnumDescriptor enumDescriptor = fieldDescriptor.getEnumType();
Expand Down
64 changes: 64 additions & 0 deletions ruby/tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ internal_ruby_proto_library(
rb_test(
name = "implementation",
srcs = ["implementation.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/implementation.rb"
],
deps = [
"//ruby:protobuf",
"@protobuf_bundle",
Expand All @@ -28,6 +32,10 @@ rb_test(
rb_test(
name = "basic",
srcs = ["basic.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/basic.rb"
],
deps = [
":common_tests",
":test_ruby_protos",
Expand All @@ -39,6 +47,10 @@ rb_test(
rb_test(
name = "basic_proto2",
srcs = ["basic_proto2.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/basic_proto2.rb"
],
deps = [
":common_tests",
":test_ruby_protos",
Expand All @@ -50,6 +62,10 @@ rb_test(
rb_test(
name = "encode_decode_test",
srcs = ["encode_decode_test.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/encode_decode_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -60,6 +76,10 @@ rb_test(
rb_test(
name = "gc_test",
srcs = ["gc_test.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/gc_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -70,6 +90,10 @@ rb_test(
rb_test(
name = "generated_code_test",
srcs = ["generated_code_test.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/generated_code_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -80,6 +104,10 @@ rb_test(
rb_test(
name = "multi_level_nesting_test",
srcs = ["multi_level_nesting_test.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/multi_level_nesting_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -90,6 +118,10 @@ rb_test(
rb_test(
name = "object_cache_test",
srcs = ["object_cache_test.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/object_cache_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -100,6 +132,10 @@ rb_test(
rb_test(
name = "repeated_field_test",
srcs = ["repeated_field_test.rb"],
args = [
"-Iruby/lib:ruby:ruby/tests",
"ruby/tests/repeated_field_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -110,6 +146,10 @@ rb_test(
rb_test(
name = "ruby_version",
srcs = ["ruby_version.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/ruby_version.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -120,6 +160,10 @@ rb_test(
rb_test(
name = "stress",
srcs = ["stress.rb"],
args = [
"-Iruby/lib:ruby:ruby/tests",
"ruby/tests/stress.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -130,6 +174,10 @@ rb_test(
rb_test(
name = "type_errors",
srcs = ["type_errors.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/type_errors.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -140,6 +188,10 @@ rb_test(
rb_test(
name = "utf8",
srcs = ["utf8.rb"],
args = [
"-Iruby/lib:ruby:ruby/tests",
"ruby/tests/utf8.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -150,6 +202,10 @@ rb_test(
rb_test(
name = "well_known_types_test",
srcs = ["well_known_types_test.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/well_known_types_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -160,6 +216,10 @@ rb_test(
rb_test(
name = "service_test",
srcs = ["service_test.rb"],
args = [
"-Iruby/lib:ruby:ruby/tests",
"ruby/tests/service_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand All @@ -170,6 +230,10 @@ rb_test(
rb_test(
name = "memory_test",
srcs = ["memory_test.rb"],
args = [
"-Iruby/lib:ruby",
"ruby/tests/memory_test.rb"
],
deps = [
":test_ruby_protos",
"//ruby:protobuf",
Expand Down
Loading