rooibos-roku 4.8.2 → 5.0.2
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/dist/lib/framework/BaseTestSuite.bs +27 -27
- package/dist/lib/framework/CommonUtils.bs +57 -22
- package/dist/lib/rooibos/FileFactory.js +38 -35
- package/dist/lib/rooibos/FileFactory.js.map +1 -1
- package/dist/lib/rooibos/RawCodeStatement.js +5 -1
- package/dist/lib/rooibos/RawCodeStatement.js.map +1 -1
- package/dist/lib/rooibos/RooibosSession.js +77 -72
- package/dist/lib/rooibos/RooibosSession.js.map +1 -1
- package/dist/lib/rooibos/RooibosSessionInfo.js +22 -0
- package/dist/lib/rooibos/RooibosSessionInfo.js.map +1 -1
- package/dist/lib/rooibos/TestGroup.js +26 -24
- package/dist/lib/rooibos/TestGroup.js.map +1 -1
- package/dist/lib/rooibos/TestSuite.js +2 -8
- package/dist/lib/rooibos/TestSuite.js.map +1 -1
- package/dist/lib/rooibos/TestSuiteBuilder.spec.js +674 -674
- package/dist/lib/rooibos/TestSuiteBuilder.spec.js.map +1 -1
- package/dist/lib/rooibos/Utils.js +27 -125
- package/dist/lib/rooibos/Utils.js.map +1 -1
- package/dist/plugin.js +11 -13
- package/dist/plugin.js.map +1 -1
- package/package.json +3 -3
|
@@ -7,6 +7,7 @@ const RooibosSessionInfo_1 = require("./RooibosSessionInfo");
|
|
|
7
7
|
const TestSuiteBuilder_1 = require("./TestSuiteBuilder");
|
|
8
8
|
const RawCodeStatement_1 = require("./RawCodeStatement");
|
|
9
9
|
const Diagnostics_1 = require("../utils/Diagnostics");
|
|
10
|
+
const undent_1 = require("undent");
|
|
10
11
|
// eslint-disable-next-line
|
|
11
12
|
const pkg = require('../../../package.json');
|
|
12
13
|
class RooibosSession {
|
|
@@ -27,85 +28,90 @@ class RooibosSession {
|
|
|
27
28
|
let testSuites = this._suiteBuilder.processFile(file);
|
|
28
29
|
return testSuites.length > 0;
|
|
29
30
|
}
|
|
30
|
-
addLaunchHook() {
|
|
31
|
-
let
|
|
32
|
-
|
|
31
|
+
addLaunchHook(editor) {
|
|
32
|
+
let mainFunction;
|
|
33
|
+
const files = this._builder.program.getScopeByName('source').getOwnFiles();
|
|
33
34
|
for (let file of files) {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
mainFunc
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
35
|
+
if (brighterscript_1.isBrsFile(file)) {
|
|
36
|
+
const mainFunc = file.parser.references.functionStatements.find((f) => f.name.text.toLowerCase() === 'main');
|
|
37
|
+
if (mainFunc) {
|
|
38
|
+
mainFunction = mainFunc;
|
|
39
|
+
break;
|
|
40
|
+
}
|
|
40
41
|
}
|
|
41
42
|
}
|
|
42
|
-
if (
|
|
43
|
+
if (mainFunction) {
|
|
44
|
+
editor.addToArray(mainFunction.func.body.statements, 0, new RawCodeStatement_1.RawCodeStatement(`Rooibos_init()`));
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
43
47
|
Diagnostics_1.diagnosticErrorNoMainFound(files[0]);
|
|
44
|
-
this._builder.program.
|
|
45
|
-
|
|
46
|
-
|
|
48
|
+
this.rooibosMain = this._builder.program.setFile('source/rooibosMain.brs', `function main()\n Rooibos_init()\nend function`);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
/**
|
|
52
|
+
* Should only be called in afterProgramTranspile to remove the rooibosMain file IF it exists
|
|
53
|
+
*/
|
|
54
|
+
removeRooibosMain() {
|
|
55
|
+
if (this.rooibosMain) {
|
|
56
|
+
this._builder.program.removeFile('source/rooibosMain.brs');
|
|
57
|
+
this.rooibosMain = undefined;
|
|
47
58
|
}
|
|
48
59
|
}
|
|
49
|
-
addTestRunnerMetadata() {
|
|
50
|
-
let runtimeConfig = this._builder.program.
|
|
60
|
+
addTestRunnerMetadata(editor) {
|
|
61
|
+
let runtimeConfig = this._builder.program.getFile('source/rooibos/RuntimeConfig.bs');
|
|
51
62
|
if (runtimeConfig) {
|
|
52
63
|
let classStatement = runtimeConfig.ast.statements[0].body.statements[0];
|
|
53
|
-
this.updateRunTimeConfigFunction(classStatement);
|
|
54
|
-
this.updateVersionTextFunction(classStatement);
|
|
55
|
-
this.updateClassLookupFunction(classStatement);
|
|
56
|
-
this.updateGetAllTestSuitesNames(classStatement);
|
|
57
|
-
this.createIgnoredTestsInfoFunction(classStatement);
|
|
64
|
+
this.updateRunTimeConfigFunction(classStatement, editor);
|
|
65
|
+
this.updateVersionTextFunction(classStatement, editor);
|
|
66
|
+
this.updateClassLookupFunction(classStatement, editor);
|
|
67
|
+
this.updateGetAllTestSuitesNames(classStatement, editor);
|
|
68
|
+
this.createIgnoredTestsInfoFunction(classStatement, editor);
|
|
58
69
|
}
|
|
59
70
|
}
|
|
60
|
-
updateRunTimeConfigFunction(classStatement) {
|
|
71
|
+
updateRunTimeConfigFunction(classStatement, editor) {
|
|
61
72
|
var _a;
|
|
62
73
|
let method = classStatement.methods.find((m) => m.name.text === 'getRuntimeConfig');
|
|
63
74
|
if (method) {
|
|
64
|
-
method.func.body.statements.
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
75
|
+
editor.addToArray(method.func.body.statements, method.func.body.statements.length, new RawCodeStatement_1.RawCodeStatement(undent_1.default `
|
|
76
|
+
return {
|
|
77
|
+
"failFast": ${this.config.failFast ? 'true' : 'false'}
|
|
78
|
+
"sendHomeOnFinish": ${this.config.sendHomeOnFinish ? 'true' : 'false'}
|
|
79
|
+
"logLevel": ${(_a = this.config.logLevel) !== null && _a !== void 0 ? _a : 0}
|
|
80
|
+
"showOnlyFailures": ${this.config.showOnlyFailures ? 'true' : 'false'}
|
|
81
|
+
"printTestTimes": ${this.config.printTestTimes ? 'true' : 'false'}
|
|
82
|
+
"lineWidth": ${this.config.lineWidth || 60}
|
|
83
|
+
"printLcov": ${this.config.printLcov ? 'true' : 'false'}
|
|
84
|
+
"port": "${this.config.port || 'invalid'}"
|
|
85
|
+
"catchCrashes": ${this.config.catchCrashes ? 'true' : 'false'}
|
|
86
|
+
}`));
|
|
76
87
|
}
|
|
77
88
|
}
|
|
78
|
-
updateVersionTextFunction(classStatement) {
|
|
89
|
+
updateVersionTextFunction(classStatement, editor) {
|
|
79
90
|
let method = classStatement.methods.find((m) => m.name.text === 'getVersionText');
|
|
80
91
|
if (method) {
|
|
81
|
-
method.func.body.statements.
|
|
92
|
+
editor.addToArray(method.func.body.statements, method.func.body.statements.length, new RawCodeStatement_1.RawCodeStatement(`return "${pkg.version}"`));
|
|
82
93
|
}
|
|
83
94
|
}
|
|
84
|
-
updateClassLookupFunction(classStatement) {
|
|
95
|
+
updateClassLookupFunction(classStatement, editor) {
|
|
85
96
|
let method = classStatement.methods.find((m) => m.name.text === 'getTestSuiteClassWithName');
|
|
86
97
|
if (method) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
return ${suite.classStatement.getName(brighterscript_1.ParseMode.BrightScript)}
|
|
95
|
-
`;
|
|
96
|
-
}
|
|
97
|
-
text += `
|
|
98
|
-
end if`;
|
|
99
|
-
method.func.body.statements.push(new RawCodeStatement_1.RawCodeStatement(text));
|
|
98
|
+
editor.arrayPush(method.func.body.statements, new RawCodeStatement_1.RawCodeStatement(undent_1.default `
|
|
99
|
+
if false
|
|
100
|
+
? "noop" ${this.sessionInfo.testSuitesToRun.map(suite => `
|
|
101
|
+
else if name = "${suite.name}"
|
|
102
|
+
return ${suite.classStatement.getName(brighterscript_1.ParseMode.BrightScript)}`).join('')}
|
|
103
|
+
end if
|
|
104
|
+
`));
|
|
100
105
|
}
|
|
101
106
|
}
|
|
102
|
-
updateGetAllTestSuitesNames(classStatement) {
|
|
107
|
+
updateGetAllTestSuitesNames(classStatement, editor) {
|
|
103
108
|
let method = classStatement.methods.find((m) => m.name.text === 'getAllTestSuitesNames');
|
|
104
109
|
if (method) {
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
110
|
+
editor.arrayPush(method.func.body.statements, new RawCodeStatement_1.RawCodeStatement([
|
|
111
|
+
'return [',
|
|
112
|
+
...this.sessionInfo.testSuitesToRun.map((s) => ` "${s.name}"`),
|
|
113
|
+
']'
|
|
114
|
+
].join('\n')));
|
|
109
115
|
}
|
|
110
116
|
}
|
|
111
117
|
createNodeFiles(program) {
|
|
@@ -114,36 +120,35 @@ end function`);
|
|
|
114
120
|
let xmlText = this.getNodeTestXmlText(suite);
|
|
115
121
|
let bsPath = path.join(p, `${suite.generatedNodeName}.bs`);
|
|
116
122
|
this.fileFactory.addFile(program, path.join(p, `${suite.generatedNodeName}.xml`), xmlText);
|
|
117
|
-
let bsFile = program.
|
|
123
|
+
let bsFile = program.getFile(bsPath);
|
|
118
124
|
if (bsFile) {
|
|
119
125
|
bsFile.parser.statements.push();
|
|
120
126
|
bsFile.needsTranspiled = true;
|
|
121
127
|
}
|
|
122
|
-
let brsFile = this.fileFactory.addFile(program, bsPath,
|
|
128
|
+
let brsFile = this.fileFactory.addFile(program, bsPath, undent_1.default `
|
|
129
|
+
import "pkg:/${suite.file.pkgPath}"
|
|
130
|
+
function init()
|
|
131
|
+
nodeRunner = Rooibos_TestRunner(m.top.getScene(), m)
|
|
132
|
+
m.top.rooibosTestResult = nodeRunner.runInNodeMode("${suite.name}")
|
|
133
|
+
end function
|
|
134
|
+
`);
|
|
123
135
|
brsFile.parser.invalidateReferences();
|
|
124
136
|
}
|
|
125
137
|
}
|
|
126
138
|
getNodeTestXmlText(suite) {
|
|
127
139
|
return this.fileFactory.createTestXML(suite.generatedNodeName, suite.nodeName);
|
|
128
140
|
}
|
|
129
|
-
|
|
130
|
-
return `import "pkg:/${testSuite.file.pkgPath}"
|
|
131
|
-
function init()
|
|
132
|
-
nodeRunner = Rooibos_TestRunner(m.top.getScene(), m)
|
|
133
|
-
m.top.rooibosTestResult = nodeRunner.runInNodeMode("${testSuite.name}")
|
|
134
|
-
end function
|
|
135
|
-
`;
|
|
136
|
-
}
|
|
137
|
-
createIgnoredTestsInfoFunction(cs) {
|
|
141
|
+
createIgnoredTestsInfoFunction(cs, editor) {
|
|
138
142
|
let method = cs.methods.find((m) => m.name.text === 'getIgnoredTestInfo');
|
|
139
143
|
if (method) {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
144
|
+
editor.arrayPush(method.func.body.statements, new RawCodeStatement_1.RawCodeStatement([
|
|
145
|
+
'return {',
|
|
146
|
+
` "count": ${this.sessionInfo.ignoredCount}`,
|
|
147
|
+
` "items": [`,
|
|
148
|
+
...this.sessionInfo.ignoredTestNames.map((name) => ` "${name}"`),
|
|
149
|
+
` ]`,
|
|
150
|
+
`}`
|
|
151
|
+
].join('\n')));
|
|
147
152
|
}
|
|
148
153
|
}
|
|
149
154
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RooibosSession.js","sourceRoot":"","sources":["../../../src/lib/rooibos/RooibosSession.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;
|
|
1
|
+
{"version":3,"file":"RooibosSession.js","sourceRoot":"","sources":["../../../src/lib/rooibos/RooibosSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,6 +63,7 @@ class SessionInfo {
|
|
|
63
63
|
* to include it in the final json payload
|
|
64
64
|
*/
|
|
65
65
|
updateInfo() {
|
|
66
|
+
this.resetCounts();
|
|
66
67
|
for (let testSuite of [...this.testSuites.values()]) {
|
|
67
68
|
if (this.isExcludedByTag(testSuite, false)) {
|
|
68
69
|
testSuite.isIncluded = false;
|
|
@@ -171,6 +172,27 @@ class SessionInfo {
|
|
|
171
172
|
}
|
|
172
173
|
return false;
|
|
173
174
|
}
|
|
175
|
+
resetCounts() {
|
|
176
|
+
this.hasSoloTests = false;
|
|
177
|
+
this.hasSoloGroups = false;
|
|
178
|
+
this.hasSoloSuites = false;
|
|
179
|
+
for (let testSuite of [...this.testSuites.values()]) {
|
|
180
|
+
if (testSuite.isValid && !this.isExcludedByTag(testSuite, false)) {
|
|
181
|
+
if (testSuite.isSolo) {
|
|
182
|
+
this.hasSoloSuites = !this.hasSoloGroups && !this.hasSoloTests;
|
|
183
|
+
}
|
|
184
|
+
if (testSuite.hasSoloGroups) {
|
|
185
|
+
this.hasSoloGroups = !this.hasSoloTests;
|
|
186
|
+
}
|
|
187
|
+
if (testSuite.hasSoloTests) {
|
|
188
|
+
this.hasSoloTests = true;
|
|
189
|
+
this.hasSoloGroups = false;
|
|
190
|
+
this.hasSoloSuites = false;
|
|
191
|
+
}
|
|
192
|
+
}
|
|
193
|
+
}
|
|
194
|
+
this.suitesCount = this.testSuites.size;
|
|
195
|
+
}
|
|
174
196
|
}
|
|
175
197
|
exports.SessionInfo = SessionInfo;
|
|
176
198
|
let _sessionInfo;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RooibosSessionInfo.js","sourceRoot":"","sources":["../../../src/lib/rooibos/RooibosSessionInfo.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"RooibosSessionInfo.js","sourceRoot":"","sources":["../../../src/lib/rooibos/RooibosSessionInfo.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,9 +5,9 @@ const brighterscript_1 = require("brighterscript");
|
|
|
5
5
|
const brighterscript = require("brighterscript");
|
|
6
6
|
const BrsTranspileState_1 = require("brighterscript/dist/parser/BrsTranspileState");
|
|
7
7
|
const Diagnostics_1 = require("../utils/Diagnostics");
|
|
8
|
-
const RawCodeStatement_1 = require("./RawCodeStatement");
|
|
9
8
|
const TestSuite_1 = require("./TestSuite");
|
|
10
9
|
const Utils_1 = require("./Utils");
|
|
10
|
+
const undent_1 = require("undent");
|
|
11
11
|
class TestGroup extends TestSuite_1.TestBlock {
|
|
12
12
|
constructor(testSuite, annotation) {
|
|
13
13
|
super(annotation);
|
|
@@ -34,7 +34,7 @@ class TestGroup extends TestSuite_1.TestBlock {
|
|
|
34
34
|
getTestCases() {
|
|
35
35
|
return [...this.testCases.values()];
|
|
36
36
|
}
|
|
37
|
-
modifyAssertions(testCase, noEarlyExit) {
|
|
37
|
+
modifyAssertions(testCase, noEarlyExit, editor) {
|
|
38
38
|
//for each method
|
|
39
39
|
//if assertion
|
|
40
40
|
//wrap with if is not fail
|
|
@@ -50,18 +50,19 @@ class TestGroup extends TestSuite_1.TestBlock {
|
|
|
50
50
|
let assertRegex = /(?:fail|assert(?:[a-z0-9]*)|expect(?:[a-z0-9]*)|stubCall)/i;
|
|
51
51
|
if (dge && assertRegex.test(dge.name.text)) {
|
|
52
52
|
if (dge.name.text === 'stubCall') {
|
|
53
|
-
this.modifyModernRooibosExpectCallExpression(callExpression);
|
|
53
|
+
this.modifyModernRooibosExpectCallExpression(callExpression, editor);
|
|
54
54
|
return expressionStatement;
|
|
55
55
|
}
|
|
56
56
|
else {
|
|
57
57
|
if (dge.name.text === 'expectCalled' || dge.name.text === 'expectNotCalled') {
|
|
58
|
-
this.modifyModernRooibosExpectCallExpression(callExpression);
|
|
58
|
+
this.modifyModernRooibosExpectCallExpression(callExpression, editor);
|
|
59
59
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
60
|
+
//TODO change this to editor.setProperty(parentObj, parentKey, new SourceNode()) once bsc supports it
|
|
61
|
+
Utils_1.overrideAstTranspile(editor, expressionStatement, '\n' + undent_1.default `
|
|
62
|
+
m.currentAssertLineNumber = ${callExpression.range.start.line}
|
|
63
|
+
${callExpression.transpile(transpileState).join('')}
|
|
64
|
+
${noEarlyExit ? '' : 'if m.currentResult.isFail then return invalid'}
|
|
65
|
+
` + '\n');
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
}
|
|
@@ -75,12 +76,12 @@ class TestGroup extends TestSuite_1.TestBlock {
|
|
|
75
76
|
Diagnostics_1.diagnosticErrorProcessingFile(this.testSuite.file, e.message);
|
|
76
77
|
}
|
|
77
78
|
}
|
|
78
|
-
modifyModernRooibosExpectCallExpression(callExpression) {
|
|
79
|
+
modifyModernRooibosExpectCallExpression(callExpression, editor) {
|
|
79
80
|
let isNotCalled = false;
|
|
80
81
|
let isStubCall = false;
|
|
81
82
|
if (brighterscript_1.isDottedGetExpression(callExpression.callee)) {
|
|
82
83
|
const nameText = callExpression.callee.name.text;
|
|
83
|
-
callExpression.callee.name
|
|
84
|
+
editor.setProperty(callExpression.callee.name, 'text', `_${nameText}`);
|
|
84
85
|
isNotCalled = nameText === 'expectNotCalled';
|
|
85
86
|
isStubCall = nameText === 'stubCall';
|
|
86
87
|
}
|
|
@@ -88,37 +89,38 @@ class TestGroup extends TestSuite_1.TestBlock {
|
|
|
88
89
|
let arg0 = callExpression.args[0];
|
|
89
90
|
if (brighterscript.isCallExpression(arg0) && brighterscript_1.isDottedGetExpression(arg0.callee)) {
|
|
90
91
|
let functionName = arg0.callee.name.text;
|
|
91
|
-
callExpression.args
|
|
92
|
+
editor.removeFromArray(callExpression.args, 0);
|
|
92
93
|
if (!isNotCalled && !isStubCall) {
|
|
93
94
|
const expectedArgs = new brighterscript_1.ArrayLiteralExpression(arg0.args, brighterscript_1.createToken(brighterscript_1.TokenKind.LeftSquareBracket), brighterscript_1.createToken(brighterscript_1.TokenKind.RightSquareBracket));
|
|
94
|
-
callExpression.args
|
|
95
|
+
editor.addToArray(callExpression.args, 0, expectedArgs);
|
|
95
96
|
}
|
|
96
|
-
callExpression.args
|
|
97
|
-
callExpression.args
|
|
97
|
+
editor.addToArray(callExpression.args, 0, brighterscript_1.createStringLiteral(functionName));
|
|
98
|
+
editor.addToArray(callExpression.args, 0, arg0.callee.obj);
|
|
98
99
|
}
|
|
99
100
|
else if (brighterscript.isDottedGetExpression(arg0)) {
|
|
100
101
|
let functionName = arg0.name.text;
|
|
101
|
-
arg0 = callExpression.args
|
|
102
|
+
arg0 = callExpression.args[0];
|
|
103
|
+
editor.removeFromArray(callExpression.args, 0);
|
|
102
104
|
if (!isNotCalled && !isStubCall) {
|
|
103
|
-
callExpression.args
|
|
105
|
+
editor.addToArray(callExpression.args, 0, brighterscript_1.createInvalidLiteral());
|
|
104
106
|
}
|
|
105
|
-
callExpression.args
|
|
106
|
-
callExpression.args
|
|
107
|
+
editor.addToArray(callExpression.args, 0, brighterscript_1.createStringLiteral(functionName));
|
|
108
|
+
editor.addToArray(callExpression.args, 0, arg0.obj);
|
|
107
109
|
}
|
|
108
110
|
else if (brighterscript.isCallfuncExpression(arg0)) {
|
|
109
111
|
let functionName = arg0.methodName.text;
|
|
110
|
-
callExpression.args
|
|
112
|
+
editor.removeFromArray(callExpression.args, 0);
|
|
111
113
|
if (isNotCalled || isStubCall) {
|
|
112
114
|
//TODO in future we can improve is notCalled to know which callFunc function it is
|
|
113
115
|
// const expectedArgs = new ArrayLiteralExpression([createStringLiteral(functionName)], createToken(TokenKind.LeftSquareBracket), createToken(TokenKind.RightSquareBracket));
|
|
114
|
-
// callExpression.args
|
|
116
|
+
// editor.addToArray(callExpression.args, 0, expectedArgs);
|
|
115
117
|
}
|
|
116
118
|
else {
|
|
117
119
|
const expectedArgs = new brighterscript_1.ArrayLiteralExpression([brighterscript_1.createStringLiteral(functionName), ...arg0.args], brighterscript_1.createToken(brighterscript_1.TokenKind.LeftSquareBracket), brighterscript_1.createToken(brighterscript_1.TokenKind.RightSquareBracket));
|
|
118
|
-
callExpression.args
|
|
120
|
+
editor.addToArray(callExpression.args, 0, expectedArgs);
|
|
119
121
|
}
|
|
120
|
-
callExpression.args
|
|
121
|
-
callExpression.args
|
|
122
|
+
editor.addToArray(callExpression.args, 0, brighterscript_1.createStringLiteral('callFunc'));
|
|
123
|
+
editor.addToArray(callExpression.args, 0, arg0.callee);
|
|
122
124
|
}
|
|
123
125
|
}
|
|
124
126
|
asText() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestGroup.js","sourceRoot":"","sources":["../../../src/lib/rooibos/TestGroup.ts"],"names":[],"mappings":";;;AACA,mDAAkJ;AAClJ,iDAAiD;AACjD,oFAAiF;AAEjF,sDAAqE;
|
|
1
|
+
{"version":3,"file":"TestGroup.js","sourceRoot":"","sources":["../../../src/lib/rooibos/TestGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,17 +63,11 @@ class TestSuite extends TestBlock {
|
|
|
63
63
|
}
|
|
64
64
|
this.isValid = true;
|
|
65
65
|
}
|
|
66
|
-
addDataFunctions() {
|
|
66
|
+
addDataFunctions(editor) {
|
|
67
67
|
if (this.isIncluded) {
|
|
68
|
-
Utils_1.addOverriddenMethod(this.file, this.annotation.annotation, this.classStatement, 'getTestSuiteData', `return ${this.asText()}
|
|
68
|
+
Utils_1.addOverriddenMethod(this.file, this.annotation.annotation, this.classStatement, 'getTestSuiteData', `return ${this.asText()}`, editor);
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
-
removeCode() {
|
|
72
|
-
this.classStatement.fields = [];
|
|
73
|
-
this.classStatement.methods = [];
|
|
74
|
-
this.classStatement.body = [];
|
|
75
|
-
this.classStatement.memberMap = {};
|
|
76
|
-
}
|
|
77
71
|
getTestGroups() {
|
|
78
72
|
return [...this.testGroups.values()];
|
|
79
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestSuite.js","sourceRoot":"","sources":["../../../src/lib/rooibos/TestSuite.ts"],"names":[],"mappings":";;;AAEA,sDAAqG;AAKrG,mCAAoE;AAEpE;;GAEG;AACH,MAAa,SAAS;IAClB,YACW,UAA6B;QAA7B,eAAU,GAAV,UAAU,CAAmB;QA2BjC,YAAO,GAAG,KAAK,CAAC;QAChB,eAAU,GAAG,KAAK,CAAC;QAEnB,gBAAW,GAAG,KAAK,CAAC;QACpB,iBAAY,GAAG,KAAK,CAAC;QACrB,oBAAe,GAAG,KAAK,CAAC;IA9B/B,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;IAChC,CAAC;IACD,IAAW,OAAO;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;IAC7B,CAAC;IAED,IAAW,QAAQ;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC;IAClC,CAAC;IAED,IAAW,IAAI;QACX,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;IAChC,CAAC;IAED,IAAW,MAAM;QACb,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;IAClC,CAAC;IAED,IAAW,SAAS;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;IACpC,CAAC;CAcJ;AAzCD,8BAyCC;AAED,MAAa,SAAU,SAAQ,SAAS;IACpC,YAAY,UAA6B,EAAE,cAA8B;;QACrE,KAAK,CAAC,UAAU,CAAC,CAAC;QAaf,eAAU,GAAG,IAAI,GAAG,EAAqB,CAAC;QAG1C,kBAAa,GAAG,KAAK,CAAC;QACtB,eAAU,GAAG,KAAK,CAAC;QAhBtB,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;QAC3E,IAAI,CAAC,QAAQ,SAAG,UAAU,CAAC,QAAQ,0CAAE,IAAI,EAAE,CAAC;QAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACZ,IAAI,CAAC,UAAU,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;SACnD;QACD,IAAI,CAAC,iBAAiB,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;IAElF,CAAC;IAUM,QAAQ,CAAC,KAAgB;QAC5B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvC,IAAI,KAAK,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;YACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;SAC/B;QACD,IAAI,KAAK,CAAC,YAAY,EAAE;YACpB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;SAC5B;QACD,IAAI,KAAK,CAAC,MAAM,EAAE;YACd,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;SAC7B;QACD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACxB,CAAC;IAEM,gBAAgB;
|
|
1
|
+
{"version":3,"file":"TestSuite.js","sourceRoot":"","sources":["../../../src/lib/rooibos/TestSuite.ts"],"names":[],"mappings":"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"}
|