AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #2400 from acozzette/jspb-test-fixes

Browse Source 
Fixed JSPB test failures
This commit is contained in:
Adam Cozzette 2016-11-22 08:48:41 -08:00 committed by GitHub
commit 72002d8898
7 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/binary/proto_test.js
View File

@ -88,7 +88,7 @@ goog.require('proto.jspb.test.extendRepeatedStringList');
goog.require('proto.jspb.test.extendRepeatedUint32List'); goog.require('proto.jspb.test.extendRepeatedUint32List');
goog.require('proto.jspb.test.extendRepeatedUint64List'); 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'); goog.require('proto.google.protobuf.Any');

1
js/commonjs/export.js
View File

@ -24,3 +24,4 @@ exports.ExtensionFieldBinaryInfo = jspb.ExtensionFieldBinaryInfo;
exports.exportSymbol = goog.exportSymbol; exports.exportSymbol = goog.exportSymbol;
exports.inherits = goog.inherits; exports.inherits = goog.inherits;
exports.object = {extend: goog.object.extend}; exports.object = {extend: goog.object.extend};
exports.typeOf = goog.typeOf;

1
js/commonjs/export_testdeps.js
View File

@ -12,6 +12,7 @@ goog.require('jspb.arith.Int64');
goog.require('jspb.arith.UInt64'); goog.require('jspb.arith.UInt64');
goog.require('jspb.BinaryEncoder'); goog.require('jspb.BinaryEncoder');
goog.require('jspb.BinaryDecoder'); goog.require('jspb.BinaryDecoder');
goog.require('jspb.BinaryWriter');
goog.require('jspb.utils'); goog.require('jspb.utils');
exports.goog = goog; exports.goog = goog;

6
js/gulpfile.js
View File

@ -24,7 +24,7 @@ var wellKnownTypes = [
]; ];
gulp.task('genproto_closure', function (cb) { 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) { function (err, stdout, stderr) {
console.log(stdout); console.log(stdout);
console.log(stderr); console.log(stderr);
@ -33,7 +33,7 @@ gulp.task('genproto_closure', function (cb) {
}); });
gulp.task('genproto_commonjs', 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) { function (err, stdout, stderr) {
console.log(stdout); console.log(stdout);
console.log(stderr); console.log(stderr);
@ -42,7 +42,7 @@ gulp.task('genproto_commonjs', function (cb) {
}); });
gulp.task('genproto_commonjs_wellknowntypes', 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) { function (err, stdout, stderr) {
console.log(stdout); console.log(stdout);
console.log(stderr); console.log(stderr);

5
js/jasmine.json
View File

@ -7,6 +7,9 @@
"helpers": [ "helpers": [
"node_modules/google-closure-library/closure/goog/bootstrap/nodejs.js", "node_modules/google-closure-library/closure/goog/bootstrap/nodejs.js",
"node_loader.js", "node_loader.js",
"deps.js" "deps.js",
"google/protobuf/any.js",
"google/protobuf/struct.js",
"google/protobuf/timestamp.js"
] ]
} }

5
js/message_test.js
View File

@ -1049,12 +1049,13 @@ describe('Message test suite', function() {
var nested = new proto.jspb.test.Deeply.Nested.Message(); var nested = new proto.jspb.test.Deeply.Nested.Message();
nested.setCount(5); nested.setCount(5);
msg.setDeeplyNestedMessage(nested); msg.setDeeplyNestedMessage(nested);
assertEquals(5, msg.getDeeplyNestedMessage().getCount());
// After a serialization-deserialization round trip we should get back the // After a serialization-deserialization round trip we should get back the
// same data we started with. // same data we started with.
var serialized = msg.toObject(); var serialized = msg.serializeBinary();
var deserialized = var deserialized =
proto.jspb.test.ForeignNestedFieldMessage.fromObject(serialized); proto.jspb.test.ForeignNestedFieldMessage.deserializeBinary(serialized);
assertEquals(5, deserialized.getDeeplyNestedMessage().getCount()); assertEquals(5, deserialized.getDeeplyNestedMessage().getCount());
}); });

6
js/test.proto
View File

@ -254,9 +254,9 @@ message TestMapFieldsNoBinary {
} }
enum MapValueEnumNoBinary { enum MapValueEnumNoBinary {
MAP_VALUE_FOO = 0; MAP_VALUE_FOO_NOBINARY = 0;
MAP_VALUE_BAR = 1; MAP_VALUE_BAR_NOBINARY = 1;
MAP_VALUE_BAZ = 2; MAP_VALUE_BAZ_NOBINARY = 2;
} }
message MapValueMessageNoBinary { message MapValueMessageNoBinary {