Fixed duplicate cur line injections (#267)

rokucommunity · Feb 8, 2024 · f2f9618 · f2f9618
1 parent a360bd8
commit f2f9618
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 20 deletions.
diff --git a/bsc-plugin/src/plugin.spec.ts b/bsc-plugin/src/plugin.spec.ts
@@ -189,17 +189,17 @@ describe('RooibosPlugin', () => {
 
         it('ignores a test', () => {
             program.setFile('source/test.spec.bs', `
-            @suite
-            class ATest
-            @describe("groupA")
+                @suite
+                class ATest
+                    @describe("groupA")
 
-            @ignore
-            @it("is test1")
+                    @ignore
+                    @it("is test1")
                     function Test()
                     end function
 
-                    end class
-                    `);
+                end class
+            `);
             program.validate();
             expect(program.getDiagnostics()).to.be.empty;
             expect(plugin.session.sessionInfo.groupsCount).to.equal(1);
@@ -210,21 +210,21 @@ describe('RooibosPlugin', () => {
             program.setFile('source/test.spec.bs', `
                 @suite
                 class ATest
-                @describe("groupA")
+                    @describe("groupA")
 
-                @it("is test1")
-                function Test_1()
-                end function
+                    @it("is test1")
+                    function Test_1()
+                    end function
 
-                @describe("groupB")
+                    @describe("groupB")
 
-                @it("is test1")
-                function Test_2()
-                end function
+                    @it("is test1")
+                    function Test_2()
+                    end function
 
-                @it("is test2")
-                function Test_3()
-                end function
+                    @it("is test2")
+                    function Test_3()
+                    end function
 
                 end class
             `);
@@ -1614,6 +1614,58 @@ describe('RooibosPlugin', () => {
             });
         });
 
+        describe('currentAssertLineNumber transpilation', () => {
+            it('correctly transpiles currentAssertLineNumber with out duplications', async () => {
+                program.setFile('source/test.spec.bs', `
+                    @suite
+                    class ATest
+                        '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                        @describe("tests AssertArrayContainsOnlyValuesOfType")
+                        '+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+                        @it("pass")
+                        @params(["one", "two", "three"], "String")
+                        @params([1, 2, 3], "Integer")
+                        @params([true, true, false], "Boolean")
+                        @params([[true, true], [false, false]], "Array")
+                        @params([{ "test": 1 }, { "test": 1 }], "AssociativeArray")
+                        function _(values, typeName)
+
+                            m.assertArrayContainsOnlyValuesOfType(values, typeName)
+                            isFail = m.currentResult.isFail
+
+                            m.currentResult.Reset()
+
+                            m.assertFalse(isFail)
+
+                        end function
+                    end class
+                `);
+                program.validate();
+                expect(program.getDiagnostics()).to.be.empty;
+                expect(plugin.session.sessionInfo.testSuitesToRun).to.not.be.empty;
+                await builder.transpile();
+                expect(
+                    getTestFunctionContents()
+                ).to.eql(undent`
+                    m.currentAssertLineNumber = 15
+                    m.assertArrayContainsOnlyValuesOfType(values, typeName)
+                    if m.currentResult?.isFail = true then
+                        m.done()
+                        return invalid
+                    end if
+                    isFail = m.currentResult.isFail
+                    m.currentResult.Reset()
+                    m.currentAssertLineNumber = 20
+                    m.assertFalse(isFail)
+                    if m.currentResult?.isFail = true then
+                        m.done()
+                        return invalid
+                    end if
+                `);
+            });
+        });
+
         describe('expectNotCalled transpilation', () => {
             it('correctly transpiles call funcs', async () => {
                 program.setFile('source/test.spec.bs', `
@@ -2210,7 +2262,7 @@ function getContents(filename: string) {
 function getTestFunctionContents() {
     const contents = getContents('test.spec.brs');
 
-    let [, result] = /instance.[\w_]+\s?\= function\(\)\s?([\S\s]*|.*)(?=^\s*end function\s+instance\.)/img.exec(contents);
+    let [, result] = /instance.[\w_]+\s?\= function\((?:[\w,\s]*)\)\s?([\S\s]*|.*)(?=^\s*end function\s+instance\.)/img.exec(contents);
 
     return undent(result);
 }

diff --git a/bsc-plugin/src/plugin.ts b/bsc-plugin/src/plugin.ts
@@ -154,10 +154,16 @@ export class RooibosPlugin implements CompilerPlugin {
                 console.warn(`WARNING: testSuite "${testSuite.name}" is marked as noEarlyExit`);
             }
 
+            const modifiedTestCases = new Set();
             testSuite.addDataFunctions(event.editor as any);
             for (let group of [...testSuite.testGroups.values()].filter((tg) => tg.isIncluded)) {
                 for (let testCase of [...group.testCases.values()].filter((tc) => tc.isIncluded)) {
-                    group.modifyAssertions(testCase, noEarlyExit, event.editor as any, this.session.namespaceLookup, scope);
+                    let caseName = group.testSuite.generatedNodeName + group.file.pkgPath + testCase.funcName;
+                    if (!modifiedTestCases.has(caseName)) {
+                        group.modifyAssertions(testCase, noEarlyExit, event.editor as any, this.session.namespaceLookup, scope);
+                        modifiedTestCases.add(caseName);
+                    }
+
                 }
             }
         }