rooibos-roku 5.6.2 → 5.7.0
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/LICENSE +21 -21
- package/README.md +12 -12
- package/dist/lib/framework/Matchers.bs +27 -27
- package/dist/lib/framework/RuntimeConfig.bs +19 -19
- package/dist/lib/framework/Stats.bs +45 -45
- package/dist/lib/rooibos/TestGroup.js +3 -2
- package/dist/lib/rooibos/TestGroup.js.map +1 -1
- package/dist/lib/rooibos/Utils.js +4 -4
- package/package.json +1 -1
- package/dist/lib/rooibos/CodeCoverageProcessor.spec.js +0 -386
- package/dist/lib/rooibos/CodeCoverageProcessor.spec.js.map +0 -1
- package/dist/lib/rooibos/TestSuiteBuilder.spec.js +0 -1126
- package/dist/lib/rooibos/TestSuiteBuilder.spec.js.map +0 -1
package/LICENSE
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
|
-
MIT License
|
|
2
|
-
|
|
3
|
-
Copyright (c) 2019 George Cook
|
|
4
|
-
|
|
5
|
-
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
-
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
-
in the Software without restriction, including without limitation the rights
|
|
8
|
-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
-
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
-
furnished to do so, subject to the following conditions:
|
|
11
|
-
|
|
12
|
-
The above copyright notice and this permission notice shall be included in all
|
|
13
|
-
copies or substantial portions of the Software.
|
|
14
|
-
|
|
15
|
-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
-
SOFTWARE.
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2019 George Cook
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/README.md
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
<p align="center">
|
|
2
|
-
<img src="https://github.com/georgejecook/rooibos/raw/master/images/logo.png" alt="Rooibos test framework" width="200" height="200"/>
|
|
3
|
-
</p>
|
|
4
|
-
|
|
5
|
-
[](https://github.com/georgejecook/rooibos/actions?query=workflow%3Abuild)
|
|
6
|
-
[](https://github.com/georgejecook/rooibos/releases)
|
|
7
|
-
[](https://npmjs.org/package/rooibos-roku)
|
|
8
|
-
|
|
9
|
-
## Links
|
|
10
|
-
- **[Documentation](https://github.com/georgejecook/rooibos/blob/master/docs/index.md)**
|
|
11
|
-
- **[API Documentation](https://georgejecook.github.io/rooibos)**
|
|
12
|
-
- \#roku channel on the [roku developer's slack](https://join.slack.com/t/rokudevelopers/shared_invite/enQtMzgyODg0ODY0NDM5LTc2ZDdhZWI2MDBmYjcwYTk5MmE1MTYwMTA2NGVjZmJiNWM4ZWY2MjY1MDY0MmViNmQ1ZWRmMWUzYTVhNzJiY2M)
|
|
1
|
+
<p align="center">
|
|
2
|
+
<img src="https://github.com/georgejecook/rooibos/raw/master/images/logo.png" alt="Rooibos test framework" width="200" height="200"/>
|
|
3
|
+
</p>
|
|
4
|
+
|
|
5
|
+
[](https://github.com/georgejecook/rooibos/actions?query=workflow%3Abuild)
|
|
6
|
+
[](https://github.com/georgejecook/rooibos/releases)
|
|
7
|
+
[](https://npmjs.org/package/rooibos-roku)
|
|
8
|
+
|
|
9
|
+
## Links
|
|
10
|
+
- **[Documentation](https://github.com/georgejecook/rooibos/blob/master/docs/index.md)**
|
|
11
|
+
- **[API Documentation](https://georgejecook.github.io/rooibos)**
|
|
12
|
+
- \#roku channel on the [roku developer's slack](https://join.slack.com/t/rokudevelopers/shared_invite/enQtMzgyODg0ODY0NDM5LTc2ZDdhZWI2MDBmYjcwYTk5MmE1MTYwMTA2NGVjZmJiNWM4ZWY2MjY1MDY0MmViNmQ1ZWRmMWUzYTVhNzJiY2M)
|
|
@@ -1,28 +1,28 @@
|
|
|
1
|
-
namespace rooibos.Matcher
|
|
2
|
-
|
|
3
|
-
function anyString(value)
|
|
4
|
-
return Rooibos.Common.isString(value)
|
|
5
|
-
end function
|
|
6
|
-
|
|
7
|
-
function anyBool(value)
|
|
8
|
-
return Rooibos.Common.isBoolean(value)
|
|
9
|
-
end function
|
|
10
|
-
|
|
11
|
-
function anyNumber(value)
|
|
12
|
-
return Rooibos.Common.isNumber(value)
|
|
13
|
-
end function
|
|
14
|
-
|
|
15
|
-
function anyAA(value)
|
|
16
|
-
return Rooibos.Common.isAssociativeArray(value)
|
|
17
|
-
end function
|
|
18
|
-
|
|
19
|
-
function anyArray(value)
|
|
20
|
-
return Rooibos.Common.isArray(value)
|
|
21
|
-
end function
|
|
22
|
-
|
|
23
|
-
function anyNode(value)
|
|
24
|
-
return Rooibos.Common.isSGNode(value)
|
|
25
|
-
end function
|
|
26
|
-
|
|
27
|
-
|
|
1
|
+
namespace rooibos.Matcher
|
|
2
|
+
|
|
3
|
+
function anyString(value)
|
|
4
|
+
return Rooibos.Common.isString(value)
|
|
5
|
+
end function
|
|
6
|
+
|
|
7
|
+
function anyBool(value)
|
|
8
|
+
return Rooibos.Common.isBoolean(value)
|
|
9
|
+
end function
|
|
10
|
+
|
|
11
|
+
function anyNumber(value)
|
|
12
|
+
return Rooibos.Common.isNumber(value)
|
|
13
|
+
end function
|
|
14
|
+
|
|
15
|
+
function anyAA(value)
|
|
16
|
+
return Rooibos.Common.isAssociativeArray(value)
|
|
17
|
+
end function
|
|
18
|
+
|
|
19
|
+
function anyArray(value)
|
|
20
|
+
return Rooibos.Common.isArray(value)
|
|
21
|
+
end function
|
|
22
|
+
|
|
23
|
+
function anyNode(value)
|
|
24
|
+
return Rooibos.Common.isSGNode(value)
|
|
25
|
+
end function
|
|
26
|
+
|
|
27
|
+
|
|
28
28
|
end namespace
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
namespace rooibos
|
|
2
|
-
class RuntimeConfig
|
|
3
|
-
|
|
4
|
-
function getVersionText()
|
|
5
|
-
end function
|
|
6
|
-
|
|
7
|
-
function getRuntimeConfig()
|
|
8
|
-
end function
|
|
9
|
-
|
|
10
|
-
function getTestSuiteClassWithName(name)
|
|
11
|
-
end function
|
|
12
|
-
|
|
13
|
-
function getAllTestSuitesNames()
|
|
14
|
-
end function
|
|
15
|
-
|
|
16
|
-
function getIgnoredTestInfo()
|
|
17
|
-
end function
|
|
18
|
-
|
|
19
|
-
end class
|
|
1
|
+
namespace rooibos
|
|
2
|
+
class RuntimeConfig
|
|
3
|
+
|
|
4
|
+
function getVersionText()
|
|
5
|
+
end function
|
|
6
|
+
|
|
7
|
+
function getRuntimeConfig()
|
|
8
|
+
end function
|
|
9
|
+
|
|
10
|
+
function getTestSuiteClassWithName(name)
|
|
11
|
+
end function
|
|
12
|
+
|
|
13
|
+
function getAllTestSuitesNames()
|
|
14
|
+
end function
|
|
15
|
+
|
|
16
|
+
function getIgnoredTestInfo()
|
|
17
|
+
end function
|
|
18
|
+
|
|
19
|
+
end class
|
|
20
20
|
end namespace
|
|
@@ -1,46 +1,46 @@
|
|
|
1
|
-
namespace rooibos
|
|
2
|
-
class Stats
|
|
3
|
-
public time = 0
|
|
4
|
-
public ranCount = 0
|
|
5
|
-
public passedCount = 0
|
|
6
|
-
public failedCount = 0
|
|
7
|
-
public crashedCount = 0
|
|
8
|
-
public ignoredCount = 0
|
|
9
|
-
public ignoredTestNames = []
|
|
10
|
-
public hasFailures = false
|
|
11
|
-
public testResult = invalid
|
|
12
|
-
|
|
13
|
-
function new()
|
|
14
|
-
end function
|
|
15
|
-
|
|
16
|
-
function merge(other) as void
|
|
17
|
-
m.time += other.time
|
|
18
|
-
m.ranCount += other.ranCount
|
|
19
|
-
m.passedCount += other.passedCount
|
|
20
|
-
m.failedCount += other.failedCount
|
|
21
|
-
m.crashedCount += other.crashedCount
|
|
22
|
-
m.ignoredCount += other.ignoredCount
|
|
23
|
-
m.ignoredTestNames.append(other.IgnoredTestNames)
|
|
24
|
-
m.onUpdate()
|
|
25
|
-
end function
|
|
26
|
-
|
|
27
|
-
function appendTestResult(result)
|
|
28
|
-
m.time += result.time
|
|
29
|
-
m.ranCount++
|
|
30
|
-
if result.isCrash
|
|
31
|
-
m.crashedCount++
|
|
32
|
-
else if result.isFail
|
|
33
|
-
m.failedCount++
|
|
34
|
-
else
|
|
35
|
-
m.passedCount++
|
|
36
|
-
end if
|
|
37
|
-
|
|
38
|
-
m.onUpdate()
|
|
39
|
-
end function
|
|
40
|
-
|
|
41
|
-
function onUpdate()
|
|
42
|
-
m.hasFailures = m.failedCount > 0 or m.crashedCount > 0
|
|
43
|
-
end function
|
|
44
|
-
|
|
45
|
-
end class
|
|
1
|
+
namespace rooibos
|
|
2
|
+
class Stats
|
|
3
|
+
public time = 0
|
|
4
|
+
public ranCount = 0
|
|
5
|
+
public passedCount = 0
|
|
6
|
+
public failedCount = 0
|
|
7
|
+
public crashedCount = 0
|
|
8
|
+
public ignoredCount = 0
|
|
9
|
+
public ignoredTestNames = []
|
|
10
|
+
public hasFailures = false
|
|
11
|
+
public testResult = invalid
|
|
12
|
+
|
|
13
|
+
function new()
|
|
14
|
+
end function
|
|
15
|
+
|
|
16
|
+
function merge(other) as void
|
|
17
|
+
m.time += other.time
|
|
18
|
+
m.ranCount += other.ranCount
|
|
19
|
+
m.passedCount += other.passedCount
|
|
20
|
+
m.failedCount += other.failedCount
|
|
21
|
+
m.crashedCount += other.crashedCount
|
|
22
|
+
m.ignoredCount += other.ignoredCount
|
|
23
|
+
m.ignoredTestNames.append(other.IgnoredTestNames)
|
|
24
|
+
m.onUpdate()
|
|
25
|
+
end function
|
|
26
|
+
|
|
27
|
+
function appendTestResult(result)
|
|
28
|
+
m.time += result.time
|
|
29
|
+
m.ranCount++
|
|
30
|
+
if result.isCrash
|
|
31
|
+
m.crashedCount++
|
|
32
|
+
else if result.isFail
|
|
33
|
+
m.failedCount++
|
|
34
|
+
else
|
|
35
|
+
m.passedCount++
|
|
36
|
+
end if
|
|
37
|
+
|
|
38
|
+
m.onUpdate()
|
|
39
|
+
end function
|
|
40
|
+
|
|
41
|
+
function onUpdate()
|
|
42
|
+
m.hasFailures = m.failedCount > 0 or m.crashedCount > 0
|
|
43
|
+
end function
|
|
44
|
+
|
|
45
|
+
end class
|
|
46
46
|
end namespace
|
|
@@ -47,10 +47,11 @@ class TestGroup extends TestSuite_1.TestBlock {
|
|
|
47
47
|
try {
|
|
48
48
|
let func = this.testSuite.classStatement.methods.find((m) => m.name.text.toLowerCase() === testCase.funcName.toLowerCase());
|
|
49
49
|
func.walk(brighterscript.createVisitor({
|
|
50
|
-
ExpressionStatement: (expressionStatement) => {
|
|
50
|
+
ExpressionStatement: (expressionStatement, parent, owner) => {
|
|
51
51
|
let callExpression = expressionStatement.expression;
|
|
52
52
|
if (brighterscript.isCallExpression(callExpression) && brighterscript.isDottedGetExpression(callExpression.callee)) {
|
|
53
53
|
let dge = callExpression.callee;
|
|
54
|
+
let isSub = (0, brighterscript_1.isFunctionExpression)(callExpression.parent.parent.parent) && callExpression.parent.parent.parent.functionType.kind === brighterscript_1.TokenKind.Sub;
|
|
54
55
|
let assertRegex = /(?:fail|assert(?:[a-z0-9]*)|expect(?:[a-z0-9]*)|stubCall)/i;
|
|
55
56
|
if (dge && assertRegex.test(dge.name.text)) {
|
|
56
57
|
if (dge.name.text === 'stubCall') {
|
|
@@ -65,7 +66,7 @@ class TestGroup extends TestSuite_1.TestBlock {
|
|
|
65
66
|
(0, Utils_1.overrideAstTranspile)(editor, expressionStatement, '\n' + (0, undent_1.default) `
|
|
66
67
|
m.currentAssertLineNumber = ${callExpression.range.start.line}
|
|
67
68
|
${callExpression.transpile(transpileState).join('')}
|
|
68
|
-
${noEarlyExit ? '' :
|
|
69
|
+
${noEarlyExit ? '' : `if m.currentResult?.isFail = true then m.done() : return ${isSub ? '' : 'invalid'}`}
|
|
69
70
|
` + '\n');
|
|
70
71
|
}
|
|
71
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TestGroup.js","sourceRoot":"","sources":["../../../src/lib/rooibos/TestGroup.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"TestGroup.js","sourceRoot":"","sources":["../../../src/lib/rooibos/TestGroup.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,10 +16,10 @@ function overrideAstTranspile(editor, node, value) {
|
|
|
16
16
|
exports.overrideAstTranspile = overrideAstTranspile;
|
|
17
17
|
function addOverriddenMethod(file, annotation, target, name, source, editor) {
|
|
18
18
|
var _a;
|
|
19
|
-
let functionSource = `
|
|
20
|
-
function ${name}()
|
|
21
|
-
${source}
|
|
22
|
-
end function
|
|
19
|
+
let functionSource = `
|
|
20
|
+
function ${name}()
|
|
21
|
+
${source}
|
|
22
|
+
end function
|
|
23
23
|
`;
|
|
24
24
|
let { statements, diagnostics } = brighterscript.Parser.parse(functionSource, { mode: brighterscript.ParseMode.BrighterScript });
|
|
25
25
|
let error = '';
|