Update for git-source-control and latest IPM

isc-tleavitt · isc-tleavitt · commit 5c87af25a2a9 · 2023-11-30T13:02:55.000-05:00
This updates module.xml to follow modern IPM terse format and work properly with git-source-control (SourcesRoot / Directory attributes)
diff --git a/cls/TestCoverage/Data/Aggregate/ByCodeUnit.cls b/cls/TestCoverage/Data/Aggregate/ByCodeUnit.cls
@@ -50,7 +50,7 @@ Storage Default
 <IdLocation>^TestCoverage.Data.Agg.ByCUD</IdLocation>
 <IndexLocation>^TestCoverage.Data.Agg.ByCUI</IndexLocation>
 <StreamLocation>^TestCoverage.Data.Agg.ByCUS</StreamLocation>
-<Type>%Library.CacheStorage</Type>
+<Type>%Storage.Persistent</Type>
 }
 
 }
diff --git a/cls/TestCoverage/Data/Aggregate/ByRun.cls b/cls/TestCoverage/Data/Aggregate/ByRun.cls
@@ -43,7 +43,7 @@ Storage Default
 <IdLocation>^TestCoverage.Data.Agg.ByRunD</IdLocation>
 <IndexLocation>^TestCoverage.Data.Agg.ByRunI</IndexLocation>
 <StreamLocation>^TestCoverage.Data.Agg.ByRunS</StreamLocation>
-<Type>%Library.CacheStorage</Type>
+<Type>%Storage.Persistent</Type>
 }
 
 }
diff --git a/cls/TestCoverage/Data/CodeSubUnit.cls b/cls/TestCoverage/Data/CodeSubUnit.cls
@@ -32,7 +32,7 @@ Storage Default
 <IdLocation>^TestCoverage.Data.CodeUnitC("SubUnits")</IdLocation>
 <IndexLocation>^TestCoverage.Data.CodeSubUnitI</IndexLocation>
 <StreamLocation>^TestCoverage.Data.CodeSubUnitS</StreamLocation>
-<Type>%Library.CacheStorage</Type>
+<Type>%Storage.Persistent</Type>
 }
 
 }
diff --git a/cls/TestCoverage/Data/CodeSubUnit/Method.cls b/cls/TestCoverage/Data/CodeSubUnit/Method.cls
@@ -56,7 +56,7 @@ Storage Default
 </Value>
 </Data>
 <DefaultData>MethodDefaultData</DefaultData>
-<Type>%Library.CacheStorage</Type>
+<Type>%Storage.Persistent</Type>
 }
 
 }
diff --git a/cls/TestCoverage/Data/CodeUnit.cls b/cls/TestCoverage/Data/CodeUnit.cls
@@ -488,7 +488,7 @@ Storage Default
 <IdLocation>^TestCoverage.Data.CodeUnitD</IdLocation>
 <IndexLocation>^TestCoverage.Data.CodeUnitI</IndexLocation>
 <StreamLocation>^TestCoverage.Data.CodeUnitS</StreamLocation>
-<Type>%Library.CacheStorage</Type>
+<Type>%Storage.Persistent</Type>
 }
 
 }
diff --git a/cls/TestCoverage/Data/CodeUnitMap.cls b/cls/TestCoverage/Data/CodeUnitMap.cls
@@ -153,7 +153,7 @@ Storage Default
 <IdLocation>^TestCoverage.Data.CodeUnitMapD</IdLocation>
 <IndexLocation>^TestCoverage.Data.CodeUnitMapI</IndexLocation>
 <StreamLocation>^TestCoverage.Data.CodeUnitMapS</StreamLocation>
-<Type>%Library.CacheStorage</Type>
+<Type>%Storage.Persistent</Type>
 }
 
 }
diff --git a/cls/TestCoverage/Data/Coverage.cls b/cls/TestCoverage/Data/Coverage.cls
@@ -160,11 +160,11 @@ Storage Default
 </Data>
 <DataLocation>^TestCoverage.Data.CoverageD</DataLocation>
 <DefaultData>CoverageDefaultData</DefaultData>
-<Description></Description>
 <IdLocation>^TestCoverage.Data.CoverageD</IdLocation>
 <IndexLocation>^TestCoverage.Data.CoverageI</IndexLocation>
 <StreamLocation>^TestCoverage.Data.CoverageS</StreamLocation>
-<Type>%Library.CacheStorage</Type>
+<Type>%Storage.Persistent</Type>
 }
 
 }
+
diff --git a/cls/TestCoverage/Data/Run.cls b/cls/TestCoverage/Data/Run.cls
@@ -187,7 +187,8 @@ Storage Default
 <IdLocation>^TestCoverage.Data.RunD</IdLocation>
 <IndexLocation>^TestCoverage.Data.RunI</IndexLocation>
 <StreamLocation>^TestCoverage.Data.RunS</StreamLocation>
