Sync to Google-internal development.

2 files changed, 72 insertions, 4 deletions

diff --git a/tests/bindings/googlepb/test_vs_proto2.cc b/tests/bindings/googlepb/test_vs_proto2.cc
index 2d53f80..15a5388 100644
--- a/tests/bindings/googlepb/test_vs_proto2.cc
+++ b/tests/bindings/googlepb/test_vs_proto2.cc
@@ -27,8 +27,14 @@
 #include "upb/pb/glue.h"
 #include "upb/pb/varint.int.h"
 
-static const char message_data[] = {
-#include MESSAGE_DATA_HFILE
+// Pull in string data from benchmarks/google_message{1,2}.dat
+// (the .h files are generated with xxd).
+const char message1_data[] = {
+#include "benchmarks/google_message1.h"
+};
+
+const char message2_data[] = {
+#include "benchmarks/google_message2.h"
 };
 
 void compare_metadata(const google::protobuf::Descriptor* d,
@@ -117,8 +123,8 @@ extern "C" {
 int run_tests(int argc, char *argv[]) {
   UPB_UNUSED(argc);
   UPB_UNUSED(argv);
-  size_t len = sizeof(message_data);
-  const char *str = message_data;
+  size_t len = sizeof(MESSAGE_DATA_IDENT);
+  const char *str = MESSAGE_DATA_IDENT;
 
   MESSAGE_CIDENT msg1;
   MESSAGE_CIDENT msg2;
diff --git a/tests/bindings/ruby/upb.rb b/tests/bindings/ruby/upb.rb
new file mode 100644
index 0000000..3e06c17
--- /dev/null
+++ b/tests/bindings/ruby/upb.rb
@@ -0,0 +1,62 @@
+#!/usr/bin/ruby
+#
+# Tests for Ruby upb extension.
+
+require 'test/unit'
+require 'set'
+require 'upb'
+
+def get_descriptor
+  File.open("upb/descriptor/descriptor.pb").read
+end
+
+def load_descriptor
+  symtab = Upb::SymbolTable.new
+  symtab.load_descriptor(get_descriptor())
+  return symtab
+end
+
+def get_message_class(name)
+  return Upb.get_message_class(load_descriptor().lookup(name))
+end
+
+class TestRubyExtension < Test::Unit::TestCase
+  def test_parsedescriptor
+    msgdef = load_descriptor.lookup("google.protobuf.FileDescriptorSet")
+    assert_instance_of(Upb::MessageDef, msgdef)
+
+    file_descriptor_set = Upb.get_message_class(msgdef)
+    msg = file_descriptor_set.parse(get_descriptor())
+
+    # A couple message types we know should exist.
+    names = Set.new(["DescriptorProto", "FieldDescriptorProto"])
+
+    msg.file.each { |file|
+      file.message_type.each { |message_type|
+        names.delete(message_type.name)
+      }
+    }
+
+    assert_equal(0, names.size)
+  end
+
+  def test_parseserialize
+    field_descriptor_proto = get_message_class("google.protobuf.FieldDescriptorProto")
+    field_options = get_message_class("google.protobuf.FieldOptions")
+
+    field = field_descriptor_proto.new
+
+    field.name = "MyName"
+    field.number = 5
+    field.options = field_options.new
+    field.options.packed = true
+
+    serialized = Upb::Message.serialize(field)
+
+    field2 = field_descriptor_proto.parse(serialized)
+
+    assert_equal("MyName", field2.name)
+    assert_equal(5, field2.number)
+    assert_equal(true, field2.options.packed)
+  end
+end