Fix JS errors with branchData property

amuraco · Nov 1, 2012 · 5130913 · 5130913
1 parent 3dd50ce
commit 5130913
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 0 deletions.
diff --git a/src/main/resources/header.js b/src/main/resources/header.js
@@ -4,6 +4,7 @@ try {
 
     if (! top.opener._$jscoverage) {
       top.opener._$jscoverage = {};
+      top.opener._$jscoverage.branchData = {};
     }
   }
 }
@@ -22,6 +23,7 @@ try {
 
     if (! top._$jscoverage) {
       top._$jscoverage = {};
+      top._$jscoverage.branchData = {};
     }
   }
 }

diff --git a/src/main/resources/jscoverage.js b/src/main/resources/jscoverage.js
@@ -68,6 +68,7 @@ function jscoverage_init(w) {
   if (! jscoverage_isInvertedMode) {
     if (! w._$jscoverage) {
       w._$jscoverage = {};
+      w._$jscoverage.branchData = {};
     }
   }
 }
@@ -496,6 +497,8 @@ function jscoverage_recalculateSummaryTab(cc) {
   var file;
   var files = [];
   for (file in cc) {
+    if (file === 'branchData')
+        continue;
     files.push(file);
   }
   if (files.length === 0)
@@ -1092,6 +1095,8 @@ function jscoverage_quote(s) {
 function jscoverage_serializeCoverageToJSON() {
   var json = [];
   for (var file in _$jscoverage) {
+    if (file === 'branchData')
+        continue;
     var coverage = _$jscoverage[file];
 
     var array = [];

diff --git a/src/main/resources/report.js b/src/main/resources/report.js
@@ -44,6 +44,8 @@ if (! window.jscoverage_report) {
     var json = [];
     for (var file in _$jscoverage) {
       var coverage = _$jscoverage[file];
+      if (file === 'branchData')
+          continue;
 
       var array = [];
       var length = coverage.length;

diff --git a/src/test-integration/java/jscover/instrument/InstrumenterIntegrationTest.java b/src/test-integration/java/jscover/instrument/InstrumenterIntegrationTest.java
@@ -375,6 +375,7 @@ public void shouldInstrumentForFileSystem() throws URISyntaxException {
 
         String expectedSource = IoUtils.loadFromClassPath("/test-instrumented-file-system.js");
         // assertThat(instrumentedSource, equalTo(expectedSource));
+        //IoUtils.copy(new StringReader(instrumentedSource), new File("src/test-integration/resources/test-instrumented-file-system.js"));
         assertEquals(expectedSource, instrumentedSource);//.replaceAll("\r\n","\n"));
     }
 
@@ -388,6 +389,7 @@ public void shouldInstrumentForServer() throws URISyntaxException {
 
         String expectedSource = IoUtils.loadFromClassPath("/test-instrumented-server.js");
         // assertThat(instrumentedSource, equalTo(expectedSource));
+        //IoUtils.copy(new StringReader(instrumentedSource), new File("src/test-integration/resources/test-instrumented-server.js"));
         assertEquals(expectedSource, instrumentedSource);//.replaceAll("\r\n","\n"));
     }
 

diff --git a/src/test-integration/resources/test-instrumented-file-system.js b/src/test-integration/resources/test-instrumented-file-system.js
@@ -4,6 +4,7 @@ try {
 
     if (! top.opener._$jscoverage) {
       top.opener._$jscoverage = {};
+      top.opener._$jscoverage.branchData = {};
     }
   }
 }
@@ -22,6 +23,7 @@ try {
 
     if (! top._$jscoverage) {
       top._$jscoverage = {};
+      top._$jscoverage.branchData = {};
     }
   }
 }

diff --git a/src/test-integration/resources/test-instrumented-server.js b/src/test-integration/resources/test-instrumented-server.js
@@ -44,6 +44,8 @@ if (! window.jscoverage_report) {
     var json = [];
     for (var file in _$jscoverage) {
       var coverage = _$jscoverage[file];
+      if (file === 'branchData')
+          continue;
 
       var array = [];
       var length = coverage.length;
@@ -89,6 +91,7 @@ try {
 
     if (! top.opener._$jscoverage) {
       top.opener._$jscoverage = {};
+      top.opener._$jscoverage.branchData = {};
     }
   }
 }
@@ -107,6 +110,7 @@ try {
 
     if (! top._$jscoverage) {
       top._$jscoverage = {};
+      top._$jscoverage.branchData = {};
     }
   }
 }