third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/js/binary/proto_test.js

 // 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.
@@ skipping 14 matching lines @@
 // 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.
 
 // Test suite is written using Jasmine -- see http://jasmine.github.io/
 
 goog.require('goog.crypt.base64');
 goog.require('goog.testing.asserts');
+goog.require('jspb.BinaryWriter');
 goog.require('jspb.Message');
 
 // CommonJS-LoadFromFile: ../testbinary_pb proto.jspb.test
 goog.require('proto.jspb.test.ExtendsWithMessage');
 goog.require('proto.jspb.test.ForeignEnum');
 goog.require('proto.jspb.test.ForeignMessage');
 goog.require('proto.jspb.test.TestAllTypes');
 goog.require('proto.jspb.test.TestExtendable');
 goog.require('proto.jspb.test.extendOptionalBool');
 goog.require('proto.jspb.test.extendOptionalBytes');
@@ skipping 35 matching lines @@
 goog.require('proto.jspb.test.extendRepeatedInt32List');
 goog.require('proto.jspb.test.extendRepeatedInt64List');
 goog.require('proto.jspb.test.extendRepeatedSfixed32List');
 goog.require('proto.jspb.test.extendRepeatedSfixed64List');
 goog.require('proto.jspb.test.extendRepeatedSint32List');
 goog.require('proto.jspb.test.extendRepeatedSint64List');
 goog.require('proto.jspb.test.extendRepeatedStringList');
 goog.require('proto.jspb.test.extendRepeatedUint32List');
 goog.require('proto.jspb.test.extendRepeatedUint64List');
 
+// CommonJS-LoadFromFile: ../node_modules/google-protobuf/google/protobuf/any_pb proto.google.protobuf
+goog.require('proto.google.protobuf.Any');
+
 
 var suite = {};
 
 var BYTES = new Uint8Array([1, 2, 8, 9]);
 
 var BYTES_B64 = goog.crypt.base64.encodeByteArray(BYTES);
 
 
 /**
  * Helper: fill all fields on a TestAllTypes message.
@@ skipping 87 matching lines @@
 }
 
 
 /**
  * Helper: verify contents of given TestAllTypes message as set by
  * fillAllFields().
  * @param {proto.jspb.test.TestAllTypes} original
  * @param {proto.jspb.test.TestAllTypes} copy
  */
 function checkAllFields(original, copy) {
-  assertTrue(jspb.Message.equals(original, copy));
-
   assertEquals(copy.getOptionalInt32(), -42);
   assertEquals(copy.getOptionalInt64(), -0x7fffffff00000000);
   assertEquals(copy.getOptionalUint32(), 0x80000000);
   assertEquals(copy.getOptionalUint64(), 0xf000000000000000);
   assertEquals(copy.getOptionalSint32(), -100);
   assertEquals(copy.getOptionalSint64(), -0x8000000000000000);
   assertEquals(copy.getOptionalFixed32(), 1234);
   assertEquals(copy.getOptionalFixed64(), 0x1234567800000000);
   assertEquals(copy.getOptionalSfixed32(), -1234);
   assertEquals(copy.getOptionalSfixed64(), -0x1234567800000000);
@@ skipping 54 matching lines @@
       [-0x8000000000000000]);
   assertElementsEquals(copy.getPackedRepeatedFixed32List(), [1234]);
   assertElementsEquals(copy.getPackedRepeatedFixed64List(),
       [0x1234567800000000]);
   assertElementsEquals(copy.getPackedRepeatedSfixed32List(), [-1234]);
   assertElementsEquals(copy.getPackedRepeatedSfixed64List(),
       [-0x1234567800000000]);
   assertElementsEquals(copy.getPackedRepeatedFloatList(), [1.5]);
   assertElementsEquals(copy.getPackedRepeatedDoubleList(), [-1.5]);
 
+
+  // Check last so we get more granular errors first.
+  assertTrue(jspb.Message.equals(original, copy));
 }
 
 
 /**
  * Helper: verify that all expected extensions are present.
  * @param {!proto.jspb.test.TestExtendable} msg
  */
 function checkExtensions(msg) {
   assertEquals(-42,
       msg.getExtension(proto.jspb.test.extendOptionalInt32));
@@ skipping 206 matching lines @@
       assertTrue(bytesCompare(msg.getRepeatedBytesList_asU8()[0], BYTES));
       assertTrue(bytesCompare(msg.getRepeatedBytesList_asU8()[1], BYTES));
     }
 
     msg.setRepeatedBytesList([BYTES, BYTES]);
     assertGetters();
 
     msg.setRepeatedBytesList([BYTES_B64, BYTES_B64]);
     assertGetters();
 
-    msg.setRepeatedBytesList(null);
+    msg.setRepeatedBytesList([]);
     assertEquals(0, msg.getRepeatedBytesList().length);
     assertEquals(0, msg.getRepeatedBytesList_asB64().length);
     assertEquals(0, msg.getRepeatedBytesList_asU8().length);
   });
 
   /**
    * Helper: fill all extension values.
    * @param {proto.jspb.test.TestExtendable} msg
    */
   function fillExtensions(msg) {
@@ skipping 108 matching lines @@
   /**
    * Tests extension serialization and deserialization.
    */
   it('testExtensions', function() {
     var msg = new proto.jspb.test.TestExtendable();
     fillExtensions(msg);
     var encoded = msg.serializeBinary();
     var decoded = proto.jspb.test.TestExtendable.deserializeBinary(encoded);
     checkExtensions(decoded);
   });
+
+  /**
+   * Tests that unknown extensions don't cause deserialization failure.
+   */
+  it('testUnknownExtension', function() {
+    var msg = new proto.jspb.test.TestExtendable();
+    fillExtensions(msg);
+    var writer = new jspb.BinaryWriter();
+    writer.writeBool((1 << 29) - 1, true);
+    proto.jspb.test.TestExtendable.serializeBinaryToWriter(msg, writer);
+    var encoded = writer.getResultBuffer();
+    var decoded = proto.jspb.test.TestExtendable.deserializeBinary(encoded);
+    checkExtensions(decoded);
+  });
+
+  it('testAnyWellKnownType', function() {
+    var any = new proto.google.protobuf.Any();
+    var msg = new proto.jspb.test.TestAllTypes();
+
+    fillAllFields(msg);
+
+    any.pack(msg.serializeBinary(), 'jspb.test.TestAllTypes');
+
+    assertEquals('type.googleapis.com/jspb.test.TestAllTypes',
+                 any.getTypeUrl());
+
+    var msg2 = any.unpack(
+        proto.jspb.test.TestAllTypes.deserializeBinary,
+        'jspb.test.TestAllTypes');
+
+    checkAllFields(msg, msg2);
+  });
 });