From 181c7f26360429b236ab833c746d10d97811931f Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Wed, 15 Jul 2015 11:05:10 -0700 Subject: Added Ruby to conformance tests. This involved fixing a few important bugs in the Ruby implementation -- mostly cases of mixing upb field types and descriptor types (upb field types do not distinguish between int/sint/fixed/sfixed like descriptor types do). Also added protobuf-specific exceptions so parse errors can be caught specifically. Change-Id: Ib49d3db976900b2c6f3455c8b88af52cfb86e036 --- conformance/conformance_ruby.rb | 111 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100755 conformance/conformance_ruby.rb (limited to 'conformance/conformance_ruby.rb') diff --git a/conformance/conformance_ruby.rb b/conformance/conformance_ruby.rb new file mode 100755 index 00000000..e7bd4ed5 --- /dev/null +++ b/conformance/conformance_ruby.rb @@ -0,0 +1,111 @@ +#!/usr/bin/env ruby +# +# Protocol Buffers - Google's data interchange format +# Copyright 2008 Google Inc. All rights reserved. +# https://developers.google.com/protocol-buffers/ +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: +# +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above +# copyright notice, this list of conditions and the following disclaimer +# in the documentation and/or other materials provided with the +# distribution. +# * Neither the name of Google Inc. nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +require 'conformance' + +test_count = 0; +verbose = false; + +def do_test(request) + test_message = Conformance::TestAllTypes.new + response = Conformance::ConformanceResponse.new + + begin + case request.payload + when :protobuf_payload + begin + test_message = Conformance::TestAllTypes.decode(request.protobuf_payload) + rescue Google::Protobuf::ParseError => err + response.parse_error = err.message.encode("utf-8") + return response + end + + when :json_payload + test_message = Conformance::TestAllTypes.decode_json(request.json_payload) + + when nil + raise "Request didn't have payload."; + end + + case request.requested_output_format + when :UNSPECIFIED + raise "Unspecified output format" + + when :PROTOBUF + response.protobuf_payload = Conformance::TestAllTypes.encode(test_message) + + when :JSON + response.json_payload = Conformance::TestAllTypes.encode_json(test_message) + end + rescue Exception => err + response.runtime_error = err.message.encode("utf-8") + err.backtrace.join("\n") + end + + return response +end + +def do_test_io + length_bytes = STDIN.read(4) + return false if length_bytes.nil? + + length = length_bytes.unpack("V").first + serialized_request = STDIN.read(length) + if serialized_request.nil? or serialized_request.length != length + raise "I/O error" + end + + request = Conformance::ConformanceRequest.decode(serialized_request) + + response = do_test(request) + + serialized_response = Conformance::ConformanceResponse.encode(response) + STDOUT.write([serialized_response.length].pack("V")) + STDOUT.write(serialized_response) + STDOUT.flush + + #if verbose + # fprintf(stderr, "conformance-cpp: request=%s, response=%s\n", + # request.ShortDebugString().c_str(), + # response.ShortDebugString().c_str()); + + #test_count++; + + return true; +end + +while true + if not do_test_io() + STDERR.puts("conformance-cpp: received EOF from test runner " + + "after #{test_count} tests, exiting") + exit 0 + end +end -- cgit v1.2.3 From c2c43a4917d7da263e360a4096d6603da8535bdf Mon Sep 17 00:00:00 2001 From: Josh Haberman Date: Fri, 17 Jul 2015 16:29:10 -0700 Subject: Fixed lint errors and responded to CR comments. Change-Id: If7b1cc0f03f609a7f43ddafc8509b44207c60910 --- conformance/conformance_ruby.rb | 55 ++++++++++++++++++++++------------------- ruby/lib/google/protobuf.rb | 2 +- 2 files changed, 30 insertions(+), 27 deletions(-) (limited to 'conformance/conformance_ruby.rb') diff --git a/conformance/conformance_ruby.rb b/conformance/conformance_ruby.rb index e7bd4ed5..cd065673 100755 --- a/conformance/conformance_ruby.rb +++ b/conformance/conformance_ruby.rb @@ -32,8 +32,8 @@ require 'conformance' -test_count = 0; -verbose = false; +$test_count = 0 +$verbose = false def do_test(request) test_message = Conformance::TestAllTypes.new @@ -43,9 +43,10 @@ def do_test(request) case request.payload when :protobuf_payload begin - test_message = Conformance::TestAllTypes.decode(request.protobuf_payload) + test_message = + Conformance::TestAllTypes.decode(request.protobuf_payload) rescue Google::Protobuf::ParseError => err - response.parse_error = err.message.encode("utf-8") + response.parse_error = err.message.encode('utf-8') return response end @@ -53,34 +54,36 @@ def do_test(request) test_message = Conformance::TestAllTypes.decode_json(request.json_payload) when nil - raise "Request didn't have payload."; + fail "Request didn't have payload" end case request.requested_output_format when :UNSPECIFIED - raise "Unspecified output format" + fail 'Unspecified output format' when :PROTOBUF - response.protobuf_payload = Conformance::TestAllTypes.encode(test_message) + response.protobuf_payload = test_message.to_proto when :JSON - response.json_payload = Conformance::TestAllTypes.encode_json(test_message) + response.json_payload = test_message.to_json end - rescue Exception => err - response.runtime_error = err.message.encode("utf-8") + err.backtrace.join("\n") + rescue StandardError => err + response.runtime_error = err.message.encode('utf-8') end - return response + response end +# Returns true if the test ran successfully, false on legitimate EOF. +# If EOF is encountered in an unexpected place, raises IOError. def do_test_io length_bytes = STDIN.read(4) return false if length_bytes.nil? - length = length_bytes.unpack("V").first + length = length_bytes.unpack('V').first serialized_request = STDIN.read(length) - if serialized_request.nil? or serialized_request.length != length - raise "I/O error" + if serialized_request.nil? || serialized_request.length != length + fail IOError end request = Conformance::ConformanceRequest.decode(serialized_request) @@ -88,24 +91,24 @@ def do_test_io response = do_test(request) serialized_response = Conformance::ConformanceResponse.encode(response) - STDOUT.write([serialized_response.length].pack("V")) + STDOUT.write([serialized_response.length].pack('V')) STDOUT.write(serialized_response) STDOUT.flush - #if verbose - # fprintf(stderr, "conformance-cpp: request=%s, response=%s\n", - # request.ShortDebugString().c_str(), - # response.ShortDebugString().c_str()); + if $verbose + STDERR.puts("conformance-cpp: request={request.to_json}, " \ + "response={response.to_json}\n") + end - #test_count++; + $test_count += 1 - return true; + true end -while true - if not do_test_io() - STDERR.puts("conformance-cpp: received EOF from test runner " + - "after #{test_count} tests, exiting") - exit 0 +loop do + unless do_test_io + STDERR.puts('conformance-cpp: received EOF from test runner ' \ + "after #{$test_count} tests, exiting") + break end end diff --git a/ruby/lib/google/protobuf.rb b/ruby/lib/google/protobuf.rb index 74ea770d..f0eb6268 100644 --- a/ruby/lib/google/protobuf.rb +++ b/ruby/lib/google/protobuf.rb @@ -35,7 +35,7 @@ require 'google/protobuf/message_exts' # That way the module init can grab references to these. module Google module Protobuf - class Error < RuntimeError; end + class Error < StandardError; end class ParseError < Error; end end end -- cgit v1.2.3