style: addressed Tim's comments on pr 37 (and simplified the sql statement)

Author: isc-cge

cls/TestCoverage/Data/CodeUnit.cls

@@ -251,38 +251,24 @@ Method UpdatePyExecutableLines(pName As %String, ByRef pPyCodeUnit) As %Status
 
 			Set tFromHash = pPyCodeUnit.Hash
 			Set tToHash = ..Hash 
-			
-			&sql(
-				DECLARE C1 CURSOR FOR
-				SELECT map.ToLine
-				INTO :hToLine
-				FROM TestCoverage_Data.CodeUnitMap map 
-				JOIN TestCoverage_Data.CodeUnit fromCodeUnit 
-				ON map.FromHash = fromCodeUnit.Hash 
-				JOIN TestCoverage_Data.CodeUnit toCodeUnit 
-				ON map.ToHash = toCodeUnit.Hash 
-				AND fromCodeUnit.Hash = :tFromHash
-				AND toCodeUnit.Hash = :tToHash
-				WHERE TestCoverage.BIT_VALUE(fromCodeUnit.ExecutableLines,map.FromLine) <> 0
-				)
-			&sql(OPEN C1)
-			If (SQLCODE < 0) {
-				Throw ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE,%msg)
+			set sql = "SELECT map.ToLine FROM TestCoverage_Data.CodeUnitMap map " _ 
+			"JOIN TestCoverage_Data.CodeUnit fromCodeUnit " _ 
+			"ON fromCodeUnit.Hash = map.FromHash " _ 
+			"WHERE map.FromHash =  ? " _ 
+			"AND map.ToHash = ? " _ 
+			"AND TestCoverage.BIT_VALUE(fromCodeUnit.ExecutableLines,map.FromLine) <> 0"
+		
+			set resultSet = ##class(%SQL.Statement).%ExecDirect(, sql, tFromHash, tToHash)
+			If (resultSet.%SQLCODE < 0) {
+				Throw ##class(%Exception.SQL).CreateFromSQLCODE(resultSet.%SQLCODE, resultSet.%Message)
 			}
-			For {
-				&SQL(FETCH C1)
-				If (SQLCODE < 0) {
-					Throw ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE,%msg)
-				} ElseIf (SQLCODE) {
-					Quit
-				}
-				// Process the fetched rows
-				// hToLine contains the line number in the .cls file corresponding to executable lines in the .py file
+			while resultSet.%Next(.tSC) {
+				$$$ThrowOnError(tSC)
+				Set hToLine = resultSet.%GetData(1)
 				Set $Bit(tBitString, hToLine) = 1
 			}
-			&sql(CLOSE C1)
-			If (SQLCODE < 0) {
-				Throw ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE,%msg)
+			If (resultSet.%SQLCODE < 0) {
+				Throw ##class(%Exception.SQL).CreateFromSQLCODE(resultSet.%SQLCODE, resultSet.%Message)
 			}
 		}
 		Set ..ExecutableLines = $BITLOGIC(..ExecutableLines | tBitString)
@@ -362,8 +348,6 @@ Method UpdateSourceMap(pSourceNamespace As %String, ByRef pCache) As %Status
 				Set tMethodName = tMethod
 				Set tFullMap(tMethodStart) = $lb("CLS", tClass,tMethodName, -1, -1) ; -1 because the class 
 				; definition doesn't have the +1 offset from the { 
-
-				Do ..MethodMap.GetNext(.tMethod)
 				For i = tMethodStart+1:1:tMethodEnd {
 					Set tClassLineNum = i-tMethodStart
 					Set tFullMap(i) = $lb("CLS", tClass,tMethodName, tClassLineNum, tClassLineNum)
@@ -375,6 +359,7 @@ Method UpdateSourceMap(pSourceNamespace As %String, ByRef pCache) As %Status
 						Set tSC = $$$ERROR($$$GeneralError,"Compiled .py code doesn't match .CLS python code ")
 					}
 				}
