Merge pull request #7 from intersystems/coverage-aggregation-fix

Coverage aggregation fix

Author: timleavitt

.gitignore

@@ -1,3 +1,4 @@
 *.bak
 readme.txt
 .buildpath
+.vscode

.travis.yml

@@ -0,0 +1,48 @@
+language: minimal
+
+os: linux
+
+services:
+  - docker
+
+env:
+  - container_image="intersystemsdc/iris-community:2019.4.0.383.0-zpm"
+    instance="iris"
+    package="testcoverage"
+    build_flags="-verbose"
+    >
+    test_flags="-verbose -DUnitTest.ManagerClass=TestCoverage.Manager -DUnitTest.JUnitOutput=/source/junit.xml
+    -DUnitTest.FailuresAreFatal=1 -DUnitTest.Manager=TestCoverage.Manager
+    -DUnitTest.UserParam.CoverageReportClass=TestCoverage.Report.Cobertura.ReportGenerator
+    -DUnitTest.UserParam.CoverageReportFile=/source/coverage.xml"
+
+install:
+  # Run InterSystems IRIS instance
+  - docker pull $container_image
+  - docker run -d -h $instance --name $instance -v $TRAVIS_BUILD_DIR:/source --init $container_image
+  - echo halt > wait
+  - until docker exec --interactive $instance iris session $instance < wait; do sleep 1; done # Wait for instance to be ready
+  # Workaround for permissions issues in TestCoverage (creating directory for source export)
+  - chmod 777 $TRAVIS_BUILD_DIR
+
+script:
+  # Run build
+  - >
+    echo
+    "set good = ##class(%ZPM.PackageManager).Shell(\"load /source $build_flags\")
+    write !
+    if good<1 { do \$System.Process.Terminate(\$job,1) }
+    halt" > build
+  # Run tests (with workaround for https://github.com/intersystems-community/zpm/pull/30 - test result will always be index 1)
+  - >
+    echo
+    "set ^||%UnitTest.Manager.LastResult = 1
+    set good = ##class(%ZPM.PackageManager).Shell(\"$package test -only $test_flags\")
+    write !
+    if good<1 { do \$System.Process.Terminate(\$job,1) }
+    halt" > test
+  - docker exec --interactive $instance iris session $instance -B < build && docker exec --interactive $instance iris session $instance -B < test
+
+after_success:
+  # Publish to codecov
+  - bash <(curl -s https://codecov.io/bash)

cls/TestCoverage/Data/Coverage.cls

@@ -11,7 +11,7 @@ Index MeaningfulCoverageData On (Run, Calculated, Ignore, Hash, TestPath) [ Data
 Property Run As TestCoverage.Data.Run [ Required ];
 
 /// Path through test cases/suites
-Property TestPath As %String(MAXLEN = 300, TRUNCATE = 1) [ Required ];
+Property TestPath As %String(COLLATION = "EXACT", MAXLEN = 300, TRUNCATE = 1) [ Required ];
 
 /// Target code unit, uniquely identified by hash.
 Property Hash As TestCoverage.Data.CodeUnit [ Required ];
@@ -118,7 +118,6 @@ ClassMethod GetAvailableMetrics() As %List [ CodeMode = objectgenerator ]
 	Quit $$$OK
 }
 
-/// List of 
 Storage Default
 {
 <Data name="CoverageDefaultData">
@@ -161,13 +160,11 @@ Storage Default
 </Data>
 <DataLocation>^TestCoverage.Data.CoverageD</DataLocation>
 <DefaultData>CoverageDefaultData</DefaultData>
-<Description>
-<![CDATA[List of ]]></Description>
+<Description></Description>
 <IdLocation>^TestCoverage.Data.CoverageD</IdLocation>
 <IndexLocation>^TestCoverage.Data.CoverageI</IndexLocation>
 <StreamLocation>^TestCoverage.Data.CoverageS</StreamLocation>
 <Type>%Library.CacheStorage</Type>
 }
 
 }
-

cls/TestCoverage/Data/Run.cls