-<Type>%Library.CacheStorage</Type>
+<Type>%Storage.Persistent</Type>
 }
 
 }
+
diff --git a/cls/TestCoverage/UI/ResultDetailViewer.cls b/cls/TestCoverage/UI/ResultDetailViewer.cls
@@ -65,3 +65,4 @@ ClientMethod onloadHandler() [ Language = javascript ]
 }
 
 }
+
diff --git a/cls/TestCoverage/UI/Utils.cls b/cls/TestCoverage/UI/Utils.cls
@@ -1,7 +1,7 @@
 Class TestCoverage.UI.Utils
 {
 
-Query ColoredText(pTestIndex As %String, pCodeUnit As %String, pTestPath As %String = "") As %Query(ROWSPEC = "PlainText:%String,ColoredHTML:%String,Covered:%Boolean,Executable:%Boolean") [ SqlProc ]
+Query ColoredText(pTestIndex As %String, pCodeUnit As %String, pTestPath As %String = "") As %Query(ROWSPEC = "PlainText:%String,ColoredHTML:%String,Covered:%Boolean,Executable:%Boolean,LineNumber:%Integer") [ SqlProc ]
 {
 }
 
@@ -53,7 +53,7 @@ ClassMethod ColoredTextExecute(ByRef qHandle As %Binary, pTestIndex As %String,
 		For tLineNumber=1:1:tCodeUnit.Lines.Count() {
 			Set tText = tCodeUnit.Lines.GetAt(tLineNumber)
 			Do tCodeStream.WriteLine(tText)
-			Set $$$TempStorage($Increment($$$TempStorage)) = $ListBuild(tText,tText,$Bit(tCoveredLines,tLineNumber),$Bit(tCodeUnit.ExecutableLines,tLineNumber))
+			Set $$$TempStorage($Increment($$$TempStorage)) = $ListBuild(tText,tText,$Bit(tCoveredLines,tLineNumber),$Bit(tCodeUnit.ExecutableLines,tLineNumber),tLineNumber)
 		}
 		
 		// Color the code stream.
diff --git a/module.xml b/module.xml
@@ -2,21 +2,14 @@
 <Export generator="Cache" version="25">
 <Document name="TestCoverage.ZPM"><Module>
   <Name>TestCoverage</Name>
-  <Version>2.1.3</Version>
+  <Version>2.1.4</Version>
   <Description>Run your typical ObjectScript %UnitTest tests and see which lines of your code are executed. Includes Cobertura-style reporting for use in continuous integration tools.</Description>
   <Packaging>module</Packaging>
-  <Resources>
-    <Resource Name="TestCoverage.PKG">
-    </Resource>
-    <Resource Name="TestCoverage.DataType.PKG">
-    </Resource>
-    <Resource Name="TestCoverage.INC">
-    </Resource>
-    <Resource Name="/internal/testing/unit_tests/" ProcessorClass="UnitTest">
-      <Attribute Name="Package">UnitTest.TestCoverage.Unit</Attribute>
-      <Attribute Name="Phase">test</Attribute>
-    </Resource>
-  </Resources>
+  <Resource Name="TestCoverage.PKG" Directory="cls" />
+  <Resource Name="TestCoverage.DataType.PKG" Directory="cls" />
+  <Resource Name="TestCoverage.INC" Directory="inc" />
+  <UnitTest Name="/internal/testing/unit_tests/" Package="UnitTest.TestCoverage.Unit" Phase="test" />
   <LifecycleClass>Module</LifecycleClass>
+  <SourcesRoot>.</SourcesRoot>
 </Module>
 </Document></Export>

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ Storage Default`
`50`	`50`	`<IdLocation>^TestCoverage.Data.Agg.ByCUD</IdLocation>`
`51`	`51`	`<IndexLocation>^TestCoverage.Data.Agg.ByCUI</IndexLocation>`
`52`	`52`	`<StreamLocation>^TestCoverage.Data.Agg.ByCUS</StreamLocation>`
`53`		`-<Type>%Library.CacheStorage</Type>`
	`53`	`+<Type>%Storage.Persistent</Type>`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ Storage Default`
`43`	`43`	`<IdLocation>^TestCoverage.Data.Agg.ByRunD</IdLocation>`
`44`	`44`	`<IndexLocation>^TestCoverage.Data.Agg.ByRunI</IndexLocation>`
`45`	`45`	`<StreamLocation>^TestCoverage.Data.Agg.ByRunS</StreamLocation>`
`46`		`-<Type>%Library.CacheStorage</Type>`
	`46`	`+<Type>%Storage.Persistent</Type>`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ Storage Default`
`32`	`32`	`<IdLocation>^TestCoverage.Data.CodeUnitC("SubUnits")</IdLocation>`
`33`	`33`	`<IndexLocation>^TestCoverage.Data.CodeSubUnitI</IndexLocation>`
`34`	`34`	`<StreamLocation>^TestCoverage.Data.CodeSubUnitS</StreamLocation>`
`35`		`-<Type>%Library.CacheStorage</Type>`
	`35`	`+<Type>%Storage.Persistent</Type>`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ Storage Default`
`56`	`56`	`</Value>`
`57`	`57`	`</Data>`
`58`	`58`	`<DefaultData>MethodDefaultData</DefaultData>`
`59`		`-<Type>%Library.CacheStorage</Type>`
	`59`	`+<Type>%Storage.Persistent</Type>`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ Storage Default`
`488`	`488`	`<IdLocation>^TestCoverage.Data.CodeUnitD</IdLocation>`
`489`	`489`	`<IndexLocation>^TestCoverage.Data.CodeUnitI</IndexLocation>`
`490`	`490`	`<StreamLocation>^TestCoverage.Data.CodeUnitS</StreamLocation>`
`491`		`-<Type>%Library.CacheStorage</Type>`
	`491`	`+<Type>%Storage.Persistent</Type>`
`492`	`492`	`}`
`493`	`493`
`494`	`494`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ Storage Default`
`153`	`153`	`<IdLocation>^TestCoverage.Data.CodeUnitMapD</IdLocation>`
`154`	`154`	`<IndexLocation>^TestCoverage.Data.CodeUnitMapI</IndexLocation>`
`155`	`155`	`<StreamLocation>^TestCoverage.Data.CodeUnitMapS</StreamLocation>`
`156`		`-<Type>%Library.CacheStorage</Type>`
	`156`	`+<Type>%Storage.Persistent</Type>`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -160,11 +160,11 @@ Storage Default`
`160`	`160`	`</Data>`
`161`	`161`	`<DataLocation>^TestCoverage.Data.CoverageD</DataLocation>`
`162`	`162`	`<DefaultData>CoverageDefaultData</DefaultData>`
`163`		`-<Description></Description>`
`164`	`163`	`<IdLocation>^TestCoverage.Data.CoverageD</IdLocation>`
`165`	`164`	`<IndexLocation>^TestCoverage.Data.CoverageI</IndexLocation>`
`166`	`165`	`<StreamLocation>^TestCoverage.Data.CoverageS</StreamLocation>`
`167`		`-<Type>%Library.CacheStorage</Type>`
	`166`	`+<Type>%Storage.Persistent</Type>`
`168`	`167`	`}`
`169`	`168`
`170`	`169`	`}`
	`170`	`+`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,8 @@ Storage Default`