+				Do ..MethodMap.GetNext(.tMethod)
 			}
 		}
 

cls/TestCoverage/Data/Coverage.cls

@@ -1,3 +1,5 @@
+Include TestCoverage
+
 IncludeGenerator TestCoverage
 
 Class TestCoverage.Data.Coverage Extends %Persistent
@@ -102,9 +104,9 @@ ClassMethod StoreIntCoverage(pRun As %Integer, pTestPath As %String, pName As %S
 		Else { // If pType = "PY"
 			//^IRIS.TEMP.TestCoveragePy(ClassName) contains the number of covered lines in this class
 			//^IRIS.TEMP.TestCoveragePy(ClassName, i) in increasing order contain the line numbers for the covered lines
-			if $Data(^IRIS.TEMP.TestCoveragePY(pName)) {
-				for i = 1:1:(^IRIS.TEMP.TestCoveragePY(pName)-1) {
-					Set tLineNumber = ^IRIS.TEMP.TestCoveragePY(pName, i)
+			if $Data($$$PyMonitorResults(pName)) {
+				for i = 1:1:($$$PyMonitorResults(pName)-1) {
+					Set tLineNumber = $$$PyMonitorResults(pName, i)
 					Set $Bit(tCoveredLines, tLineNumber) = 1
 				}
 			}

cls/TestCoverage/Utils.cls

@@ -431,9 +431,9 @@ ClassMethod GetClassLineExecutableFlags(pClassName As %String, ByRef pDocumentTe
 
 ClassMethod CodeArrayToList(ByRef pCodeArray, Output pDocumentText As %List)
 {
-	set pDocumentText = $lb()
-	for i=1:1:pCodeArray(0) {
-		set $list(pDocumentText, i) = pCodeArray(i)
+	set pDocumentText = ""
+	for i=1:1:$get(pCodeArray(0)) {
+		set pDocumentText = pDocumentText _ $ListBuild(pCodeArray(i))
 	}
 	quit
 }

cls/TestCoverage/Utils/LineByLineMonitor.cls

@@ -1,4 +1,4 @@
-Include %occErrors
+Include (%occErrors, TestCoverage)
 
 /// Wrapper around %Monitor.System.LineByLine to ensure that the monitor is stopped when it should be, and also
 /// to wrap the decision about whether to stop/start the monitor or to just clear counters.
@@ -70,8 +70,7 @@ ClassMethod PyStartWithScope(pCoverageClasses As %List) [ Language = python ]
 		# extracts the line number 
 		line_no = frame.f_lineno 
 		if class_name in tCoverageClasses and line_no != 1: # if this is in a covered class 
-			# print(f"A {event} encountered in {func_name}() in class {class_name} at line number {line_no}")
-			tGlob = iris.gref('^IRIS.TEMP.TestCoveragePY')
+			tGlob = iris.gref('^IRIS.TEMP.TestCoveragePY') # python doesn't have macros -- this is $$$PyMonitorResults
 			curId = tGlob.get([class_name])
 			if not curId:
 				tGlob[class_name] = 1
@@ -84,7 +83,7 @@ ClassMethod PyStartWithScope(pCoverageClasses As %List) [ Language = python ]
 
 ClassMethod PyClearCounters()
 {
-	Kill ^IRIS.TEMP.TestCoveragePY
+	Kill $$$PyMonitorResults
 }
 
 ClassMethod PyStop() [ Language = python ]

inc/TestCoverage.inc

@@ -3,3 +3,4 @@ ROUTINE TestCoverage [Type=INC]
 #define StopTimer If (..Display["log") { Write ($zh-tStartTime)," seconds" }
 #define METRICS "RtnLine","Time","TotalTime"
 #define TestPathAllTests "all tests"
+#define PyMonitorResults ^IRIS.TEMP.TestCoveragePY