Merge pull request #2400 from acozzette/jspb-test-fixes
Fixed JSPB test failures
This commit is contained in:
commit
72002d8898
@ -88,7 +88,7 @@ goog.require('proto.jspb.test.extendRepeatedStringList');
|
||||
goog.require('proto.jspb.test.extendRepeatedUint32List');
|
||||
goog.require('proto.jspb.test.extendRepeatedUint64List');
|
||||
|
||||
// CommonJS-LoadFromFile: google/protobuf/any_pb proto.google.protobuf
|
||||
// CommonJS-LoadFromFile: ../node_modules/google-protobuf/google/protobuf/any_pb proto.google.protobuf
|
||||
goog.require('proto.google.protobuf.Any');
|
||||
|
||||
|
||||
|
@ -24,3 +24,4 @@ exports.ExtensionFieldBinaryInfo = jspb.ExtensionFieldBinaryInfo;
|
||||
exports.exportSymbol = goog.exportSymbol;
|
||||
exports.inherits = goog.inherits;
|
||||
exports.object = {extend: goog.object.extend};
|
||||
exports.typeOf = goog.typeOf;
|
||||
|
@ -12,6 +12,7 @@ goog.require('jspb.arith.Int64');
|
||||
goog.require('jspb.arith.UInt64');
|
||||
goog.require('jspb.BinaryEncoder');
|
||||
goog.require('jspb.BinaryDecoder');
|
||||
goog.require('jspb.BinaryWriter');
|
||||
goog.require('jspb.utils');
|
||||
|
||||
exports.goog = goog;
|
||||
|
@ -24,7 +24,7 @@ var wellKnownTypes = [
|
||||
];
|
||||
|
||||
gulp.task('genproto_closure', function (cb) {
|
||||
exec(protoc + ' --js_out=library=testproto_libs,binary:. -I ../src -I . *.proto ../src/google/protobuf/descriptor.proto',
|
||||
exec(protoc + ' --js_out=library=testproto_libs,binary:. -I ../src -I . *.proto && ' + protoc + ' --js_out=one_output_file_per_input_file,binary:. -I ../src -I . ' + wellKnownTypes.join(' '),
|
||||
function (err, stdout, stderr) {
|
||||
console.log(stdout);
|
||||
console.log(stderr);
|
||||
@ -33,7 +33,7 @@ gulp.task('genproto_closure', function (cb) {
|
||||
});
|
||||
|
||||
gulp.task('genproto_commonjs', function (cb) {
|
||||
exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ../src/google/protobuf/descriptor.proto',
|
||||
exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ' + wellKnownTypes.join(' '),
|
||||
function (err, stdout, stderr) {
|
||||
console.log(stdout);
|
||||
console.log(stderr);
|
||||
@ -42,7 +42,7 @@ gulp.task('genproto_commonjs', function (cb) {
|
||||
});
|
||||
|
||||
gulp.task('genproto_commonjs_wellknowntypes', function (cb) {
|
||||
exec('mkdir -p commonjs_out/node_modules/google-protobuf && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out/node_modules/google-protobuf -I ../src ../src/google/protobuf/descriptor.proto',
|
||||
exec('mkdir -p commonjs_out/node_modules/google-protobuf && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out/node_modules/google-protobuf -I ../src ' + wellKnownTypes.join(' '),
|
||||
function (err, stdout, stderr) {
|
||||
console.log(stdout);
|
||||
console.log(stderr);
|
||||
|
@ -7,6 +7,9 @@
|
||||
"helpers": [
|
||||
"node_modules/google-closure-library/closure/goog/bootstrap/nodejs.js",
|
||||
"node_loader.js",
|
||||
"deps.js"
|
||||
"deps.js",
|
||||
"google/protobuf/any.js",
|
||||
"google/protobuf/struct.js",
|
||||
"google/protobuf/timestamp.js"
|
||||
]
|
||||
}
|
||||
|
@ -1049,12 +1049,13 @@ describe('Message test suite', function() {
|
||||
var nested = new proto.jspb.test.Deeply.Nested.Message();
|
||||
nested.setCount(5);
|
||||
msg.setDeeplyNestedMessage(nested);
|
||||
assertEquals(5, msg.getDeeplyNestedMessage().getCount());
|
||||
|
||||
// After a serialization-deserialization round trip we should get back the
|
||||
// same data we started with.
|
||||
var serialized = msg.toObject();
|
||||
var serialized = msg.serializeBinary();
|
||||
var deserialized =
|
||||
proto.jspb.test.ForeignNestedFieldMessage.fromObject(serialized);
|
||||
proto.jspb.test.ForeignNestedFieldMessage.deserializeBinary(serialized);
|
||||
assertEquals(5, deserialized.getDeeplyNestedMessage().getCount());
|
||||
});
|
||||
|
||||
|
@ -254,9 +254,9 @@ message TestMapFieldsNoBinary {
|
||||
}
|
||||
|
||||
enum MapValueEnumNoBinary {
|
||||
MAP_VALUE_FOO = 0;
|
||||
MAP_VALUE_BAR = 1;
|
||||
MAP_VALUE_BAZ = 2;
|
||||
MAP_VALUE_FOO_NOBINARY = 0;
|
||||
MAP_VALUE_BAR_NOBINARY = 1;
|
||||
MAP_VALUE_BAZ_NOBINARY = 2;
|
||||
}
|
||||
|
||||
message MapValueMessageNoBinary {
|
||||
|
Loading…
Reference in New Issue
Block a user