add some test proto2 supported, add js proto2 supported, fixed some error

1 files changed, 4 insertions, 4 deletions

diff --git a/conformance/conformance_ruby.rb b/conformance/conformance_ruby.rb
index 0fd9e3f8..df63bf7c 100755
--- a/conformance/conformance_ruby.rb
+++ b/conformance/conformance_ruby.rb
@@ -37,15 +37,15 @@ $test_count = 0
 $verbose = false
 
 def do_test(request)
-  test_message = ProtobufTestMessages::Proto3::TestAllTypes.new
+  test_message = ProtobufTestMessages::Proto3::TestAllTypesProto3.new
   response = Conformance::ConformanceResponse.new
 
   begin
     case request.payload
     when :protobuf_payload
-      if request.message_type.eql?('protobuf_test_messages.proto3.TestAllTypes')
+      if request.message_type.eql?('protobuf_test_messages.proto3.TestAllTypesProto3')
         begin
-          test_message = ProtobufTestMessages::Proto3::TestAllTypes.decode(
+          test_message = ProtobufTestMessages::Proto3::TestAllTypesProto3.decode(
               request.protobuf_payload)
         rescue Google::Protobuf::ParseError => err
           response.parse_error = err.message.encode('utf-8')
@@ -60,7 +60,7 @@ def do_test(request)
 
     when :json_payload
       begin
-        test_message = ProtobufTestMessages::Proto3::TestAllTypes.decode_json(
+        test_message = ProtobufTestMessages::Proto3::TestAllTypesProto3.decode_json(
             request.json_payload)
       rescue Google::Protobuf::ParseError => err
         response.parse_error = err.message.encode('utf-8')