Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: fromObject should not initialize oneof members (#1597)
* test: adding test for pbjs static code generation * fix: fromObject should not initialize oneof members
- Loading branch information
1 parent
6c4d307
commit 90afe44
Showing
4 changed files
with
96 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| // A minimal test for pbjs tool targets. | ||
|
|
||
| var tape = require("tape"); | ||
| var path = require("path"); | ||
| var Module = require("module"); | ||
| var protobuf = require(".."); | ||
|
|
||
| tape.test("pbjs generates static code", function(test) { | ||
| // pbjs does not seem to work with Node v4, so skip this test if we're running on it | ||
| if (process.versions.node.match(/^4\./)) { | ||
| test.end(); | ||
| return; | ||
| } | ||
|
|
||
| // Alter the require cache to make the cli/targets/static work since it requires "protobufjs" | ||
| // and we don't want to mess with "npm link" | ||
| var savedResolveFilename = Module._resolveFilename; | ||
| Module._resolveFilename = function(request, parent) { | ||
| if (request.startsWith("protobufjs")) { | ||
| return request; | ||
| } | ||
| return savedResolveFilename(request, parent); | ||
| }; | ||
| require.cache.protobufjs = require.cache[path.resolve("index.js")]; | ||
|
|
||
| var staticTarget = require("../cli/targets/static"); | ||
|
|
||
| var root = protobuf.loadSync("tests/data/cli/test.proto"); | ||
| root.resolveAll(); | ||
|
|
||
| staticTarget(root, { | ||
| create: true, | ||
| decode: true, | ||
| encode: true, | ||
| convert: true, | ||
| }, function(err, jsCode) { | ||
| test.error(err, 'static code generation worked'); | ||
|
|
||
| // jsCode is the generated code; we'll eval it | ||
| // (since this is what we normally does with the code, right?) | ||
| // This is a test code. Do not use this in production. | ||
| var $protobuf = protobuf; | ||
| eval(jsCode); | ||
|
|
||
| var OneofContainer = protobuf.roots.default.OneofContainer; | ||
| var Message = protobuf.roots.default.Message; | ||
| test.ok(OneofContainer, "type is loaded"); | ||
| test.ok(Message, "type is loaded"); | ||
|
|
||
| // Check that fromObject and toObject work for plain object | ||
| var obj = { | ||
| messageInOneof: { | ||
| value: 42, | ||
| }, | ||
| regularField: "abc", | ||
| }; | ||
| var obj1 = OneofContainer.toObject(OneofContainer.fromObject(obj)); | ||
| test.deepEqual(obj, obj1, "fromObject and toObject work for plain object"); | ||
|
|
||
| // Check that dynamic fromObject and toObject work for static instance | ||
| var root = protobuf.loadSync("tests/data/cli/test.proto"); | ||
| var OneofContainerDynamic = root.lookup("OneofContainer"); | ||
| var instance = new OneofContainer(); | ||
| instance.messageInOneof = new Message(); | ||
| instance.messageInOneof.value = 42; | ||
| instance.regularField = "abc"; | ||
| var instance1 = OneofContainerDynamic.toObject(OneofContainerDynamic.fromObject(instance)); | ||
| test.deepEqual(instance, instance1, "fromObject and toObject work for instance of the static type"); | ||
|
|
||
| test.end(); | ||
| }); | ||
|
|
||
| // Rollback all the require() related mess we made | ||
| delete require.cache.protobufjs; | ||
| Module._resolveFilename = savedResolveFilename; | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| syntax = "proto3"; | ||
|
|
||
| message Message { | ||
| int32 value = 1; | ||
| } | ||
|
|
||
| message OneofContainer { | ||
| oneof some_oneof { | ||
| string string_in_oneof = 1; | ||
| Message message_in_oneof = 2; | ||
| } | ||
| string regular_field = 3; | ||
| } |