Skip to content

Commit d871d97

Browse files
kpdeckeralexander-fenster
kpdecker
and
alexander-fenster
authored
test: rebuild tests for current runtime (#1476)
* Rebuild gentest sources * Incorporate gentests into make Also reorder tasks so type linting is done against newly generated code vs. old. * fix: add newline to package.json Co-authored-by: Alexander Fenster <fenster@google.com> Co-authored-by: Alexander Fenster <github@fenster.name>
1 parent 9893e35 commit d871d97

File tree

6 files changed

+295
-70
lines changed

6 files changed

+295
-70
lines changed

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
"prof": "node bench/prof",
3838
"test": "npm run test:sources && npm run test:types",
3939
"test:sources": "tape -r ./lib/tape-adapter tests/*.js tests/node/*.js",
40-
"test:types": "tsc tests/comp_typescript.ts --lib es2015 --strictNullChecks --experimentalDecorators --emitDecoratorMetadata && tsc tests/data/test.js.ts --lib es2015 --noEmit --strictNullChecks && tsc tests/data/rpc.ts --lib es2015 --noEmit --strictNullChecks",
41-
"make": "npm run lint && npm run build && npm test"
40+
"test:types": "tsc tests/comp_typescript.ts --lib es2015 --strictNullChecks --experimentalDecorators --emitDecoratorMetadata && tsc tests/data/test.js.ts --lib es2015 --noEmit --strictNullChecks && tsc tests/data/*.ts --lib es2015 --noEmit --strictNullChecks",
41+
"make": "npm run lint:sources && npm run build && npm run lint:types && node ./scripts/gentests.js && npm test"
4242
},
4343
"dependencies": {
4444
"@protobufjs/aspromise": "^1.1.2",

‎scripts/gentests.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var fs = require("fs"),
2121
out = [ basename ].concat(flags).join("-") + ".js";
2222
pbjs.main([
2323
"--target", "static-module",
24-
"--wrap", "commonjs",
24+
"--wrap", flags.includes('es6') ? 'es6' : "commonjs",
2525
"--root", "test_" + path.basename(basename, ".js"),
2626
file
2727
].concat(flags.map(function(flag) {

‎tests/comp_typescript.js

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
2323
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
2424
};
2525
exports.__esModule = true;
26+
exports.AwesomeMessage = exports.AwesomeSubMessage = exports.AwesomeEnum = exports.Hello = void 0;
2627
var __1 = require("..");
2728
// Reflection
2829
var root = __1.Root.fromJSON({

‎tests/data/convert.js

+19-5
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ $root.Message = (function() {
201201
Message.decode = function decode(reader, length) {
202202
if (!(reader instanceof $Reader))
203203
reader = $Reader.create(reader);
204-
var end = length === undefined ? reader.len : reader.pos + length, message = new $root.Message(), key;
204+
var end = length === undefined ? reader.len : reader.pos + length, message = new $root.Message(), key, value;
205205
while (reader.pos < end) {
206206
var tag = reader.uint32();
207207
switch (tag >>> 3) {
@@ -248,12 +248,26 @@ $root.Message = (function() {
248248
message.enumRepeated.push(reader.int32());
249249
break;
250250
case 9:
251-
reader.skip().pos++;
252251
if (message.int64Map === $util.emptyObject)
253252
message.int64Map = {};
254-
key = reader.string();
255-
reader.pos++;
256-
message.int64Map[key] = reader.int64();
253+
var end2 = reader.uint32() + reader.pos;
254+
key = "";
255+
value = 0;
256+
while (reader.pos < end2) {
257+
var tag2 = reader.uint32();
258+
switch (tag2 >>> 3) {
259+
case 1:
260+
key = reader.string();
261+
break;
262+
case 2:
263+
value = reader.int64();
264+
break;
265+
default:
266+
reader.skipType(tag2 & 7);
267+
break;
268+
}
269+
}
270+
message.int64Map[key] = value;
257271
break;
258272
default:
259273
reader.skipType(tag & 7);

‎tests/data/package.js

+73-17
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ $root.Package = (function() {
285285
Package.decode = function decode(reader, length) {
286286
if (!(reader instanceof $Reader))
287287
reader = $Reader.create(reader);
288-
var end = length === undefined ? reader.len : reader.pos + length, message = new $root.Package(), key;
288+
var end = length === undefined ? reader.len : reader.pos + length, message = new $root.Package(), key, value;
289289
while (reader.pos < end) {
290290
var tag = reader.uint32();
291291
switch (tag >>> 3) {
@@ -325,36 +325,92 @@ $root.Package = (function() {
325325
message.main = reader.string();
326326
break;
327327
case 11:
328-
reader.skip().pos++;
329328
if (message.bin === $util.emptyObject)
330329
message.bin = {};
331-
key = reader.string();
332-
reader.pos++;
333-
message.bin[key] = reader.string();
330+
var end2 = reader.uint32() + reader.pos;
331+
key = "";
332+
value = "";
333+
while (reader.pos < end2) {
334+
var tag2 = reader.uint32();
335+
switch (tag2 >>> 3) {
336+
case 1:
337+
key = reader.string();
338+
break;
339+
case 2:
340+
value = reader.string();
341+
break;
342+
default:
343+
reader.skipType(tag2 & 7);
344+
break;
345+
}
346+
}
347+
message.bin[key] = value;
334348
break;
335349
case 12:
336-
reader.skip().pos++;
337350
if (message.scripts === $util.emptyObject)
338351
message.scripts = {};
339-
key = reader.string();
340-
reader.pos++;
341-
message.scripts[key] = reader.string();
352+
var end2 = reader.uint32() + reader.pos;
353+
key = "";
354+
value = "";
355+
while (reader.pos < end2) {
356+
var tag2 = reader.uint32();
357+
switch (tag2 >>> 3) {
358+
case 1:
359+
key = reader.string();
360+
break;
361+
case 2:
362+
value = reader.string();
363+
break;
364+
default:
365+
reader.skipType(tag2 & 7);
366+
break;
367+
}
368+
}
369+
message.scripts[key] = value;
342370
break;
343371
case 13:
344-
reader.skip().pos++;
345372
if (message.dependencies === $util.emptyObject)
346373
message.dependencies = {};
347-
key = reader.string();
348-
reader.pos++;
349-
message.dependencies[key] = reader.string();
374+
var end2 = reader.uint32() + reader.pos;
375+
key = "";
376+
value = "";
377+
while (reader.pos < end2) {
378+
var tag2 = reader.uint32();
379+
switch (tag2 >>> 3) {
380+
case 1:
381+
key = reader.string();
382+
break;
383+
case 2:
384+
value = reader.string();
385+
break;
386+
default:
387+
reader.skipType(tag2 & 7);
388+
break;
389+
}
390+
}
391+
message.dependencies[key] = value;
350392
break;
351393
case 15:
352-
reader.skip().pos++;
353394
if (message.devDependencies === $util.emptyObject)
354395
message.devDependencies = {};
355-
key = reader.string();
356-
reader.pos++;
357-
message.devDependencies[key] = reader.string();
396+
var end2 = reader.uint32() + reader.pos;
397+
key = "";
398+
value = "";
399+
while (reader.pos < end2) {
400+
var tag2 = reader.uint32();
401+
switch (tag2 >>> 3) {
402+
case 1:
403+
key = reader.string();
404+
break;
405+
case 2:
406+
value = reader.string();
407+
break;
408+
default:
409+
reader.skipType(tag2 & 7);
410+
break;
411+
}
412+
}
413+
message.devDependencies[key] = value;
358414
break;
359415
case 17:
360416
message.types = reader.string();

0 commit comments

Comments
 (0)