Merge pull request #9734 from mkruskal-google/sync-stage

Integrate from Piper for C++, Java, and Python

Author: mkruskal-google

binary/reader_test.js

@@ -57,8 +57,8 @@ describe('binaryReaderTest', function() {
   it('testInstanceCaches', /** @suppress {visibility} */ function() {
     var writer = new jspb.BinaryWriter();
     var dummyMessage = /** @type {!jspb.BinaryMessage} */ ({});
-    writer.writeMessage(1, dummyMessage, goog.nullFunction);
-    writer.writeMessage(2, dummyMessage, goog.nullFunction);
+    writer.writeMessage(1, dummyMessage, () => {});
+    writer.writeMessage(2, dummyMessage, () => {});
 
     var buffer = writer.getResultBuffer();
 
@@ -139,7 +139,7 @@ describe('binaryReaderTest', function() {
     var dummyMessage = /** @type {!jspb.BinaryMessage} */ ({});
     reader.nextField();
     assertThrows(function() {
-      reader.readMessage(dummyMessage, goog.nullFunction);
+      reader.readMessage(dummyMessage, () => {});
     });
 
     // Reading past the end of the stream should trigger an assertion.
@@ -651,7 +651,7 @@ describe('binaryReaderTest', function() {
     });
 
     // Add one empty message.
-    writer.writeMessage(6, dummyMessage, goog.nullFunction);
+    writer.writeMessage(6, dummyMessage, () => {});
 
     writer.writeInt32(7, 700);
 

binary/writer_test.js

@@ -65,7 +65,7 @@ describe('binaryWriterTest', function() {
     var dummyMessage = /** @type {!jspb.BinaryMessage} */ ({});
 
     assertFails(function() {
-      writer.writeMessage(-1, dummyMessage, goog.nullFunction);
+      writer.writeMessage(-1, dummyMessage, () => {});
     });
 
     // Writing invalid field indices should assert.

compatibility_tests/v3.0.0/binary/reader_test.js

@@ -56,8 +56,8 @@ describe('binaryReaderTest', function() {
   it('testInstanceCaches', /** @suppress {visibility} */ function() {
     var writer = new jspb.BinaryWriter();
     var dummyMessage = /** @type {!jspb.BinaryMessage} */({});
-    writer.writeMessage(1, dummyMessage, goog.nullFunction);
-    writer.writeMessage(2, dummyMessage, goog.nullFunction);
+    writer.writeMessage(1, dummyMessage, () => {});
+    writer.writeMessage(2, dummyMessage, () => {});
 
     var buffer = writer.getResultBuffer();
 
@@ -138,7 +138,7 @@ describe('binaryReaderTest', function() {
     var dummyMessage = /** @type {!jspb.BinaryMessage} */({});
     reader.nextField();
     assertThrows(function() {
-      reader.readMessage(dummyMessage, goog.nullFunction);
+      reader.readMessage(dummyMessage, () => {});
     });
 
     // Reading past the end of the stream should trigger an assertion.
@@ -596,7 +596,7 @@ describe('binaryReaderTest', function() {
     });
 
     // Add one empty message.
-    writer.writeMessage(6, dummyMessage, goog.nullFunction);
+    writer.writeMessage(6, dummyMessage, () => {});
 
     writer.writeInt32(7, 700);
 

compatibility_tests/v3.0.0/binary/writer_test.js

@@ -62,7 +62,7 @@ describe('binaryWriterTest', function() {
     var dummyMessage = /** @type {!jspb.BinaryMessage} */({});
 
     assertFails(function() {
-      writer.writeMessage(-1, dummyMessage, goog.nullFunction);
+      writer.writeMessage(-1, dummyMessage, () => {});
     });
 
     // Writing invalid field indices should assert.

compatibility_tests/v3.1.0/binary/reader_test.js

@@ -56,8 +56,8 @@ describe('binaryReaderTest', function() {
   it('testInstanceCaches', /** @suppress {visibility} */ function() {
     var writer = new jspb.BinaryWriter();
     var dummyMessage = /** @type {!jspb.BinaryMessage} */ ({});
-    writer.writeMessage(1, dummyMessage, goog.nullFunction);
-    writer.writeMessage(2, dummyMessage, goog.nullFunction);
+    writer.writeMessage(1, dummyMessage, () => {});
+    writer.writeMessage(2, dummyMessage, () => {});
 
     var buffer = writer.getResultBuffer();
 
@@ -138,7 +138,7 @@ describe('binaryReaderTest', function() {
     var dummyMessage = /** @type {!jspb.BinaryMessage} */ ({});
     reader.nextField();
     assertThrows(function() {
-      reader.readMessage(dummyMessage, goog.nullFunction);
+      reader.readMessage(dummyMessage, () => {});
     });
 
     // Reading past the end of the stream should trigger an assertion.
@@ -620,7 +620,7 @@ describe('binaryReaderTest', function() {
     });
 
     // Add one empty message.
-    writer.writeMessage(6, dummyMessage, goog.nullFunction);
+    writer.writeMessage(6, dummyMessage, () => {});
 
     writer.writeInt32(7, 700);
 

compatibility_tests/v3.1.0/binary/writer_test.js

@@ -62,7 +62,7 @@ describe('binaryWriterTest', function() {
     var dummyMessage = /** @type {!jspb.BinaryMessage} */ ({});
 
     assertFails(function() {
-      writer.writeMessage(-1, dummyMessage, goog.nullFunction);
+      writer.writeMessage(-1, dummyMessage, () => {});
     });
 
     // Writing invalid field indices should assert.