`187`	`187`	`<IdLocation>^TestCoverage.Data.RunD</IdLocation>`
`188`	`188`	`<IndexLocation>^TestCoverage.Data.RunI</IndexLocation>`
`189`	`189`	`<StreamLocation>^TestCoverage.Data.RunS</StreamLocation>`
`190`		`-<Type>%Library.CacheStorage</Type>`
	`190`	`+<Type>%Storage.Persistent</Type>`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`}`
	`194`	`+`
Original file line number	Diff line number	Diff line change
`@@ -65,3 +65,4 @@ ClientMethod onloadHandler() [ Language = javascript ]`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`}`
	`68`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`Class TestCoverage.UI.Utils`
`2`	`2`	`{`
`3`	`3`
`4`		`-Query ColoredText(pTestIndex As %String, pCodeUnit As %String, pTestPath As %String = "") As %Query(ROWSPEC = "PlainText:%String,ColoredHTML:%String,Covered:%Boolean,Executable:%Boolean") [ SqlProc ]`
	`4`	`+Query ColoredText(pTestIndex As %String, pCodeUnit As %String, pTestPath As %String = "") As %Query(ROWSPEC = "PlainText:%String,ColoredHTML:%String,Covered:%Boolean,Executable:%Boolean,LineNumber:%Integer") [ SqlProc ]`
`5`	`5`	`{`
`6`	`6`	`}`
`7`	`7`
`@@ -53,7 +53,7 @@ ClassMethod ColoredTextExecute(ByRef qHandle As %Binary, pTestIndex As %String,`
`53`	`53`	`For tLineNumber=1:1:tCodeUnit.Lines.Count() {`
`54`	`54`	`Set tText = tCodeUnit.Lines.GetAt(tLineNumber)`
`55`	`55`	`Do tCodeStream.WriteLine(tText)`
`56`		`- Set $$$TempStorage($Increment($$$TempStorage)) = $ListBuild(tText,tText,$Bit(tCoveredLines,tLineNumber),$Bit(tCodeUnit.ExecutableLines,tLineNumber))`
	`56`	`+ Set $$$TempStorage($Increment($$$TempStorage)) = $ListBuild(tText,tText,$Bit(tCoveredLines,tLineNumber),$Bit(tCodeUnit.ExecutableLines,tLineNumber),tLineNumber)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// Color the code stream.`