| Index: third_party/protobuf/js/proto3_test.js
|
| diff --git a/third_party/protobuf/js/proto3_test.js b/third_party/protobuf/js/proto3_test.js
|
| index 4dd7790f16b9427128f62bf5c04325ce0e5378f4..3c929effd58c8a0462fe7571ca680764ca64c753 100644
|
| --- a/third_party/protobuf/js/proto3_test.js
|
| +++ b/third_party/protobuf/js/proto3_test.js
|
| @@ -221,37 +221,52 @@ describe('proto3Test', function() {
|
| it('testOneofs', function() {
|
| var msg = new proto.jspb.test.TestProto3();
|
|
|
| - assertEquals(msg.getOneofUint32(), undefined);
|
| + assertEquals(msg.getOneofUint32(), 0);
|
| assertEquals(msg.getOneofForeignMessage(), undefined);
|
| - assertEquals(msg.getOneofString(), undefined);
|
| - assertEquals(msg.getOneofBytes(), undefined);
|
| + assertEquals(msg.getOneofString(), '');
|
| + assertEquals(msg.getOneofBytes(), '');
|
| + assertFalse(msg.hasOneofUint32());
|
| + assertFalse(msg.hasOneofString());
|
| + assertFalse(msg.hasOneofBytes());
|
|
|
| msg.setOneofUint32(42);
|
| assertEquals(msg.getOneofUint32(), 42);
|
| assertEquals(msg.getOneofForeignMessage(), undefined);
|
| - assertEquals(msg.getOneofString(), undefined);
|
| - assertEquals(msg.getOneofBytes(), undefined);
|
| + assertEquals(msg.getOneofString(), '');
|
| + assertEquals(msg.getOneofBytes(), '');
|
| + assertTrue(msg.hasOneofUint32());
|
| + assertFalse(msg.hasOneofString());
|
| + assertFalse(msg.hasOneofBytes());
|
|
|
|
|
| var submsg = new proto.jspb.test.ForeignMessage();
|
| msg.setOneofForeignMessage(submsg);
|
| - assertEquals(msg.getOneofUint32(), undefined);
|
| + assertEquals(msg.getOneofUint32(), 0);
|
| assertEquals(msg.getOneofForeignMessage(), submsg);
|
| - assertEquals(msg.getOneofString(), undefined);
|
| - assertEquals(msg.getOneofBytes(), undefined);
|
| + assertEquals(msg.getOneofString(), '');
|
| + assertEquals(msg.getOneofBytes(), '');
|
| + assertFalse(msg.hasOneofUint32());
|
| + assertFalse(msg.hasOneofString());
|
| + assertFalse(msg.hasOneofBytes());
|
|
|
| msg.setOneofString('hello');
|
| - assertEquals(msg.getOneofUint32(), undefined);
|
| + assertEquals(msg.getOneofUint32(), 0);
|
| assertEquals(msg.getOneofForeignMessage(), undefined);
|
| assertEquals(msg.getOneofString(), 'hello');
|
| - assertEquals(msg.getOneofBytes(), undefined);
|
| + assertEquals(msg.getOneofBytes(), '');
|
| + assertFalse(msg.hasOneofUint32());
|
| + assertTrue(msg.hasOneofString());
|
| + assertFalse(msg.hasOneofBytes());
|
|
|
| msg.setOneofBytes(goog.crypt.base64.encodeString('\u00FF\u00FF'));
|
| - assertEquals(msg.getOneofUint32(), undefined);
|
| + assertEquals(msg.getOneofUint32(), 0);
|
| assertEquals(msg.getOneofForeignMessage(), undefined);
|
| - assertEquals(msg.getOneofString(), undefined);
|
| + assertEquals(msg.getOneofString(), '');
|
| assertEquals(msg.getOneofBytes_asB64(),
|
| goog.crypt.base64.encodeString('\u00FF\u00FF'));
|
| + assertFalse(msg.hasOneofUint32());
|
| + assertFalse(msg.hasOneofString());
|
| + assertTrue(msg.hasOneofBytes());
|
| });
|
|
|
|
|
| @@ -279,7 +294,7 @@ describe('proto3Test', function() {
|
| msg.setOptionalForeignEnum(proto.jspb.test.Proto3Enum.PROTO3_BAR);
|
| msg.setOptionalForeignEnum(proto.jspb.test.Proto3Enum.PROTO3_FOO);
|
| msg.setOneofUint32(32);
|
| - msg.setOneofUint32(null);
|
| + msg.clearOneofUint32();
|
|
|
|
|
| var serialized = msg.serializeBinary();
|
|
|