Index: third_party/protobuf/conformance/conformance_ruby.rb |
diff --git a/third_party/protobuf/conformance/conformance_ruby.rb b/third_party/protobuf/conformance/conformance_ruby.rb |
index c716facdd6f3f9acc8638df39ef4b35848cc7868..b7b7cf1c6c870d15d6e923927d03820873be265f 100755 |
--- a/third_party/protobuf/conformance/conformance_ruby.rb |
+++ b/third_party/protobuf/conformance/conformance_ruby.rb |
@@ -30,21 +30,22 @@ |
# (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' |
+require 'conformance_pb' |
+require 'google/protobuf/test_messages_proto3_pb' |
$test_count = 0 |
$verbose = false |
def do_test(request) |
- test_message = Conformance::TestAllTypes.new |
+ test_message = ProtobufTestMessages::Proto3::TestAllTypes.new |
response = Conformance::ConformanceResponse.new |
begin |
case request.payload |
when :protobuf_payload |
begin |
- test_message = |
- Conformance::TestAllTypes.decode(request.protobuf_payload) |
+ test_message = ProtobufTestMessages::Proto3::TestAllTypes.decode( |
+ request.protobuf_payload) |
rescue Google::Protobuf::ParseError => err |
response.parse_error = err.message.encode('utf-8') |
return response |
@@ -52,7 +53,8 @@ def do_test(request) |
when :json_payload |
begin |
- test_message = Conformance::TestAllTypes.decode_json(request.json_payload) |
+ test_message = ProtobufTestMessages::Proto3::TestAllTypes.decode_json( |
+ request.json_payload) |
rescue Google::Protobuf::ParseError => err |
response.parse_error = err.message.encode('utf-8') |
return response |