@@ -30,6 +30,7 @@ Property Detail As TestCoverage.DataType.Detail;
 /// Given .INT code coverage for a test run, maps it to .CLS/.MAC.
 ClassMethod MapRunCoverage(pRunIndex As %Integer) As %Status
 {
+	Set tCursorOpen = 0
 	Set tSC = $$$OK
 	Try {
 		Set tRun = ##class(TestCoverage.Data.Run).%OpenId(pRunIndex,,.tSC)
@@ -57,15 +58,17 @@ ClassMethod MapRunCoverage(pRunIndex As %Integer) As %Status
 
 		// Here's a worse-performing approach with some extrinsic calls that ideally wouldn't be necessary:
 		&SQL(
-			INSERT OR UPDATE %NOLOCK %NOCHECK INTO TestCoverage_Data.Coverage
-				(Run,Hash,TestPath,CoveredLines,Ignore)
-			SELECT :pRunIndex,map.ToHash,%exact source.TestPath,TestCoverage.BITWISE_OR(
+			/* INSERT OR UPDATE %NOLOCK %NOCHECK INTO TestCoverage_Data.Coverage
+				(Run,Hash,TestPath,CoveredLines,Ignore) */
+			DECLARE C0 CURSOR FOR
+			SELECT map.ToHash,source.TestPath,TestCoverage.BITWISE_OR(
 				TestCoverage.LIST_TO_BIT(%DLIST(
 					CASE TestCoverage.BIT_VALUE(source.CoveredLines,map.FromLine)
 					WHEN 1 THEN map.ToLine
 					ELSE NULL END)),oldCoverage.CoveredLines),
 				map.ToHash->Generated
-			FROM TestCoverage_Data.Coverage source
+			INTO :hToHash, :hTestPath, :hCoveredLines, :hIgnore
+			FROM %NOPARALLEL TestCoverage_Data.Coverage source
 			JOIN TestCoverage_Data.CodeUnitMap map
 				ON source.Hash = map.FromHash
 			LEFT JOIN TestCoverage_Data.Coverage oldCoverage
@@ -76,9 +79,33 @@ ClassMethod MapRunCoverage(pRunIndex As %Integer) As %Status
 				AND source.Ignore = 0
 				AND source.Calculated = 0
 			GROUP BY map.ToHash,source.TestPath)
+
+		&sql(OPEN C0)
 		If (SQLCODE < 0) {
 			Throw ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE,%msg)
 		}
+		Set tCursorOpen = 1
+
+		For {
+			&SQL(FETCH C0)
+			If (SQLCODE < 0) {
+				Throw ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE,%msg)
+			} ElseIf (SQLCODE) {
+				Quit
+			}
+			If ##class(TestCoverage.Data.Coverage).UniqueCoverageDataExists(pRunIndex,hToHash,hTestPath,.tID) {
+				Set tCoverage = ##class(TestCoverage.Data.Coverage).%OpenId(tID,,.tSC)
+				$$$ThrowOnError(tSC)
+			} Else {
+				Set tCoverage = ##class(TestCoverage.Data.Coverage).%New()
+				Do tCoverage.RunSetObjectId(pRunIndex)
+				Do tCoverage.HashSetObjectId(hToHash)
+				Set tCoverage.TestPath = hTestPath
+			}
+			Set tCoverage.Ignore = hIgnore
+			Set tCoverage.CoveredLines = $BitLogic(tCoverage.CoveredLines|hCoveredLines)
+			$$$ThrowOnError(tCoverage.%Save())
+		}
 
 		// Copy any other metrics captured/requested as well.
 		For i=1:1:tRun.Metrics.Count() {
@@ -117,6 +144,9 @@ ClassMethod MapRunCoverage(pRunIndex As %Integer) As %Status
 	} Catch e {
 		Set tSC = e.AsStatus()
 	}
+	If tCursorOpen {
+		&sql(CLOSE C0)
+	}
 	Quit tSC
 }
 
@@ -161,4 +191,3 @@ Storage Default
 }
 
 }
-

cls/TestCoverage/UI/ResultDetailViewer.cls

@@ -17,7 +17,7 @@ XData Contents [ XMLNamespace = "http://www.intersystems.com/zen" ]
 <vgroup width="80%" align="center">
 <hgroup align="left" enclosingClass="box" cellAlign="even">
 <vgroup labelPosition="left">
-<tc:select id="testPath" label="Test Path" sql="select distinct %exact TestPath from TestCoverage_Data.Coverage where Run = ? and Hash = ?" onchange="zenPage.testFilterChanged(zenThis)">
+<tc:select id="testPath" label="Test Path" sql="select distinct TestPath from TestCoverage_Data.Coverage where Run = ? and Hash = ?" onchange="zenPage.testFilterChanged(zenThis)">
 <parameter value="#(%page.testIndex)#" />
 <parameter value="#(%page.codeUnit)#" />
 </tc:select>
@@ -65,4 +65,3 @@ ClientMethod onloadHandler() [ Language = javascript ]
 }
 
 }
-

cls/TestCoverage/UI/SimpleResultViewer.cls

@@ -18,14 +18,14 @@ XData Contents [ XMLNamespace = "http://www.intersystems.com/zen" ]
 <hgroup align="left" enclosingClass="box" cellAlign="even">
 <vgroup labelPosition="left">
 <tc:select id="testIndex" label="Test Index" sql="select distinct Run from TestCoverage_Data.Coverage order by Run desc" onchange="zenPage.testFilterChanged(zenThis)" />
-<tc:select id="testPath" label="Test Path" sql="select distinct %exact TestPath from TestCoverage_Data.Coverage where Run = ?" onchange="zenPage.testFilterChanged(zenThis)">
+<tc:select id="testPath" label="Test Path" sql="select distinct TestPath from TestCoverage_Data.Coverage where Run = ?" onchange="zenPage.testFilterChanged(zenThis)">
 <parameter value="#(%page.testIndex)#" />
 </tc:select>
 
 <spacer height="25px" />
 
 <tc:select id="codeCovered" label="Code Unit"
-	sql="select distinct %exact Hash,Hash->Name||'.'||Hash->Type
+	sql="select distinct Hash,Hash->Name||'.'||Hash->Type
 			from TestCoverage_Data.Coverage d,(select ? as Run, ? as TestPath) params
 			where d.Run = params.Run
 				and (params.TestPath is null or params.TestPath = d.TestPath)

internal/testing/unit_tests/UnitTest/TestCoverage/Unit/coverage.list

@@ -0,0 +1,2 @@
+TestCoverage.PKG
+-TestCoverage.UI.PKG

module.xml

@@ -2,14 +2,14 @@
 <Export generator="Cache" version="25">
 <Document name="TestCoverage.ZPM"><Module>
   <Name>TestCoverage</Name>
-  <Version>2.1.0</Version>
+  <Version>2.1.1</Version>
   <Packaging>module</Packaging>
   <Resources>
     <Resource Name="TestCoverage.PKG">
     </Resource>
-    <Resource Name="TestCoverage.DataType.PKG" Deploy="false">
+    <Resource Name="TestCoverage.DataType.PKG">
     </Resource>
-    <Resource Name="TestCoverage.Utils.LineByLineMonitor.CLS" Deploy="true">
+    <Resource Name="TestCoverage.Utils.LineByLineMonitor.CLS">
     </Resource>
     <Resource Name="TestCoverage.INC">
     </Resource>