@intuitionrobotics/testelot 0.45.0 → 0.45.3

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.
Files changed (41) hide show
  1. package/core/Action.d.ts +4 -2
  2. package/core/Action.js +31 -16
  3. package/core/Action.js.map +1 -1
  4. package/core/Action_Container.d.ts +3 -0
  5. package/core/Action_Container.js +20 -0
  6. package/core/Action_Container.js.map +1 -1
  7. package/core/Action_Custom.d.ts +3 -0
  8. package/core/Action_Custom.js +20 -0
  9. package/core/Action_Custom.js.map +1 -1
  10. package/core/Action_Http.js +26 -7
  11. package/core/Action_Http.js.map +1 -1
  12. package/core/Action_Log.d.ts +4 -1
  13. package/core/Action_Log.js +20 -0
  14. package/core/Action_Log.js.map +1 -1
  15. package/core/Action_Sleep.d.ts +3 -0
  16. package/core/Action_Sleep.js +22 -2
  17. package/core/Action_Sleep.js.map +1 -1
  18. package/core/Action_ThrowException.d.ts +3 -0
  19. package/core/Action_ThrowException.js +22 -2
  20. package/core/Action_ThrowException.js.map +1 -1
  21. package/core/ContainerContext.d.ts +3 -0
  22. package/core/ContainerContext.js +20 -0
  23. package/core/ContainerContext.js.map +1 -1
  24. package/core/Reporter.d.ts +1 -1
  25. package/core/Reporter.js +30 -17
  26. package/core/Reporter.js.map +1 -1
  27. package/core/Scenario.d.ts +3 -0
  28. package/core/Scenario.js +20 -0
  29. package/core/Scenario.js.map +1 -1
  30. package/core/TestException.d.ts +4 -1
  31. package/core/TestException.js +22 -2
  32. package/core/TestException.js.map +1 -1
  33. package/core/_base_apis.d.ts +1 -1
  34. package/core/_base_apis.js +20 -4
  35. package/core/_base_apis.js.map +1 -1
  36. package/index.js +17 -0
  37. package/index.js.map +1 -1
  38. package/package.json +1 -1
  39. package/test-app/AppTester.d.ts +1 -1
  40. package/test-app/AppTester.js +3 -4
  41. package/test-app/AppTester.js.map +1 -1
package/core/Action.d.ts CHANGED
@@ -1,5 +1,7 @@
1
- import { Logger } from "@intuitionrobotics/ts-common/core/logger/Logger";
2
- import { Constructor } from "@intuitionrobotics/ts-common/utils/types";
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
4
+ import { Logger, Constructor } from "@intuitionrobotics/ts-common";
3
5
  import { ContextKey } from "./ContainerContext";
4
6
  import { Reporter } from "./Reporter";
