| Index: third_party/protobuf/js/binary/utils_test.js
|
| diff --git a/third_party/protobuf/js/binary/utils_test.js b/third_party/protobuf/js/binary/utils_test.js
|
| index 5c330791aeaeb58ef6212c3c24b07979c6538a37..d27e5ea2c63053dda22eae271b813a64a1ddca3a 100644
|
| --- a/third_party/protobuf/js/binary/utils_test.js
|
| +++ b/third_party/protobuf/js/binary/utils_test.js
|
| @@ -197,6 +197,41 @@ describe('binaryUtilsTest', function() {
|
| assertEquals('123456789123456789', result[2]);
|
| });
|
|
|
| + /*
|
| + * Going from decimal strings to hash strings should be lossless.
|
| + */
|
| + it('testDecimalToHashConversion', function() {
|
| + var result;
|
| + var convert = jspb.utils.decimalStringToHash64;
|
| +
|
| + result = convert('0');
|
| + assertEquals(String.fromCharCode.apply(null,
|
| + [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00]), result);
|
| +
|
| + result = convert('-1');
|
| + assertEquals(String.fromCharCode.apply(null,
|
| + [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF]), result);
|
| +
|
| + result = convert('18446744073709551615');
|
| + assertEquals(String.fromCharCode.apply(null,
|
| + [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF]), result);
|
| +
|
| + result = convert('9223372036854775808');
|
| + assertEquals(String.fromCharCode.apply(null,
|
| + [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80]), result);
|
| +
|
| + result = convert('-9223372036854775808');
|
| + assertEquals(String.fromCharCode.apply(null,
|
| + [0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80]), result);
|
| +
|
| + result = convert('123456789123456789');
|
| + assertEquals(String.fromCharCode.apply(null,
|
| + [0x15, 0x5F, 0xD0, 0xAC, 0x4B, 0x9B, 0xB6, 0x01]), result);
|
| +
|
| + result = convert('-123456789123456789');
|
| + assertEquals(String.fromCharCode.apply(null,
|
| + [0xEB, 0xA0, 0x2F, 0x53, 0xB4, 0x64, 0x49, 0xFE]), result);
|
| + });
|
|
|
| /**
|
| * Going from hash strings to hex strings should be lossless.
|
| @@ -310,7 +345,7 @@ describe('binaryUtilsTest', function() {
|
| // NaN.
|
| jspb.utils.splitFloat32(NaN);
|
| if (!isNaN(jspb.utils.joinFloat32(jspb.utils.split64Low,
|
| - jspb.utils.split64High))) {
|
| + jspb.utils.split64High))) {
|
| throw 'fail!';
|
| }
|
|
|
| @@ -324,7 +359,7 @@ describe('binaryUtilsTest', function() {
|
| if (opt_bits != jspb.utils.split64Low) throw 'fail!';
|
| }
|
| if (truncate(x) != jspb.utils.joinFloat32(jspb.utils.split64Low,
|
| - jspb.utils.split64High)) {
|
| + jspb.utils.split64High)) {
|
| throw 'fail!';
|
| }
|
| }
|
| @@ -376,7 +411,7 @@ describe('binaryUtilsTest', function() {
|
| // NaN.
|
| jspb.utils.splitFloat64(NaN);
|
| if (!isNaN(jspb.utils.joinFloat64(jspb.utils.split64Low,
|
| - jspb.utils.split64High))) {
|
| + jspb.utils.split64High))) {
|
| throw 'fail!';
|
| }
|
|
|
| @@ -394,7 +429,7 @@ describe('binaryUtilsTest', function() {
|
| if (opt_lowBits != jspb.utils.split64Low) throw 'fail!';
|
| }
|
| if (x != jspb.utils.joinFloat64(jspb.utils.split64Low,
|
| - jspb.utils.split64High)) {
|
| + jspb.utils.split64High)) {
|
| throw 'fail!';
|
| }
|
| }
|
| @@ -439,16 +474,20 @@ describe('binaryUtilsTest', function() {
|
| * Tests counting packed varints.
|
| */
|
| it('testCountVarints', function() {
|
| - var writer = new jspb.BinaryWriter();
|
| -
|
| - var count = 0;
|
| + var values = [];
|
| for (var i = 1; i < 1000000000; i *= 1.1) {
|
| - writer.rawWriteVarint(Math.floor(i));
|
| - count++;
|
| + values.push(Math.floor(i));
|
| }
|
|
|
| + var writer = new jspb.BinaryWriter();
|
| + writer.writePackedUint64(1, values);
|
| +
|
| var buffer = new Uint8Array(writer.getResultBuffer());
|
| - assertEquals(count, jspb.utils.countVarints(buffer, 0, buffer.length));
|
| +
|
| + // We should have two more varints than we started with - one for the field
|
| + // tag, one for the packed length.
|
| + assertEquals(values.length + 2,
|
| + jspb.utils.countVarints(buffer, 0, buffer.length));
|
| });
|
|
|
|
|
| @@ -625,8 +664,5 @@ describe('binaryUtilsTest', function() {
|
|
|
| // Converting base64-encoded strings into Uint8Arrays should work.
|
| check(convert(sourceBase64));
|
| -
|
| - // Converting binary-data strings into Uint8Arrays should work.
|
| - check(convert(sourceString, /* opt_stringIsRawBytes = */ true));
|
| });
|
| });
|
|
|