Merge branch 'master' into feature/runtime-global-function-mocking

Author: chrisdp

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

@@ -102,8 +102,8 @@ export class FileFactory {
 
     public createCoverageComponent(program: Program, coverageMap: any, filepathMap: Map<number, string>) {
         let template = this.coverageComponentBrsTemplate;
-        template = template.replace(/\#EXPECTED_MAP\#/g, JSON.stringify(coverageMap ?? {}));
-        template = template.replace(/\#FILE_PATH_MAP\#/g, JSON.stringify(filepathMap ?? {}));
+        template = template.replace(/\"\#EXPECTED_MAP\#\"/g, JSON.stringify(coverageMap ?? {}));
+        template = template.replace(/\"\#FILE_PATH_MAP\#\"/g, JSON.stringify(filepathMap ?? {}));
 
         this.addFileToRootDir(program, path.join('components/rooibos', 'CodeCoverage.brs'), template);
         this.addFileToRootDir(program, path.join('components/rooibos', 'CodeCoverage.xml'), this.coverageComponentXmlTemplate);

bsc-plugin/src/plugin.ts

@@ -105,7 +105,6 @@ export class RooibosPlugin implements CompilerPlugin {
 
         const defaultGlobalMethodMockingExcluded = [
             '**/*.spec.bs',
-            '**/roku_modules/**/*',
             '**/source/main.bs',
             '**/source/rooibos/**/*'
         ];

framework/src/source/CodeCoverage.brs

@@ -6,15 +6,15 @@ function init()
 end function
 
 function setExpectedMap()
-  m.top.expectedMap = #EXPECTED_MAP#
+  m.top.expectedMap = "#EXPECTED_MAP#"
 end function
 
 function setFilePathMap()
-  m.top.filePathMap = #FILE_PATH_MAP#
+  m.top.filePathMap = "#FILE_PATH_MAP#"
 end function
 
 function onEntryChange()
-entry = m.top.entry
+  entry = m.top.entry
   if entry <> invalid
     lineMap = m.resolvedMap[entry.f]
 

framework/src/source/CodeCoverageSupport.brs

@@ -22,7 +22,7 @@ function RBS_ReportCodeCoverage() as void
         resolvedCount = cc.resolvedMap[key].count()
         allLinesHit += resolvedCount
         resolvedPercent = (resolvedCount / expectedCount) * 100
-        hitFiles.push({percent:resolvedPercent, text:filename + ": " +str(resolvedPercent).trim() + "% (" + stri(resolvedCount).trim() + "/" + stri(expectedCount).trim() + ")"})
+        hitFiles.push({ percent: resolvedPercent, text: filename + ": " + str(resolvedPercent).trim() + "% (" + stri(resolvedCount).trim() + "/" + stri(expectedCount).trim() + ")" })
       else
         missFiles.push(filename + ": MISS!")
       end if
@@ -41,13 +41,13 @@ function RBS_ReportCodeCoverage() as void
   ? "HIT FILES"
   ? "---------"
   hitFiles.SortBy("percent")
-  for i = 0 to hitFiles.count() -1
+  for i = 0 to hitFiles.count() - 1
     ? hitFiles[i].text
   end for
   ? ""
   ? "MISSED FILES"
   ? "------------"
-  for i = 0 to missFiles.count() -1
+  for i = 0 to missFiles.count() - 1
     ? missFiles[i]
   end for
 

framework/src/source/TestResult.bs

@@ -40,7 +40,7 @@ namespace rooibos
         end if
       end if
       if m.throwOnFailedAssertion
-         throw m.getMessage()
+        throw m.getMessage()
       end if
     end function