5
7
  export declare enum Status {
package/core/Action.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,12 +27,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  exports.Action = exports.Status = void 0;
13
- const Logger_1 = require("@intuitionrobotics/ts-common/core/logger/Logger");
14
- const random_tools_1 = require("@intuitionrobotics/ts-common/utils/random-tools");
15
- const tools_1 = require("@intuitionrobotics/ts-common/utils/tools");
16
- const types_1 = require("@intuitionrobotics/ts-common/utils/types");
17
- const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
18
- const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
30
+ /**
31
+ * Created by IR on 3/18/17.
32
+ */
33
+ const ts_common_1 = require("@intuitionrobotics/ts-common");
19
34
  const TestException_1 = require("./TestException");
20
35
  var Status;
21
36
  (function (Status) {
@@ -25,10 +40,10 @@ var Status;
25
40
  Status["Success"] = "Success";
26
41
  Status["Error"] = "Error";
27
42
  })(Status = exports.Status || (exports.Status = {}));
28
- class Action extends Logger_1.Logger {
43
+ class Action extends ts_common_1.Logger {
29
44
  constructor(actionType, tag) {
30
45
  super(tag || "Testelot");
31
- this.uuid = random_tools_1.generateUUID();
46
+ this.uuid = ts_common_1.generateUUID();
32
47
  this.label = "Unnamed Action";
33
48
  this.policy = 1 /* SkipOnError */;
34
49
  this.postExecutionDelay = 0;
@@ -37,13 +52,13 @@ class Action extends Logger_1.Logger {
37
52
  }
38
53
  static resolveTestsToRun() {
39
54
  const strings = process.argv.filter((arg) => arg.includes("--test="));
40
- console.log(`raw: ${tools_1.__stringify(strings)}`);
55
+ console.log(`raw: ${ts_common_1.__stringify(strings)}`);
41
56
  this.testsToRun = strings.map(arg => arg.replace("--test=", ""));
42
- console.log(`Tests to run: ${tools_1.__stringify(this.testsToRun)}`);
57
+ console.log(`Tests to run: ${ts_common_1.__stringify(this.testsToRun)}`);
43
58
  }
44
59
  expectToFail(_exceptionType, assertFailCondition) {
45
60
  this.shouldFailCondition = (e) => {
46
- const err = exceptions_1.isErrorOfType(e, _exceptionType);
61
+ const err = ts_common_1.isErrorOfType(e, _exceptionType);
47
62
  if (!err)
48
63
  throw new TestException_1.TestException(`Test should have failed with an: ${_exceptionType.name}`);
49
64
  return !assertFailCondition ? true : assertFailCondition(err);
@@ -107,7 +122,7 @@ class Action extends Logger_1.Logger {
107
122
  _execute() {
108
123
  var _a, _b;
109
124
  return __awaiter(this, void 0, void 0, function* () {
110
- this._started = date_time_tools_1.currentTimeMillies();
125
+ this._started = ts_common_1.currentTimeMillies();
111
126
  let label;
112
127
  let err;
113
128
  let retValue = undefined;
@@ -126,7 +141,7 @@ class Action extends Logger_1.Logger {
126
141
  yield this.execute();
127
142
  label && this.reporter.logVerbose(`skipped: ${label}`);
128
143
  this.reporter.onActionEnded(this);
129
- this._ended = date_time_tools_1.currentTimeMillies();
144
+ this._ended = ts_common_1.currentTimeMillies();
130
145
  return;
131
146
  }
132
147
  if (this.isContainer())
@@ -138,7 +153,7 @@ class Action extends Logger_1.Logger {
138
153
  }
139
154
  this.reporter.onActionStarted(this);
140
155
  this.setStatus(Status.Running);
141
- retValue = yield this.execute((param || types_1.Void));
156
+ retValue = yield this.execute((param || ts_common_1.Void));
142
157
  }
143
158
  catch (e) {
144
159
  err = ((_a = this.shouldFailCondition) === null || _a === void 0 ? void 0 : _a.call(this, e)) ? undefined : e;
@@ -164,8 +179,8 @@ class Action extends Logger_1.Logger {
164
179
  }
165
180
  }
166
181
  if (this.postExecutionDelay > 0)
167
- yield date_time_tools_1.timeout(this.postExecutionDelay);
168
- this._ended = date_time_tools_1.currentTimeMillies();
182
+ yield ts_common_1.timeout(this.postExecutionDelay);
183
+ this._ended = ts_common_1.currentTimeMillies();
169
184
  });
170
185
  }
171
186
  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":"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"}
1
+ {"version":3,"file":"Action.js","sourceRoot":"","sources":["../../src/main/core/Action.ts"],"names":[],"mappings":"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"}
package/core/Action_Container.d.ts CHANGED
@@ -1,3 +1,6 @@
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
1
4
  import { Action } from "./Action";
2
5
  import { ContextKey, TypedHashMap } from "./ContainerContext";
3
6
  export declare abstract class Action_Container extends Action {
package/core/Action_Container.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,6 +27,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  exports.Action_Container = void 0;
30
+ /**
31
+ * Created by IR on 3/18/17.
32
+ */
13
33
  const Action_1 = require("./Action");
14
34
  const ContainerContext_1 = require("./ContainerContext");
15
35
  class Action_Container extends Action_1.Action {
package/core/Action_Container.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Action_Container.js","sourceRoot":"","sources":["../../src/main/core/Action_Container.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Action_Container.js","sourceRoot":"","sources":["../../src/main/core/Action_Container.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAIkB;AAElB,yDAG4B;AAE5B,MAAsB,gBACrB,SAAQ,eAAM;IAOd,YAAsB,IAAc,EAAE,GAAY;QACjD,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QANR,YAAO,GAAiB,IAAI,+BAAY,EAAE,CAAC;QAEpC,YAAO,GAAkB,EAAE,CAAC;QACrC,YAAO,GAAY,KAAK,CAAC;IAIjC,CAAC;IAED,WAAW;QACV,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,GAAG,CAAC,GAAG,KAAoB;QACjC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,QAAQ,CAAC,OAAgB;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,OAAO,IAAI,CAAC;IACb,CAAC;IAEM,GAAG,CAAY,GAA0B;QAC/C,IAAI,IAAI,CAAC,OAAO;YACf,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEvB,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,KAAK;YACR,OAAO,KAAK,CAAC;QAEd,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAES,MAAM,CAAY,GAA0B;QACrD,IAAI,IAAI,CAAC,OAAO;YACf,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAE1B,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,KAAK;YACR,OAAO,KAAK,CAAC;QAEd,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IAEM,GAAG,CAAY,GAA0B,EAAE,KAAgB;QACjE,IAAI,IAAI,CAAC,OAAO;YACf,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAE9B,IAAI,CAAC,QAAQ,CAAC,cAAc,GAAG,CAAC,GAAG,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC7B,OAAO,SAAS,CAAC;IAClB,CAAC;IAES,QAAQ;QACjB,OAAO,IAAI,CAAC,OAAO,CAAC;IACrB,CAAC;IAEM,KAAK;QACX,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACrB,KAAK,CAAC,KAAK,EAAE,CAAC;QAEd,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAEe,OAAO;;YACtB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;gBAClC,IAAI,IAAI,CAAC,MAAM,KAAK,eAAM,CAAC,OAAO;oBACjC,MAAM,CAAC,SAAS,CAAC,eAAM,CAAC,OAAO,CAAC,CAAC;gBAElC,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;gBACrC,IAAI,MAAM,CAAC,MAAM,KAAK,eAAM,CAAC,KAAK;oBACjC,SAAS;gBAEV,8CAA8C;gBAC9C,QAAQ,MAAM,CAAC,MAAM,EAAE;oBACtB;wBACC,SAAS;oBAEV;wBACC,IAAI,CAAC,cAAc,qBAAyB,CAAC;wBAC7C,IAAI,CAAC,SAAS,CAAC,eAAM,CAAC,KAAK,CAAC,CAAC;oBAE9B;wBACC,IAAI,CAAC,SAAS,CAAC,eAAM,CAAC,OAAO,CAAC,CAAC;wBAC/B,MAAM;iBACP;aACD;QACF,CAAC;KAAA;IAEM,OAAO;QACb,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,CAAC;IAClD,CAAC;CACD;AAjGD,4CAiGC"}
package/core/Action_Custom.d.ts CHANGED
@@ -1,3 +1,6 @@
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
1
4
  import { Action } from "./Action";
2
5
  export declare class Action_Custom<ParamValue extends any = any, ReturnValue extends any = any> extends Action<ParamValue, ReturnValue> {
3
6
  private readonly action;
package/core/Action_Custom.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,6 +27,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  exports.Action_Custom = void 0;
30
+ /**
31
+ * Created by IR on 3/18/17.
32
+ */
13
33
  const Action_1 = require("./Action");
14
34
  class Action_Custom extends Action_1.Action {
15
35
  constructor(action) {
package/core/Action_Custom.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Action_Custom.js","sourceRoot":"","sources":["../../src/main/core/Action_Custom.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgC;AAEhC,MAAa,aACZ,SAAQ,eAA+B;IAGvC,YAAsB,MAA0E;QAC/F,KAAK,CAAC,aAAa,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAEe,OAAO,CAAC,KAAiB;;YACxC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AAZD,sCAYC"}
1
+ {"version":3,"file":"Action_Custom.js","sourceRoot":"","sources":["../../src/main/core/Action_Custom.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAAgC;AAEhC,MAAa,aACZ,SAAQ,eAA+B;IAGvC,YAAsB,MAA0E;QAC/F,KAAK,CAAC,aAAa,CAAC,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACtB,CAAC;IAEe,OAAO,CAAC,KAAiB;;YACxC,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvC,CAAC;KAAA;CACD;AAZD,sCAYC"}
package/core/Action_Http.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,10 +27,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  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");
13
34
  const Action_1 = require("./Action");
14
35
  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");
17
36
  var HttpMethod;
18
37
  (function (HttpMethod) {
19
38
  HttpMethod["ALL"] = "all";
@@ -130,17 +149,17 @@ class Action_Http extends Action_1.Action {
130
149
  // @ts-ignore
131
150
  let match;
132
151
  switch (contentType) {
133
- case (match = tools_1.regexpCase(contentType, ".*application/json.*")).input:
152
+ case (match = ts_common_1.regexpCase(contentType, ".*application/json.*")).input:
134
153
  return yield response.json();
135
- case (match = tools_1.regexpCase(contentType, ".*application/x-www-form-urlencoded.*")).input:
154
+ case (match = ts_common_1.regexpCase(contentType, ".*application/x-www-form-urlencoded.*")).input:
136
155
  return decodeURI((yield response.text()));
137
- case (match = tools_1.regexpCase(contentType, "^text\\/.*")).input:
156
+ case (match = ts_common_1.regexpCase(contentType, "^text\\/.*")).input:
138
157
  return yield response.text();
139
158
  default:
140
159
  if (Action_Http.global_resolveResponseBody)
141
160
  return Action_Http.global_resolveResponseBody(this, response);
142
161
  }
143
- throw new exceptions_1.ImplementationMissingException(`unhandled response with content-type: ${contentType}`);
162
+ throw new ts_common_1.ImplementationMissingException(`unhandled response with content-type: ${contentType}`);
144
163
  });
145
164
  }
146
165
  executeHttpRequest(requestBody) {
@@ -157,7 +176,7 @@ class Action_Http extends Action_1.Action {
157
176
  }
158
177
  this.logError(`Got Response code: ${status}`);
159
178
  this.logError(`Got Response body: ${_responseBody}`);
160
- throw new exceptions_1.Exception(`wrong status code from server. Expected: ${expectedStatus} received: ${status}`);
179
+ throw new ts_common_1.Exception(`wrong status code from server. Expected: ${expectedStatus} received: ${status}`);
161
180
  }
162
181
  // we don't want to undefine what was already defined just because we failed...
163
182
  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":"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"}
1
+ {"version":3,"file":"Action_Http.js","sourceRoot":"","sources":["../../src/main/core/Action_Http.ts"],"names":[],"mappings":"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"}
package/core/Action_Log.d.ts CHANGED
@@ -1,5 +1,8 @@
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
1
4
  import { Action } from "./Action";
2
- import { LogLevel } from "@intuitionrobotics/ts-common/core/logger/types";
5
+ import { LogLevel } from "@intuitionrobotics/ts-common";
3
6
  export declare class Action_Log extends Action {
4
7
  private readonly logMessage;
5
8
  private readonly level;
package/core/Action_Log.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,6 +27,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  exports.Action_Log = void 0;
30
+ /**
31
+ * Created by IR on 3/18/17.
32
+ */
13
33
  const Action_1 = require("./Action");
14
34
  class Action_Log extends Action_1.Action {
15
35
  constructor(logMessage, level) {
package/core/Action_Log.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Action_Log.js","sourceRoot":"","sources":["../../src/main/core/Action_Log.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgC;AAIhC,MAAa,UACZ,SAAQ,eAAM;IAId,YAAsB,UAAkB,EAAE,KAAe;QACxD,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAEe,OAAO;;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAChD,CAAC;KAAA;CACD;AAfD,gCAeC"}
1
+ {"version":3,"file":"Action_Log.js","sourceRoot":"","sources":["../../src/main/core/Action_Log.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAAgC;AAIhC,MAAa,UACZ,SAAQ,eAAM;IAId,YAAsB,UAAkB,EAAE,KAAe;QACxD,KAAK,CAAC,UAAU,CAAC,CAAC;QAClB,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACpB,CAAC;IAEe,OAAO;;YACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QAChD,CAAC;KAAA;CACD;AAfD,gCAeC"}
package/core/Action_Sleep.d.ts CHANGED
@@ -1,3 +1,6 @@
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
1
4
  import { Action } from "./Action";
2
5
  export declare class Action_Sleep extends Action {
3
6
  private readonly sleepMs;
package/core/Action_Sleep.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,8 +27,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  exports.Action_Sleep = void 0;
30
+ /**
31
+ * Created by IR on 3/18/17.
32
+ */
13
33
  const Action_1 = require("./Action");
14
- const date_time_tools_1 = require("@intuitionrobotics/ts-common/utils/date-time-tools");
34
+ const ts_common_1 = require("@intuitionrobotics/ts-common");
15
35
  class Action_Sleep extends Action_1.Action {
16
36
  constructor(sleepMs) {
17
37
  super(Action_Sleep);
@@ -20,7 +40,7 @@ class Action_Sleep extends Action_1.Action {
20
40
  }
21
41
  execute() {
22
42
  return __awaiter(this, void 0, void 0, function* () {
23
- return date_time_tools_1.timeout(this.sleepMs);
43
+ return ts_common_1.timeout(this.sleepMs);
24
44
  });
25
45
  }
26
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,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"}
1
+ {"version":3,"file":"Action_Sleep.js","sourceRoot":"","sources":["../../src/main/core/Action_Sleep.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAAgC;AAChC,4DAAqD;AAGrD,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,mBAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;KAAA;CACD;AAbD,oCAaC"}
package/core/Action_ThrowException.d.ts CHANGED
@@ -1,3 +1,6 @@
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
1
4
  import { Action } from "./Action";
2
5
  export declare class Action_ThrowException extends Action {
3
6
  private readonly message;
package/core/Action_ThrowException.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,8 +27,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  exports.Action_ThrowException = void 0;
30
+ /**
31
+ * Created by IR on 3/18/17.
32
+ */
13
33
  const Action_1 = require("./Action");
14
- const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
34
+ const ts_common_1 = require("@intuitionrobotics/ts-common");
15
35
  class Action_ThrowException extends Action_1.Action {
16
36
  constructor(message, tag) {
17
37
  super(Action_ThrowException, tag);
@@ -19,7 +39,7 @@ class Action_ThrowException extends Action_1.Action {
19
39
  }
20
40
  execute() {
21
41
  return __awaiter(this, void 0, void 0, function* () {
22
- throw new exceptions_1.Exception(this.message);
42
+ throw new ts_common_1.Exception(this.message);
23
43
  });
24
44
  }
25
45
  }
package/core/Action_ThrowException.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Action_ThrowException.js","sourceRoot":"","sources":["../../src/main/core/Action_ThrowException.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,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"}
1
+ {"version":3,"file":"Action_ThrowException.js","sourceRoot":"","sources":["../../src/main/core/Action_ThrowException.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,qCAAgC;AAChC,4DAAuD;AAGvD,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,qBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;KAAA;CACD;AAZD,sDAYC"}
package/core/ContainerContext.d.ts CHANGED
@@ -1,3 +1,6 @@
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
1
4
  export declare class ContextKey<T> {
2
5
  readonly key: string;
3
6
  defaultValue?: T;
package/core/ContainerContext.js CHANGED
@@ -1,6 +1,26 @@
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
+ */
2
19
  Object.defineProperty(exports, "__esModule", { value: true });
3
20
  exports.TypedHashMap = exports.ContextKey = void 0;
21
+ /**
22
+ * Created by IR on 3/18/17.
23
+ */
4
24
  class ContextKey {
5
25
  constructor(key, defaultValue) {
6
26
  this.key = key;
package/core/ContainerContext.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ContainerContext.js","sourceRoot":"","sources":["../../src/main/core/ContainerContext.ts"],"names":[],"mappings":";;;AACA,MAAa,UAAU;IAItB,YAAY,GAAW,EAAE,YAAgB;QACxC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IAClC,CAAC;CACD;AARD,gCAQC;AAED,MAAa,YAAY;IAAzB;QAES,QAAG,GAAqB,IAAI,GAAG,EAAe,CAAC;IAiBxD,CAAC;IAfA,MAAM,CAAC,GAAoB;QAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAY,GAA0B;QACxC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAc,CAAC;IAC3C,CAAC;IAED,GAAG,CAAY,GAA0B,EAAE,KAAgB;QAC1D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IAEA,KAAK;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;CACD;AAnBD,oCAmBC"}
1
+ {"version":3,"file":"ContainerContext.js","sourceRoot":"","sources":["../../src/main/core/ContainerContext.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH;;GAEG;AAEH,MAAa,UAAU;IAItB,YAAY,GAAW,EAAE,YAAgB;QACxC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IAClC,CAAC;CACD;AARD,gCAQC;AAED,MAAa,YAAY;IAAzB;QAES,QAAG,GAAqB,IAAI,GAAG,EAAe,CAAC;IAiBxD,CAAC;IAfA,MAAM,CAAC,GAAoB;QAC1B,OAAO,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAY,GAA0B;QACxC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAc,CAAC;IAC3C,CAAC;IAED,GAAG,CAAY,GAA0B,EAAE,KAAgB;QAC1D,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACtC,CAAC;IAEA,KAAK;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;IACzB,CAAC;CACD;AAnBD,oCAmBC"}
package/core/Reporter.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Action } from "./Action";
2
- import { Logger } from "@intuitionrobotics/ts-common/core/logger/Logger";
2
+ import { Logger } from "@intuitionrobotics/ts-common";
3
3
  declare class ReportSummary {
4
4
  Running: number;
5
5
  Skipped: number;
package/core/Reporter.js CHANGED
@@ -1,12 +1,25 @@
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
+ */
2
19
  Object.defineProperty(exports, "__esModule", { value: true });
3
20
  exports.ActionReport = exports.Reporter = void 0;
4
21
  const Action_1 = require("./Action");
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");
22
+ const ts_common_1 = require("@intuitionrobotics/ts-common");
10
23
  class ReportSummary {
11
24
  constructor() {
12
25
  this.Running = 0;
@@ -15,13 +28,13 @@ class ReportSummary {
15
28
  this.Error = 0;
16
29
  }
17
30
  }
18
- class Reporter extends Logger_1.Logger {
31
+ class Reporter extends ts_common_1.Logger {
19
32
  constructor() {
20
33
  super("Testelot");
21
34
  this.reports = {};
22
35
  this.summary = new ReportSummary();
23
36
  this.reporter = new ReporterLogClient(this);
24
- BeLogged_1.BeLogged.addClient(this.reporter);
37
+ ts_common_1.BeLogged.addClient(this.reporter);
25
38
  }
26
39
  init() {
27
40
  }
@@ -73,26 +86,26 @@ function pad(value, length) {
73
86
  }
74
87
  return s;
75
88
  }
76
- class ReporterLogClient extends LogClient_1.LogClient {
89
+ class ReporterLogClient extends ts_common_1.LogClient {
77
90
  constructor(report) {
78
91
  super();
79
92
  this.indent = "";
80
93
  this.composer = (tag, level) => {
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}`;
94
+ const successPart = `\x1b[32m${pad(this.report.summary.Success, 3)}${ts_common_1.NoColor}`;
95
+ const skippedPart = `\x1b[90m\x1b[1m${pad(this.report.summary.Skipped, 3)}${ts_common_1.NoColor}`;
96
+ const errorPart = `\x1b[31m${pad(this.report.summary.Error, 3)}${ts_common_1.NoColor}`;
84
97
  const status = `${errorPart}/${skippedPart}/${successPart}`;
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}`;
98
+ const defaultPrefix = ts_common_1.DefaultLogPrefixComposer("Testelot", level);
99
+ const color = ts_common_1.LogClient_Terminal.getColor(level);
100
+ return ` ${defaultPrefix} ${ts_common_1.NoColor}[${status}]:${color} ${this.indent}`;
88
101
  };
89
102
  this.report = report;
90
103
  this.setComposer(this.composer);
91
104
  }
92
105
  logMessage(level, bold, prefix, toLog) {
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));
106
+ const color = ts_common_1.LogClient_Terminal.getColor(level, bold);
107
+ const paramsAsStrings = ts_common_1._logger_convertLogParamsToStrings(toLog);
108
+ paramsAsStrings.forEach(str => console.log(ts_common_1._logger_indentNewLineBy(color + prefix, str), ts_common_1.NoColor));
96
109
  }
97
110
  onContainerStarted() {
98
111
  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":"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"}
1
+ {"version":3,"file":"Reporter.js","sourceRoot":"","sources":["../../src/main/core/Reporter.ts"],"names":[],"mappings":"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"}
package/core/Scenario.d.ts CHANGED
@@ -1,3 +1,6 @@
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
1
4
  import { Action_Container } from "./Action_Container";
2
5
  export declare class Scenario extends Action_Container {
3
6
  protected constructor();
package/core/Scenario.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,6 +27,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  exports.Scenario = void 0;
30
+ /**
31
+ * Created by IR on 3/18/17.
32
+ */
13
33
  const Action_Container_1 = require("./Action_Container");
14
34
  class Scenario extends Action_Container_1.Action_Container {
15
35
  constructor() {
package/core/Scenario.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Scenario.js","sourceRoot":"","sources":["../../src/main/core/Scenario.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAoD;AAEpD,MAAa,QACZ,SAAQ,mCAAgB;IAExB;QACC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAGV,QAAG,GAAG,GAAS,EAAE;YACvB,aAAa;YACb,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACvB,CAAC,CAAA,CAAC;IALF,CAAC;CAMD;AAXD,4BAWC"}
1
+ {"version":3,"file":"Scenario.js","sourceRoot":"","sources":["../../src/main/core/Scenario.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH;;GAEG;AACH,yDAAoD;AAEpD,MAAa,QACZ,SAAQ,mCAAgB;IAExB;QACC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAGV,QAAG,GAAG,GAAS,EAAE;YACvB,aAAa;YACb,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACvB,CAAC,CAAA,CAAC;IALF,CAAC;CAMD;AAXD,4BAWC"}
package/core/TestException.d.ts CHANGED
@@ -1,4 +1,7 @@
1
- import { CustomException } from "@intuitionrobotics/ts-common/core/exceptions";
1
+ /**
2
+ * Created by IR on 3/18/17.
3
+ */
4
+ import { CustomException } from "@intuitionrobotics/ts-common";
2
5
  export declare class TestException extends CustomException {
3
6
  constructor(message: string);
4
7
  }
package/core/TestException.js CHANGED
@@ -1,8 +1,28 @@
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
+ */
2
19
  Object.defineProperty(exports, "__esModule", { value: true });
3
20
  exports.TestException = void 0;
4
- const exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
5
- class TestException extends exceptions_1.CustomException {
21
+ /**
22
+ * Created by IR on 3/18/17.
23
+ */
24
+ const ts_common_1 = require("@intuitionrobotics/ts-common");
25
+ class TestException extends ts_common_1.CustomException {
6
26
  constructor(message) {
7
27
  super(TestException, message);
8
28
  }
package/core/TestException.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TestException.js","sourceRoot":"","sources":["../../src/main/core/TestException.ts"],"names":[],"mappings":";;;AAAA,6EAA6E;AAG7E,MAAa,aACZ,SAAQ,4BAAe;IAEvB,YAAY,OAAe;QAC1B,KAAK,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;IAC9B,CAAC;CACD;AAND,sCAMC"}
1
+ {"version":3,"file":"TestException.js","sourceRoot":"","sources":["../../src/main/core/TestException.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;AAEH;;GAEG;AACH,4DAA6D;AAG7D,MAAa,aACZ,SAAQ,2BAAe;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/core/logger/types";
1
+ import { LogLevel } from "@intuitionrobotics/ts-common";
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
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
20
  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
21
  return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,11 +27,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
10
27
  };
11
28
  Object.defineProperty(exports, "__esModule", { value: true });
12
29
  exports._executeScenario = exports.enableTerminalLogReWrite = exports.__throwException = exports.__scenario = exports.__compareKeys = exports.__custom = exports.__http = exports.__sleep = exports.__log = void 0;
13
- const types_1 = require("@intuitionrobotics/ts-common/core/logger/types");
14
- const BeLogged_1 = require("@intuitionrobotics/ts-common/core/logger/BeLogged");
30
+ const ts_common_1 = require("@intuitionrobotics/ts-common");
15
31
  const index_1 = require("../index");
16
32
  const objectHash = require("object-hash");
17
- function __log(logMessage, level = types_1.LogLevel.Verbose) {
33
+ function __log(logMessage, level = ts_common_1.LogLevel.Verbose) {
18
34
  // @ts-ignore
19
35
  return new index_1.Action_Log(logMessage, level);
20
36
  }
@@ -57,7 +73,7 @@ function __throwException(message) {
57
73
  }
58
74
  exports.__throwException = __throwException;
59
75
  function enableTerminalLogReWrite() {
60
- BeLogged_1.BeLogged.rewriteConsole = (lineCount => {
76
+ ts_common_1.BeLogged.rewriteConsole = (lineCount => {
61
77
  let rewriteCommand = "";
62
78
  for (let i = 0; i < lineCount; i++) {
63
79
  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":";;;;;;;;;;;;AACA,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"}
1
+ {"version":3,"file":"_base_apis.js","sourceRoot":"","sources":["../../src/main/core/_base_apis.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,4DAGsC;AAEtC,oCAUkB;AAGlB,0CAA0C;AAE1C,SAAgB,KAAK,CAAC,UAAkB,EAAE,QAAkB,oBAAQ,CAAC,OAAO;IAC3E,aAAa;IACb,OAAO,IAAI,kBAAU,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;AAC1C,CAAC;AAHD,sBAGC;AAED,SAAgB,OAAO,CAAC,OAAe;IACtC,aAAa;IACb,OAAO,IAAI,oBAAY,CAAC,OAAO,CAAC,CAAC;AAClC,CAAC;AAHD,0BAGC;AAED,SAAgB,MAAM,CAAyB,MAAkB;IAChE,aAAa;IACb,OAAO,IAAI,mBAAW,CAAI,MAAM,CAAC,CAAC;AACnC,CAAC;AAHD,wBAGC;AAED,SAAgB,QAAQ,CAA2C,MAAwD;IAC1H,aAAa;IACb,OAAO,IAAI,qBAAa,CAAO,MAAM,CAAC,CAAC;AACxC,CAAC;AAHD,4BAGC;AAED,SAAgB,aAAa,CAAsB,IAAmB,EAAE,IAAmB;IAC1F,OAAO,QAAQ,CAAU,CAAO,MAAqB,EAAE,EAAE;QACxD,IAAI,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,KAAK,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAChE,MAAM,IAAI,qBAAa,CAAC,gCAAgC,IAAI,CAAC,GAAG,UAAU,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IACzF,CAAC,CAAA,CAAC,CAAC;AACJ,CAAC;AALD,sCAKC;AAED,SAAgB,UAAU,CAAC,KAA8B,EAAE,QAAmB;IAC7E,aAAa;IACb,MAAM,QAAQ,GAAG,IAAI,gBAAQ,EAAE,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzB,IAAI,QAAQ,EAAE;QACb,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;KAC/B;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC;AATD,gCASC;AAED,SAAgB,gBAAgB,CAAC,OAAe;IAC/C,aAAa;IACb,OAAO,IAAI,6BAAqB,CAAC,OAAO,CAAC,CAAC;AAC3C,CAAC;AAHD,4CAGC;AAED,SAAgB,wBAAwB;IACvC,oBAAQ,CAAC,cAAc,GAAG,CAAC,SAAS,CAAC,EAAE;QACtC,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;YACnC,cAAc,IAAI,oBAAoB,CAAA;SACtC;QAED,IAAI;YACH,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,cAAc,EAAE,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC,CAAC;SACtE;QAAC,OAAO,CAAC,EAAE;SACX;IACF,CAAC,CAAC,CAAC;AACJ,CAAC;AAZD,4DAYC;AAGD,SAAgB,gBAAgB,CAAC,QAAkB;IAClD,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;SACvB,IAAI,CAAC,GAAG,EAAE;QACV,QAAQ,CAAC,OAAO,CAAC,4CAA4C,CAAC,CAAC;IAChE,CAAC,CAAC;SACD,KAAK,CAAC,MAAM,CAAC,EAAE;QACf,QAAQ,CAAC,QAAQ,CAAC,0CAA0C,CAAC,CAAC;QAC9D,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC3B,CAAC,CAAC,CAAC;AAEL,CAAC;AAVD,4CAUC"}
package/index.js CHANGED
@@ -1,4 +1,21 @@
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
+ */
2
19
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
20
  if (k2 === undefined) k2 = k;
4
21
  Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
package/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,uDAAqC;AACrC,gDAA8B;AAC9B,0DAAwC;AACxC,uDAAqC;AACrC,qDAAmC;AACnC,oDAAkC;AAClC,sDAAoC;AACpC,+DAA6C;AAC7C,0DAAwC;AACxC,kDAAgC;AAChC,kDAAgC;AAChC,oDAAkC;AAClC,uDAAqC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/main/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;GAgBG;;;;;;;;;;;;AAEH,uDAAqC;AACrC,gDAA8B;AAC9B,0DAAwC;AACxC,uDAAqC;AACrC,qDAAmC;AACnC,oDAAkC;AAClC,sDAAoC;AACpC,+DAA6C;AAC7C,0DAAwC;AACxC,kDAAgC;AAChC,kDAAgC;AAChC,oDAAkC;AAClC,uDAAqC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@intuitionrobotics/testelot",
3
- "version": "0.45.0",
3
+ "version": "0.45.3",
4
4
  "description": "Nu-Art Sir Testelot",
5
5
  "keywords": [
6
6
  "IR",
package/test-app/AppTester.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ModuleManager } from "@intuitionrobotics/ts-common/core/module-manager";
1
+ import { ModuleManager } from "@intuitionrobotics/ts-common";
2
2
  import { Scenario } from "..";
3
3
  export declare class AppTester extends ModuleManager {
4
4
  private scenario;
package/test-app/AppTester.js CHANGED
@@ -10,16 +10,15 @@ 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 exceptions_1 = require("@intuitionrobotics/ts-common/core/exceptions");
14
- const module_manager_1 = require("@intuitionrobotics/ts-common/core/module-manager");
13
+ const ts_common_1 = require("@intuitionrobotics/ts-common");
15
14
  const __1 = require("..");
16
- class AppTester extends module_manager_1.ModuleManager {
15
+ class AppTester extends ts_common_1.ModuleManager {
17
16
  constructor() {
18
17
  super();
19
18
  this.reporter = new __1.Reporter();
20
19
  this.runTestsImpl = () => __awaiter(this, void 0, void 0, function* () {
21
20
  if (!this.scenario)
22
- throw new exceptions_1.ImplementationMissingException("No test specified!!");
21
+ throw new ts_common_1.ImplementationMissingException("No test specified!!");
23
22
  this.prepare();
24
23
  this.init();
25
24
  this.reporter.init();
package/test-app/AppTester.js.map CHANGED
@@ -1 +1 @@
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"}
1
+ {"version":3,"file":"AppTester.js","sourceRoot":"","sources":["../../src/main/test-app/AppTester.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4DAGsC;AACtC,0BAKY;AAEZ,MAAa,SACZ,SAAQ,yBAAa;IAKrB;QACC,KAAK,EAAE,CAAC;QAHD,aAAQ,GAAG,IAAI,YAAQ,EAAE,CAAC;QAqClC,iBAAY,GAAG,GAAS,EAAE;YACzB,IAAI,CAAC,IAAI,CAAC,QAAQ;gBACjB,MAAM,IAAI,0CAA8B,CAAC,qBAAqB,CAAC,CAAC;YAEjE,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;QACtB,CAAC,CAAA,CAAC;IA7CF,CAAC;IAED,WAAW,CAAC,QAAkB;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK;QACJ,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;QAC5B,IAAI,WAAmB,CAAC;QACxB,IAAI,GAAG;YACN,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QAEvD,IAAI,CAAC,YAAY,EAAE;aACd,IAAI,CAAC,GAAG,EAAE;YACV,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YAC/C,IAAI,UAAU,GAAG,CAAC,EAAE;gBACnB,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;aAChB;YAED,IAAI,CAAC,OAAO,CAAC,YAAY,WAAW,iCAAiC,CAAC,CAAA;YACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC,CAAC;aACD,KAAK,CAAC,MAAM,CAAC,EAAE;YACf,IAAI,CAAC,QAAQ,CAAC,YAAY,WAAW,iBAAiB,EAAE,MAAM,CAAC,CAAC;YAChE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC,CAAC,CAAC;IACR,CAAC;IAED,OAAO;IACP,CAAC;CAeD;AAtDD,8BAsDC"}