@intuitionrobotics/testelot 0.43.4 → 0.44.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/core/Action.d.ts +2 -1
- package/core/Action.js +16 -11
- package/core/Action.js.map +1 -1
- package/core/Action_Http.js +7 -26
- package/core/Action_Http.js.map +1 -1
- package/core/Action_Log.d.ts +1 -1
- package/core/Action_Sleep.js +2 -2
- package/core/Action_Sleep.js.map +1 -1
- package/core/Action_ThrowException.js +2 -2
- package/core/Action_ThrowException.js.map +1 -1
- package/core/Reporter.d.ts +1 -1
- package/core/Reporter.js +17 -30
- package/core/Reporter.js.map +1 -1
- package/core/TestException.d.ts +1 -1
- package/core/TestException.js +2 -2
- package/core/TestException.js.map +1 -1
- package/core/_base_apis.d.ts +1 -1
- package/core/_base_apis.js +4 -3
- package/core/_base_apis.js.map +1 -1
- package/package.json +2 -2
- package/test-app/AppTester.d.ts +1 -1
- package/test-app/AppTester.js +4 -3
- package/test-app/AppTester.js.map +1 -1
package/core/Action.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Created by IR on 3/18/17.
|
|
3
3
|
*/
|
|
4
|
-
import { Logger
|
|
4
|
+
import { Logger } from "@intuitionrobotics/ts-common/core/logger/Logger";
|
|
5
|
+
import { Constructor } from "@intuitionrobotics/ts-common/utils/types";
|
|
5
6
|
import { ContextKey } from "./ContainerContext";
|
|
6
7
|
import { Reporter } from "./Reporter";
|
|
7
8
|
export declare enum Status {
|
package/core/Action.js
CHANGED
|
@@ -30,7 +30,12 @@ exports.Action = exports.Status = void 0;
|
|
|
30
30
|
/**
|
|
31
31
|
* Created by IR on 3/18/17.
|
|
32
32
|
*/
|
|
33
|
-
const
|
|
33
|
+
const Logger_1 = require("@intuitionrobotics/ts-common/core/logger/Logger");
|
|
34
|
+
const random_tools_1 = require("@intuitionrobotics/ts-common/utils/random-tools");
|
|
35
|
+
const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
|
|
36
|
+
const types_1 = require("@intuitionrobotics/ts-common/utils/types");
|
|
37
|
+
const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
|
|
38
|
+
const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
|
|
34
39
|
const TestException_1 = require("./TestException");
|
|
35
40
|
var Status;
|
|
36
41
|
(function (Status) {
|
|
@@ -40,10 +45,10 @@ var Status;
|
|
|
40
45
|
Status["Success"] = "Success";
|
|
41
46
|
Status["Error"] = "Error";
|
|
42
47
|
})(Status = exports.Status || (exports.Status = {}));
|
|
43
|
-
class Action extends
|
|
48
|
+
class Action extends Logger_1.Logger {
|
|
44
49
|
constructor(actionType, tag) {
|
|
45
50
|
super(tag || "Testelot");
|
|
46
|
-
this.uuid =
|
|
51
|
+
this.uuid = random_tools_1.generateUUID();
|
|
47
52
|
this.label = "Unnamed Action";
|
|
48
53
|
this.policy = 1 /* SkipOnError */;
|
|
49
54
|
this.postExecutionDelay = 0;
|
|
@@ -52,13 +57,13 @@ class Action extends ts_common_1.Logger {
|
|
|
52
57
|
}
|
|
53
58
|
static resolveTestsToRun() {
|
|
54
59
|
const strings = process.argv.filter((arg) => arg.includes("--test="));
|
|
55
|
-
console.log(`raw: ${
|
|
60
|
+
console.log(`raw: ${tools_1.__stringify(strings)}`);
|
|
56
61
|
this.testsToRun = strings.map(arg => arg.replace("--test=", ""));
|
|
57
|
-
console.log(`Tests to run: ${
|
|
62
|
+
console.log(`Tests to run: ${tools_1.__stringify(this.testsToRun)}`);
|
|
58
63
|
}
|
|
59
64
|
expectToFail(_exceptionType, assertFailCondition) {
|
|
60
65
|
this.shouldFailCondition = (e) => {
|
|
61
|
-
const err =
|
|
66
|
+
const err = exceptions_1.isErrorOfType(e, _exceptionType);
|
|
62
67
|
if (!err)
|
|
63
68
|
throw new TestException_1.TestException(`Test should have failed with an: ${_exceptionType.name}`);
|
|
64
69
|
return !assertFailCondition ? true : assertFailCondition(err);
|
|
@@ -122,7 +127,7 @@ class Action extends ts_common_1.Logger {
|
|
|
122
127
|
_execute() {
|
|
123
128
|
var _a, _b;
|
|
124
129
|
return __awaiter(this, void 0, void 0, function* () {
|
|
125
|
-
this._started =
|
|
130
|
+
this._started = date_time_tools_1.currentTimeMillies();
|
|
126
131
|
let label;
|
|
127
132
|
let err;
|
|
128
133
|
let retValue = undefined;
|
|
@@ -141,7 +146,7 @@ class Action extends ts_common_1.Logger {
|
|
|
141
146
|
yield this.execute();
|
|
142
147
|
label && this.reporter.logVerbose(`skipped: ${label}`);
|
|
143
148
|
this.reporter.onActionEnded(this);
|
|
144
|
-
this._ended =
|
|
149
|
+
this._ended = date_time_tools_1.currentTimeMillies();
|
|
145
150
|
return;
|
|
146
151
|
}
|
|
147
152
|
if (this.isContainer())
|
|
@@ -153,7 +158,7 @@ class Action extends ts_common_1.Logger {
|
|
|
153
158
|
}
|
|
154
159
|
this.reporter.onActionStarted(this);
|
|
155
160
|
this.setStatus(Status.Running);
|
|
156
|
-
retValue = yield this.execute((param ||
|
|
161
|
+
retValue = yield this.execute((param || types_1.Void));
|
|
157
162
|
}
|
|
158
163
|
catch (e) {
|
|
159
164
|
err = ((_a = this.shouldFailCondition) === null || _a === void 0 ? void 0 : _a.call(this, e)) ? undefined : e;
|
|
@@ -179,8 +184,8 @@ class Action extends ts_common_1.Logger {
|
|
|
179
184
|
}
|
|
180
185
|
}
|
|
181
186
|
if (this.postExecutionDelay > 0)
|
|
182
|
-
yield
|
|
183
|
-
this._ended =
|
|
187
|
+
yield date_time_tools_1.timeout(this.postExecutionDelay);
|
|
188
|
+
this._ended = date_time_tools_1.currentTimeMillies();
|
|
184
189
|
});
|
|
185
190
|
}
|
|
186
191
|
setStatus(status) {
|
package/core/Action.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Action.js","sourceRoot":"","sources":["../../src/main/core/Action.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"Action.js","sourceRoot":"","sources":["../../src/main/core/Action.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,4EAAyE;AACzE,kFAA+E;AAC/E,oEAAuE;AACvE,oEAA6E;AAC7E,6EAA6E;AAC7E,wFAAiG;AAGjG,mDAA8C;AAE9C,IAAY,MAMX;AAND,WAAY,MAAM;IACjB,yBAAiB,CAAA;IACjB,6BAAmB,CAAA;IACnB,6BAAmB,CAAA;IACnB,6BAAmB,CAAA;IACnB,yBAAiB,CAAA;AAClB,CAAC,EANW,MAAM,GAAN,cAAM,KAAN,cAAM,QAMjB;AAYD,MAAsB,MACrB,SAAQ,eAAM;IAsBd,YAAsB,UAAoB,EAAE,GAAY;QACvD,KAAK,CAAC,GAAG,IAAI,UAAU,CAAC,CAAC;QAlBjB,SAAI,GAAW,2BAAY,EAAE,CAAC;QAM/B,UAAK,GAA+C,gBAAgB,CAAC;QACtE,WAAM,uBAAwC;QAG7C,uBAAkB,GAAW,CAAC,CAAC;QAEhC,WAAM,GAAW,MAAM,CAAC,KAAK,CAAC;QAQpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,iBAAiB;QACvB,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;QAC9E,OAAO,CAAC,GAAG,CAAC,QAAQ,mBAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAE5C,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,GAAG,CAAC,iBAAiB,mBAAW,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,YAAY,CAAkB,cAA8B,EAAE,mBAA4C;QACzG,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAQ,EAAW,EAAE;YAChD,MAAM,GAAG,GAAG,0BAAa,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YAC7C,IAAI,CAAC,GAAG;gBACP,MAAM,IAAI,6BAAa,CAAC,oCAAoC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;YAEpF,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAC/D,CAAC,CAAC;QACF,OAAO,IAAI,CAAC;IACb,CAAC;IAED,kBAAkB,CAAC,oBAAuD;QACzE,IAAI,CAAC,mBAAmB,GAAG,oBAAoB,CAAC;QAChD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,WAAW;QACV,OAAO,KAAK,CAAC;IACd,CAAC;IAEM,SAAS;QACf,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IACtB,CAAC;IAEM,cAAc,CAAC,MAAmB;QACxC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IAES,SAAS,CAAC,MAAmB;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAES,WAAW,CAAC,QAAkB;QACvC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC1B,CAAC;IAED,WAAW,CAAC,QAAiC;QAC5C,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,UAAU,CAAC,OAA+B;QACzC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,qBAAqB,CAAC,kBAA0B;QAC/C,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAC7C,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,QAAQ,CAAC,KAAiD;QAChE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,UAAU;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IAED,QAAQ;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACpB,CAAC;IAEe,iBAAiB,CAAC,MAAc;;YAC/C,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACvB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAElC,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;QACzB,CAAC;KAAA;IAES,YAAY,CAAC,KAAkB;QACxC,IAAI,CAAC,IAAI,CAAC,KAAK;YACd,OAAO;QAER,OAAO,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACxE,CAAC;IAEa,QAAQ;;;YACrB,IAAI,CAAC,QAAQ,GAAG,oCAAkB,EAAE,CAAC;YAErC,IAAI,KAAyB,CAAC;YAC9B,IAAI,GAAG,CAAC;YACR,IAAI,QAAQ,GAA4B,SAAS,CAAC;YAClD,IAAI;gBACH,IAAI,KAAK,CAAC;gBACV,IAAI,IAAI,CAAC,OAAO;oBACf,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAEhC,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBACjC,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oBAC1G,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;;oBAE/B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAE9B,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,EAAE;oBACnC,IAAI,IAAI,CAAC,WAAW,EAAE;wBACrB,aAAa;wBACb,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;oBAEtB,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC;oBACvD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBAClC,IAAI,CAAC,MAAM,GAAG,oCAAkB,EAAE,CAAC;oBACnC,OAAO;iBACP;gBAED,IAAI,IAAI,CAAC,WAAW,EAAE;oBACrB,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;qBAC5C;oBACJ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,KAAK,EAAE,CAAC,CAAC;oBACvD,IAAI,IAAI,CAAC,OAAO;wBACf,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;iBAC9D;gBAED,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBACpC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAE/B,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,IAAI,YAAI,CAAe,CAAC,CAAC;aAC7D;YAAC,OAAO,CAAC,EAAE;gBACX,GAAG,GAAG,OAAA,IAAI,CAAC,mBAAmB,+CAAxB,IAAI,EAAuB,CAAC,GAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;aACpD;oBAAS;gBACT,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,OAAO,EAAE;oBACnC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBACpD,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;oBAClC,IAAI,GAAG,EAAE;wBACR,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,KAAK,EAAE,CAAC,CAAC;wBAC7D,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;qBAC5B;yBAAM;wBACN,mDAAmD;wBACnD,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;4BAC/C,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;yBAClC;wBACD,MAAA,IAAI,CAAC,mBAAmB,+CAAxB,IAAI,EAAuB,QAAQ,EAAE;wBAGrC,wDAAwD;wBACxD,IAAI,IAAI,CAAC,WAAW,EAAE;4BACrB,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;qBACjD;iBACD;aACD;YAED,IAAI,IAAI,CAAC,kBAAkB,GAAG,CAAC;gBAC9B,MAAM,yBAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAExC,IAAI,CAAC,MAAM,GAAG,oCAAkB,EAAE,CAAC;;KACnC;IAED,SAAS,CAAC,MAAc;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAIM,GAAG,CAAY,GAA0B;QAC/C,IAAI,CAAC,IAAI,CAAC,MAAM;YACf,OAAO,GAAG,CAAC,YAAY,CAAC;QAEzB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAES,MAAM,CAAY,GAA0B;QACrD,IAAI,CAAC,IAAI,CAAC,MAAM;YACf,OAAO,KAAK,CAAC;QAEd,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAEM,GAAG,CAAY,GAA0B,EAAE,KAAgB;QACjE,IAAI,CAAC,IAAI,CAAC,MAAM;YACf,OAAO;QAER,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,KAAK;QACJ,EAAE;IACH,CAAC;;AAvNF,wBAwNC;AAtNe,iBAAU,GAAa,EAAE,CAAC"}
|
package/core/Action_Http.js
CHANGED
|
@@ -1,21 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
* Testelot is a typescript scenario composing framework
|
|
4
|
-
*
|
|
5
|
-
* Copyright (C) 2020 Intuition Robotics
|
|
6
|
-
*
|
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
8
|
-
* you may not use this file except in compliance with the License.
|
|
9
|
-
* You may obtain a copy of the License at
|
|
10
|
-
*
|
|
11
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
-
*
|
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
-
* See the License for the specific language governing permissions and
|
|
17
|
-
* limitations under the License.
|
|
18
|
-
*/
|
|
19
2
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
20
3
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
21
4
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -27,12 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
10
|
};
|
|
28
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
12
|
exports.Action_Http = exports.HttpMethod = void 0;
|
|
30
|
-
/**
|
|
31
|
-
* Created by IR on 3/18/17.
|
|
32
|
-
*/
|
|
33
|
-
const ts_common_1 = require("@intuitionrobotics/ts-common");
|
|
34
13
|
const Action_1 = require("./Action");
|
|
35
14
|
const fetch = require("node-fetch");
|
|
15
|
+
const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
|
|
16
|
+
const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
|
|
36
17
|
var HttpMethod;
|
|
37
18
|
(function (HttpMethod) {
|
|
38
19
|
HttpMethod["ALL"] = "all";
|
|
@@ -149,17 +130,17 @@ class Action_Http extends Action_1.Action {
|
|
|
149
130
|
// @ts-ignore
|
|
150
131
|
let match;
|
|
151
132
|
switch (contentType) {
|
|
152
|
-
case (match =
|
|
133
|
+
case (match = tools_1.regexpCase(contentType, ".*application/json.*")).input:
|
|
153
134
|
return yield response.json();
|
|
154
|
-
case (match =
|
|
135
|
+
case (match = tools_1.regexpCase(contentType, ".*application/x-www-form-urlencoded.*")).input:
|
|
155
136
|
return decodeURI((yield response.text()));
|
|
156
|
-
case (match =
|
|
137
|
+
case (match = tools_1.regexpCase(contentType, "^text\\/.*")).input:
|
|
157
138
|
return yield response.text();
|
|
158
139
|
default:
|
|
159
140
|
if (Action_Http.global_resolveResponseBody)
|
|
160
141
|
return Action_Http.global_resolveResponseBody(this, response);
|
|
161
142
|
}
|
|
162
|
-
throw new
|
|
143
|
+
throw new exceptions_1.ImplementationMissingException(`unhandled response with content-type: ${contentType}`);
|
|
163
144
|
});
|
|
164
145
|
}
|
|
165
146
|
executeHttpRequest(requestBody) {
|
|
@@ -176,7 +157,7 @@ class Action_Http extends Action_1.Action {
|
|
|
176
157
|
}
|
|
177
158
|
this.logError(`Got Response code: ${status}`);
|
|
178
159
|
this.logError(`Got Response body: ${_responseBody}`);
|
|
179
|
-
throw new
|
|
160
|
+
throw new exceptions_1.Exception(`wrong status code from server. Expected: ${expectedStatus} received: ${status}`);
|
|
180
161
|
}
|
|
181
162
|
// we don't want to undefine what was already defined just because we failed...
|
|
182
163
|
if (status !== 200 && this.writeKey)
|
package/core/Action_Http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Action_Http.js","sourceRoot":"","sources":["../../src/main/core/Action_Http.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Action_Http.js","sourceRoot":"","sources":["../../src/main/core/Action_Http.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgC;AAChC,oCAAmC;AACnC,oEAAoE;AACpE,6EAAuG;AAEvG,IAAY,UASX;AATD,WAAY,UAAU;IAClB,yBAAW,CAAA;IACX,2BAAa,CAAA;IACb,yBAAW,CAAA;IACX,6BAAe,CAAA;IACf,+BAAiB,CAAA;IACjB,yBAAW,CAAA;IACX,iCAAmB,CAAA;IACnB,2BAAa,CAAA;AACjB,CAAC,EATW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QASrB;AAED,MAAa,WACT,SAAQ,eAAM;IAed,YAAsB,MAAkB;QACpC,KAAK,CAAC,WAAW,CAAC,CAAC;QAdN,YAAO,GAAkE,EAAE,CAAC;QAGrF,WAAM,GAAQ,EAAE,CAAC;QAKjB,mBAAc,GAAW,GAAG,CAAC;QAOjC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAEM,MAAM,CAAC,GAA+C;QACzD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,OAAO,IAAI,CAAC;IAChB,CAAC;IAAA,CAAC;IAEK,OAAO,CAAC,IAAwD;QACnE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,OAAO,IAAI,CAAC;IAChB,CAAC;IAAA,CAAC;IAEK,SAAS,CAAC,MAAc;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,OAAO,IAAI,CAAC;IAChB,CAAC;IAAA,CAAC;IAEK,SAAS,CAAC,GAAW,EAAE,KAAiD;QAC3E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QAC1B,OAAO,IAAI,CAAC;IAChB,CAAC;IAAA,CAAC;IAEK,iBAAiB,CAAC,MAAc;QACnC,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC;QAC7B,OAAO,IAAI,CAAC;IAChB,CAAC;IAEM,oBAAoB,CAAC,SAAmC;QAC3D,IAAI,CAAC,iBAAiB,GAAG,SAAS,CAAC;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,WAAW;QACf,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,UAAU;YAC/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEhC,IAAI,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ;YAC7B,OAAO,IAAI,CAAC,IAAI,CAAC;QAErB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAC7C,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;QAEnD,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC9C,CAAC;IAEO,UAAU;QACd,IAAI,OAAO,IAAI,CAAC,GAAG,KAAK,UAAU;YAC9B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAE9B,OAAO,IAAI,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;IAC9C,CAAC;IAGO,WAAW;QACf,IAAI,CAAC,IAAI,CAAC,MAAM;YACZ,OAAO,EAAE,CAAC;QAEd,IAAI,OAAO,IAAI,CAAC,MAAM,KAAK,UAAU;YACjC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAEhC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC;YACrC,OAAO,EAAE,CAAC;QAEd,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC5C,OAAO,GAAG,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;QACxC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACnB,CAAC;IAEe,OAAO;;YACnB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,MAAM,OAAO,GAA8B,EAAE,CAAC;YAC9C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;gBACzC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;iBAC9B;;oBACG,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aAC5B;YAED,MAAM,WAAW,GAAsB;gBACnC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;gBAC5C,IAAI,EAAE,IAAI;gBACV,MAAM,EAAE,IAAI,CAAC,MAAM;aACtB,CAAC;YAEF,IAAI,CAAC,OAAO,CAAC,iBAAiB,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;YACpD,IAAI,CAAC,OAAO,CAAC,iBAAiB,GAAG,EAAE,CAAC,CAAC;YAErC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjC,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC;gBAC7C,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;oBACpC,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBAChD;gBACD,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC;aAChD;YAED,IAAI,WAAW,CAAC,IAAI,EAAE;gBAClB,IAAI,CAAC,UAAU,CAAC,mCAAmC,CAAC,CAAC;gBACrD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACtB,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC;aAChD;YAED,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAA;QACrD,CAAC;KAAA;IAAA,CAAC;IAEY,mBAAmB,CAAC,QAAwB;;YACtD,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;YACzD,IAAI,CAAC,WAAW;gBACZ,OAAO;YAEX,aAAa;YACb,IAAI,KAAK,CAAC;YACV,QAAQ,WAAW,EAAE;gBACjB,KAAK,CAAC,KAAK,GAAG,kBAAU,CAAC,WAAW,EAAE,sBAAsB,CAAC,CAAC,CAAC,KAAK;oBAChE,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAEjC,KAAK,CAAC,KAAK,GAAG,kBAAU,CAAC,WAAW,EAAE,uCAAuC,CAAC,CAAC,CAAC,KAAK;oBACjF,OAAO,SAAS,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAE9C,KAAK,CAAC,KAAK,GAAG,kBAAU,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK;oBACtD,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAEjC;oBACI,IAAI,WAAW,CAAC,0BAA0B;wBACtC,OAAO,WAAW,CAAC,0BAA0B,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aACzE;YAED,MAAM,IAAI,2CAA8B,CAAC,yCAAyC,WAAW,EAAE,CAAC,CAAC;QACrG,CAAC;KAAA;IAEa,kBAAkB,CAAC,WAA8B;;YAC3D,MAAM,QAAQ,GAAmB,MAAM,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,WAAW,CAAC,CAAC;YAErF,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC/B,IAAI,aAAa,GAAW,EAAE,CAAC;YAC/B,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;YAC3C,IAAI,MAAM,KAAK,cAAc,IAAI,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,EAAE;gBAC5D,IAAI;oBACA,aAAa,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;iBACzC;gBAAC,OAAO,MAAM,EAAE;iBAChB;gBAED,IAAI,CAAC,QAAQ,CAAC,sBAAsB,MAAM,EAAE,CAAC,CAAC;gBAC9C,IAAI,CAAC,QAAQ,CAAC,sBAAsB,aAAa,EAAE,CAAC,CAAC;gBAErD,MAAM,IAAI,sBAAS,CAAC,4CAA4C,cAAc,iBAAiB,MAAM,EAAE,CAAC,CAAC;aAC5G;YAED,+EAA+E;YAC/E,IAAI,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,QAAQ;gBAC/B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE5B,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YAC5D,IAAI,IAAI,CAAC,iBAAiB;gBACtB,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;YAExD,IAAI,YAAY,EAAE;gBACd,IAAI,CAAC,UAAU,CAAC,+BAA+B,CAAC,CAAC;gBACjD,IAAI,CAAC,UAAU,CAAC,OAAO,YAAY,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;gBACzG,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC;aAChD;YAED,OAAO,YAAY,CAAC;QACxB,CAAC;KAAA;CACJ;AAxLD,kCAwLC"}
|
package/core/Action_Log.d.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Created by IR on 3/18/17.
|
|
3
3
|
*/
|
|
4
4
|
import { Action } from "./Action";
|
|
5
|
-
import { LogLevel } from "@intuitionrobotics/ts-common";
|
|
5
|
+
import { LogLevel } from "@intuitionrobotics/ts-common/core/logger/types";
|
|
6
6
|
export declare class Action_Log extends Action {
|
|
7
7
|
private readonly logMessage;
|
|
8
8
|
private readonly level;
|
package/core/Action_Sleep.js
CHANGED
|
@@ -31,7 +31,7 @@ exports.Action_Sleep = void 0;
|
|
|
31
31
|
* Created by IR on 3/18/17.
|
|
32
32
|
*/
|
|
33
33
|
const Action_1 = require("./Action");
|
|
34
|
-
const
|
|
34
|
+
const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
|
|
35
35
|
class Action_Sleep extends Action_1.Action {
|
|
36
36
|
constructor(sleepMs) {
|
|
37
37
|
super(Action_Sleep);
|
|
@@ -40,7 +40,7 @@ class Action_Sleep extends Action_1.Action {
|
|
|
40
40
|
}
|
|
41
41
|
execute() {
|
|
42
42
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
-
return
|
|
43
|
+
return date_time_tools_1.timeout(this.sleepMs);
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
}
|
package/core/Action_Sleep.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Action_Sleep.js","sourceRoot":"","sources":["../../src/main/core/Action_Sleep.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"Action_Sleep.js","sourceRoot":"","sources":["../../src/main/core/Action_Sleep.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAAgC;AAChC,wFAA2E;AAG3E,MAAa,YACZ,SAAQ,eAAM;IAGd,YAAsB,OAAe;QACpC,KAAK,CAAC,YAAY,CAAC,CAAC;QACpB,IAAI,CAAC,QAAQ,CAAC,gBAAgB,OAAO,KAAK,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAEe,OAAO;;YACtB,OAAO,yBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;KAAA;CACD;AAbD,oCAaC"}
|
|
@@ -31,7 +31,7 @@ exports.Action_ThrowException = void 0;
|
|
|
31
31
|
* Created by IR on 3/18/17.
|
|
32
32
|
*/
|
|
33
33
|
const Action_1 = require("./Action");
|
|
34
|
-
const
|
|
34
|
+
const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
|
|
35
35
|
class Action_ThrowException extends Action_1.Action {
|
|
36
36
|
constructor(message, tag) {
|
|
37
37
|
super(Action_ThrowException, tag);
|
|
@@ -39,7 +39,7 @@ class Action_ThrowException extends Action_1.Action {
|
|
|
39
39
|
}
|
|
40
40
|
execute() {
|
|
41
41
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
-
throw new
|
|
42
|
+
throw new exceptions_1.Exception(this.message);
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Action_ThrowException.js","sourceRoot":"","sources":["../../src/main/core/Action_ThrowException.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"Action_ThrowException.js","sourceRoot":"","sources":["../../src/main/core/Action_ThrowException.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAAgC;AAChC,6EAAuE;AAGvE,MAAa,qBACZ,SAAQ,eAAM;IAGd,YAAsB,OAAe,EAAE,GAAY;QAClD,KAAK,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAEe,OAAO;;YACtB,MAAM,IAAI,sBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;KAAA;CACD;AAZD,sDAYC"}
|
package/core/Reporter.d.ts
CHANGED
package/core/Reporter.js
CHANGED
|
@@ -1,25 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
* Testelot is a typescript scenario composing framework
|
|
4
|
-
*
|
|
5
|
-
* Copyright (C) 2020 Intuition Robotics
|
|
6
|
-
*
|
|
7
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
8
|
-
* you may not use this file except in compliance with the License.
|
|
9
|
-
* You may obtain a copy of the License at
|
|
10
|
-
*
|
|
11
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
-
*
|
|
13
|
-
* Unless required by applicable law or agreed to in writing, software
|
|
14
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
15
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
16
|
-
* See the License for the specific language governing permissions and
|
|
17
|
-
* limitations under the License.
|
|
18
|
-
*/
|
|
19
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
3
|
exports.ActionReport = exports.Reporter = void 0;
|
|
21
4
|
const Action_1 = require("./Action");
|
|
22
|
-
const
|
|
5
|
+
const BeLogged_1 = require("@intuitionrobotics/ts-common/core/logger/BeLogged");
|
|
6
|
+
const utils_1 = require("@intuitionrobotics/ts-common/core/logger/utils");
|
|
7
|
+
const Logger_1 = require("@intuitionrobotics/ts-common/core/logger/Logger");
|
|
8
|
+
const LogClient_Terminal_1 = require("@intuitionrobotics/ts-common/core/logger/LogClient_Terminal");
|
|
9
|
+
const LogClient_1 = require("@intuitionrobotics/ts-common/core/logger/LogClient");
|
|
23
10
|
class ReportSummary {
|
|
24
11
|
constructor() {
|
|
25
12
|
this.Running = 0;
|
|
@@ -28,13 +15,13 @@ class ReportSummary {
|
|
|
28
15
|
this.Error = 0;
|
|
29
16
|
}
|
|
30
17
|
}
|
|
31
|
-
class Reporter extends
|
|
18
|
+
class Reporter extends Logger_1.Logger {
|
|
32
19
|
constructor() {
|
|
33
20
|
super("Testelot");
|
|
34
21
|
this.reports = {};
|
|
35
22
|
this.summary = new ReportSummary();
|
|
36
23
|
this.reporter = new ReporterLogClient(this);
|
|
37
|
-
|
|
24
|
+
BeLogged_1.BeLogged.addClient(this.reporter);
|
|
38
25
|
}
|
|
39
26
|
init() {
|
|
40
27
|
}
|
|
@@ -86,26 +73,26 @@ function pad(value, length) {
|
|
|
86
73
|
}
|
|
87
74
|
return s;
|
|
88
75
|
}
|
|
89
|
-
class ReporterLogClient extends
|
|
76
|
+
class ReporterLogClient extends LogClient_1.LogClient {
|
|
90
77
|
constructor(report) {
|
|
91
78
|
super();
|
|
92
79
|
this.indent = "";
|
|
93
80
|
this.composer = (tag, level) => {
|
|
94
|
-
const successPart = `\x1b[32m${pad(this.report.summary.Success, 3)}${
|
|
95
|
-
const skippedPart = `\x1b[90m\x1b[1m${pad(this.report.summary.Skipped, 3)}${
|
|
96
|
-
const errorPart = `\x1b[31m${pad(this.report.summary.Error, 3)}${
|
|
81
|
+
const successPart = `\x1b[32m${pad(this.report.summary.Success, 3)}${LogClient_Terminal_1.NoColor}`;
|
|
82
|
+
const skippedPart = `\x1b[90m\x1b[1m${pad(this.report.summary.Skipped, 3)}${LogClient_Terminal_1.NoColor}`;
|
|
83
|
+
const errorPart = `\x1b[31m${pad(this.report.summary.Error, 3)}${LogClient_Terminal_1.NoColor}`;
|
|
97
84
|
const status = `${errorPart}/${skippedPart}/${successPart}`;
|
|
98
|
-
const defaultPrefix =
|
|
99
|
-
const color =
|
|
100
|
-
return ` ${defaultPrefix} ${
|
|
85
|
+
const defaultPrefix = LogClient_1.DefaultLogPrefixComposer("Testelot", level);
|
|
86
|
+
const color = LogClient_Terminal_1.LogClient_Terminal.getColor(level);
|
|
87
|
+
return ` ${defaultPrefix} ${LogClient_Terminal_1.NoColor}[${status}]:${color} ${this.indent}`;
|
|
101
88
|
};
|
|
102
89
|
this.report = report;
|
|
103
90
|
this.setComposer(this.composer);
|
|
104
91
|
}
|
|
105
92
|
logMessage(level, bold, prefix, toLog) {
|
|
106
|
-
const color =
|
|
107
|
-
const paramsAsStrings =
|
|
108
|
-
paramsAsStrings.forEach(str => console.log(
|
|
93
|
+
const color = LogClient_Terminal_1.LogClient_Terminal.getColor(level, bold);
|
|
94
|
+
const paramsAsStrings = utils_1._logger_convertLogParamsToStrings(toLog);
|
|
95
|
+
paramsAsStrings.forEach(str => console.log(utils_1._logger_indentNewLineBy(color + prefix, str), LogClient_Terminal_1.NoColor));
|
|
109
96
|
}
|
|
110
97
|
onContainerStarted() {
|
|
111
98
|
this.indent += ReporterLogClient.indent;
|
package/core/Reporter.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Reporter.js","sourceRoot":"","sources":["../../src/main/core/Reporter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Reporter.js","sourceRoot":"","sources":["../../src/main/core/Reporter.ts"],"names":[],"mappings":"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"}
|
package/core/TestException.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Created by IR on 3/18/17.
|
|
3
3
|
*/
|
|
4
|
-
import { CustomException } from "@intuitionrobotics/ts-common";
|
|
4
|
+
import { CustomException } from "@intuitionrobotics/ts-common/core/exceptions";
|
|
5
5
|
export declare class TestException extends CustomException {
|
|
6
6
|
constructor(message: string);
|
|
7
7
|
}
|
package/core/TestException.js
CHANGED
|
@@ -21,8 +21,8 @@ exports.TestException = void 0;
|
|
|
21
21
|
/**
|
|
22
22
|
* Created by IR on 3/18/17.
|
|
23
23
|
*/
|
|
24
|
-
const
|
|
25
|
-
class TestException extends
|
|
24
|
+
const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
|
|
25
|
+
class TestException extends exceptions_1.CustomException {
|
|
26
26
|
constructor(message) {
|
|
27
27
|
super(TestException, message);
|
|
28
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestException.js","sourceRoot":"","sources":["../../src/main/core/TestException.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"TestException.js","sourceRoot":"","sources":["../../src/main/core/TestException.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH;;GAEG;AACH,6EAA6E;AAG7E,MAAa,aACZ,SAAQ,4BAAe;IAEvB,YAAY,OAAe;QAC1B,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IAC9B,CAAC;CACD;AAND,sCAMC"}
|
package/core/_base_apis.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { LogLevel } from "@intuitionrobotics/ts-common";
|
|
1
|
+
import { LogLevel } from "@intuitionrobotics/ts-common/core/logger/types";
|
|
2
2
|
import { Action_Custom, Action_Http, Action_Log, Action_Sleep, Action_ThrowException, ContextKey, HttpMethod, Scenario } from "../index";
|
|
3
3
|
import { Reporter } from "./Reporter";
|
|
4
4
|
export declare function __log(logMessage: string, level?: LogLevel): Action_Log;
|
package/core/_base_apis.js
CHANGED
|
@@ -27,10 +27,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
27
27
|
};
|
|
28
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
29
|
exports._executeScenario = exports.enableTerminalLogReWrite = exports.__throwException = exports.__scenario = exports.__compareKeys = exports.__custom = exports.__http = exports.__sleep = exports.__log = void 0;
|
|
30
|
-
const
|
|
30
|
+
const types_1 = require("@intuitionrobotics/ts-common/core/logger/types");
|
|
31
|
+
const BeLogged_1 = require("@intuitionrobotics/ts-common/core/logger/BeLogged");
|
|
31
32
|
const index_1 = require("../index");
|
|
32
33
|
const objectHash = require("object-hash");
|
|
33
|
-
function __log(logMessage, level =
|
|
34
|
+
function __log(logMessage, level = types_1.LogLevel.Verbose) {
|
|
34
35
|
// @ts-ignore
|
|
35
36
|
return new index_1.Action_Log(logMessage, level);
|
|
36
37
|
}
|
|
@@ -73,7 +74,7 @@ function __throwException(message) {
|
|
|
73
74
|
}
|
|
74
75
|
exports.__throwException = __throwException;
|
|
75
76
|
function enableTerminalLogReWrite() {
|
|
76
|
-
|
|
77
|
+
BeLogged_1.BeLogged.rewriteConsole = (lineCount => {
|
|
77
78
|
let rewriteCommand = "";
|
|
78
79
|
for (let i = 0; i < lineCount; i++) {
|
|
79
80
|
rewriteCommand += "tput cuu1 tput el;";
|
package/core/_base_apis.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_base_apis.js","sourceRoot":"","sources":["../../src/main/core/_base_apis.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,
|
|
1
|
+
{"version":3,"file":"_base_apis.js","sourceRoot":"","sources":["../../src/main/core/_base_apis.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,0EAAwE;AACxE,gFAA2E;AAC3E,oCAUkB;AAGlB,0CAA0C;AAE1C,SAAgB,KAAK,CAAC,UAAkB,EAAE,QAAkB,gBAAQ,CAAC,OAAO;IACxE,aAAa;IACb,OAAO,IAAI,kBAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AAC7C,CAAC;AAHD,sBAGC;AAED,SAAgB,OAAO,CAAC,OAAe;IACnC,aAAa;IACb,OAAO,IAAI,oBAAY,CAAC,OAAO,CAAC,CAAC;AACrC,CAAC;AAHD,0BAGC;AAED,SAAgB,MAAM,CAAyB,MAAkB;IAC7D,aAAa;IACb,OAAO,IAAI,mBAAW,CAAI,MAAM,CAAC,CAAC;AACtC,CAAC;AAHD,wBAGC;AAED,SAAgB,QAAQ,CAA2C,MAAwD;IACvH,aAAa;IACb,OAAO,IAAI,qBAAa,CAAO,MAAM,CAAC,CAAC;AAC3C,CAAC;AAHD,4BAGC;AAED,SAAgB,aAAa,CAAsB,IAAmB,EAAE,IAAmB;IACvF,OAAO,QAAQ,CAAU,CAAO,MAAqB,EAAE,EAAE;QACrD,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7D,MAAM,IAAI,qBAAa,CAAC,gCAAgC,IAAI,CAAC,GAAG,UAAU,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IAC/F,CAAC,CAAA,CAAC,CAAC;AACP,CAAC;AALD,sCAKC;AAED,SAAgB,UAAU,CAAC,KAA8B,EAAE,QAAmB;IAC1E,aAAa;IACb,MAAM,QAAQ,GAAG,IAAI,gBAAQ,EAAE,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,IAAI,QAAQ,EAAE;QACV,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;KAClC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC;AATD,gCASC;AAED,SAAgB,gBAAgB,CAAC,OAAe;IAC5C,aAAa;IACb,OAAO,IAAI,6BAAqB,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC;AAHD,4CAGC;AAED,SAAgB,wBAAwB;IACpC,mBAAQ,CAAC,cAAc,GAAG,CAAC,SAAS,CAAC,EAAE;QACnC,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;YAChC,cAAc,IAAI,oBAAoB,CAAA;SACzC;QAED,IAAI;YACA,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC,CAAC;SACzE;QAAC,OAAO,CAAC,EAAE;SACX;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAZD,4DAYC;AAGD,SAAgB,gBAAgB,CAAC,QAAkB;IAC/C,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;SACpB,IAAI,CAAC,GAAG,EAAE;QACP,QAAQ,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;IACnE,CAAC,CAAC;SACD,KAAK,CAAC,MAAM,CAAC,EAAE;QACZ,QAAQ,CAAC,QAAQ,CAAC,0CAA0C,CAAC,CAAC;QAC9D,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;AAEX,CAAC;AAVD,4CAUC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@intuitionrobotics/testelot",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.44.1",
|
|
4
4
|
"description": "Nu-Art Sir Testelot",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"IR",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"build": "tsc"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@intuitionrobotics/ts-common": "~0.
|
|
32
|
+
"@intuitionrobotics/ts-common": "~0.44.0",
|
|
33
33
|
"node-fetch": "^2.3.0",
|
|
34
34
|
"object-hash": "^1.3.1"
|
|
35
35
|
},
|
package/test-app/AppTester.d.ts
CHANGED
package/test-app/AppTester.js
CHANGED
|
@@ -10,15 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.AppTester = void 0;
|
|
13
|
-
const
|
|
13
|
+
const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
|
|
14
|
+
const module_manager_1 = require("@intuitionrobotics/ts-common/core/module-manager");
|
|
14
15
|
const __1 = require("..");
|
|
15
|
-
class AppTester extends
|
|
16
|
+
class AppTester extends module_manager_1.ModuleManager {
|
|
16
17
|
constructor() {
|
|
17
18
|
super();
|
|
18
19
|
this.reporter = new __1.Reporter();
|
|
19
20
|
this.runTestsImpl = () => __awaiter(this, void 0, void 0, function* () {
|
|
20
21
|
if (!this.scenario)
|
|
21
|
-
throw new
|
|
22
|
+
throw new exceptions_1.ImplementationMissingException("No test specified!!");
|
|
22
23
|
this.prepare();
|
|
23
24
|
this.init();
|
|
24
25
|
this.reporter.init();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppTester.js","sourceRoot":"","sources":["../../src/main/test-app/AppTester.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"AppTester.js","sourceRoot":"","sources":["../../src/main/test-app/AppTester.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAA4F;AAC5F,qFAA+E;AAC/E,0BAA0D;AAE1D,MAAa,SACT,SAAQ,8BAAa;IAKrB;QACI,KAAK,EAAE,CAAC;QAHJ,aAAQ,GAAG,IAAI,YAAQ,EAAE,CAAC;QAqClC,iBAAY,GAAG,GAAS,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,QAAQ;gBACd,MAAM,IAAI,2CAA8B,CAAC,qBAAqB,CAAC,CAAC;YAEpE,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YACrB,UAAM,CAAC,iBAAiB,EAAE,CAAA;YAE1B,MAAM,QAAQ,GAAG,cAAU,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC5B,MAAM,QAAQ,CAAC,GAAG,EAAE,CAAC;QACzB,CAAC,CAAA,CAAC;IA7CF,CAAC;IAED,WAAW,CAAC,QAAkB;QAC1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK;QACD,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;QAC5B,IAAI,WAAmB,CAAC;QACxB,IAAI,GAAG;YACH,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAE1D,IAAI,CAAC,YAAY,EAAE;aACd,IAAI,CAAC,GAAG,EAAE;YACP,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC/C,IAAI,UAAU,GAAG,CAAC,EAAE;gBAChB,IAAI,CAAC,QAAQ,CAAC,YAAY,WAAW,uBAAuB,UAAU,IAAI,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACnH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACnB;YAED,IAAI,CAAC,OAAO,CAAC,YAAY,WAAW,iCAAiC,CAAC,CAAA;YACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,EAAE;YACZ,IAAI,CAAC,QAAQ,CAAC,YAAY,WAAW,iBAAiB,EAAE,MAAM,CAAC,CAAC;YAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACX,CAAC;IAED,OAAO;IACP,CAAC;CAeJ;AAtDD,8BAsDC"}
|