Merge pull request #271 from georgejecook/bugfix/codecoverage-missing…

…-expected-lines

bsc-plugin/package.json

@@ -27,7 +27,7 @@
         "@types/node": "^14.18.41",
         "@typescript-eslint/eslint-plugin": "^5.27.0",
         "@typescript-eslint/parser": "^5.27.0",
-        "brighterscript": "^0.65.15",
+        "brighterscript": "^0.65.22",
         "chai": "^4.2.0",
         "chai-subset": "^1.6.0",
         "coveralls": "^3.0.0",

bsc-plugin/src/lib/rooibos/CodeCoverageProcessor.ts

@@ -157,8 +157,11 @@ export class CodeCoverageProcessor {
             }
         }), { walkMode: WalkMode.visitAllRecursive });
 
-
-        this.expectedCoverageMap[this.fileId.toString().trim()] = Array.from(this.coverageMap);
+        const coverageMapObject = {};
+        for (let key of this.coverageMap.keys()) {
+            coverageMapObject[key] = this.coverageMap.get(key);
+        }
+        this.expectedCoverageMap[this.fileId.toString().trim()] = coverageMapObject;
         this.filePathMap[this.fileId] = file.pkgPath;
         this.addBrsAPIText(file, astEditor);
     }
@@ -188,6 +191,7 @@ export class CodeCoverageProcessor {
     }
 
     private getFuncCallText(lineNumber: number, lineType: CodeCoverageLineType) {
+        this.coverageMap.set(lineNumber, lineType);
         return `RBS_CC_${this.fileId}_reportLine("${lineNumber.toString().trim()}", ${lineType.toString().trim()})`;
     }
 }

bsc-plugin/src/plugin.spec.ts

@@ -372,7 +372,8 @@ describe('RooibosPlugin', () => {
                 sub main()
                     Rooibos_init("RooibosScene")
                     print "hello"
-                end sub'//# sourceMappingURL=./test.spec.bs.map
+                end sub
+                '//# sourceMappingURL=./test.spec.brs.map
             `, [
                 // print "h|ello" => print |"hello"
                 { dest: [2, 12], src: [2, 26] }
@@ -408,7 +409,8 @@ describe('RooibosPlugin', () => {
                     instance = __ATest_builder()
                     instance.new()
                     return instance
-                end function'//# sourceMappingURL=./test.spec.bs.map
+                end function
+                '//# sourceMappingURL=./test.spec.brs.map
             `, [
                 // m.assert|Equal("123", ("alpha-" + bslib_toString(number) + "-beta"))    =>    m.|assertEqual("123", `alpha-${number}-beta`)
                 { dest: [6, 16], src: [8, 26] },

tests/bsconfig.json

@@ -32,7 +32,8 @@
     "failFast": false,
     "sendHomeOnFinish": false,
     "keepAppOpen": true,
-    "isGlobalMethodMockingEnabled": true
+    "isGlobalMethodMockingEnabled": true,
+    "isRecordingCodeCoverage": false
   },
   "sourceMap": true
 }

tests/package.json

@@ -7,7 +7,7 @@
     "watch": "npx bsc --project bsconfig.json --watch"
   },
   "devDependencies": {
-    "brighterscript": "^0.65.15",
+    "brighterscript": "^0.65.22",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.4"
   },

tests/src/source/CodeCoverage.bs

@@ -0,0 +1,36 @@
+function hitAllStatements() as dynamic
+  loopCount = 0
+  for i = 0 to 10
+      loopCount++
+  end for
+
+  tryAgain:
+  if loopCount = 11 then
+      loopCount++
+      goto tryAgain
+  else if loopCount = 12 then
+      loopCount++
+      goto tryAgain
+  else
+      loopCount++
+  end if
+
+  while loopCount > 0
+      loopCount--
+      if loopCount = 1 then
+          exit while
+      end if
+  end while
+
+  obj = {
+      one: 1
+  }
+  obj["two"] = 2
+  obj.three = 3
+
+  for each key in obj
+      print obj[key]
+  end for
+
+  return false
+end function