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

1 files changed, 10 insertions, 4 deletions

diff --git a/conformance/conformance_nodejs.js b/conformance/conformance_nodejs.js
index 7ea392d1..5d3955f7 100755
--- a/conformance/conformance_nodejs.js
+++ b/conformance/conformance_nodejs.js
@@ -34,6 +34,7 @@
 
 var conformance = require('conformance_pb');
 var test_messages_proto3 = require('google/protobuf/test_messages_proto3_pb');
+var test_messages_proto2 = require('google/protobuf/test_messages_proto2_pb');
 var fs = require('fs');
 
 var testCount = 0;
@@ -50,17 +51,22 @@ function doTest(request) {
 
     switch (request.getPayloadCase()) {
       case conformance.ConformanceRequest.PayloadCase.PROTOBUF_PAYLOAD: {
-        if (request.getMessageType() == "protobuf_test_messages.proto3.TestAllTypes") {
+        if (request.getMessageType() == "protobuf_test_messages.proto3.TestAllTypesProto3") {
           try {
-            testMessage = test_messages_proto3.TestAllTypes.deserializeBinary(
+            testMessage = test_messages_proto3.TestAllTypesProto3.deserializeBinary(
                 request.getProtobufPayload());
           } catch (err) {
             response.setParseError(err.toString());
             return response;
           }
         } else if (request.getMessageType() == "protobuf_test_messages.proto2.TestAllTypesProto2"){
-          response.setSkipped("NodeJS doesn\'t support proto2");
-          return response;
+          try {
+            testMessage = test_messages_proto2.TestAllTypesProto2.deserializeBinary(
+                request.getProtobufPayload());
+          } catch (err) {
+            response.setParseError(err.toString());
+            return response;
+          }
         } else {
           throw "Protobuf request doesn\'t have specific payload type";
         }