Address PR requested changes

Author: isc-jili

src/cls/IPM/Storage/Module.cls

@@ -869,10 +869,6 @@ Method BuildDependencyGraph(
 {
     set sc = $$$OK
     try {
-        if $data(^IPMTest("BuildDependencyGraphCount")) {
-            do $increment(^IPMTest("BuildDependencyGraphCount"))
-        }
-
         // Initialize internal variables
         kill manifestCache, repoSearchCache, moduleCache, workQueue
         set knownDependencies = ..GetKnownDependencies(..Name)

tests/integration_tests/Test/PM/Integration/BuildDependencyGraph.cls

@@ -3,43 +3,77 @@ Class Test.PM.Integration.BuildDependencyGraph Extends Test.PM.Integration.Base
 
 Method OnBeforeAllTests() As %Status
 {
-    kill ^IPMTest
-    set ^IPMTest("BuildDependencyGraphCount") = 0
-
     set sc = ##class(%IPM.Main).Shell("repo -n build-dependency-graph -fs -path /home/irisowner/zpm/tests/integration_tests/Test/PM/Integration/_data/build-dependency-graph-loop/")
     do $$$AssertStatusOK(sc, "Created build-dependency-graph repo successfully.")
-    return sc
+
+    // Reset counter to track BuildDependencyGraph() number of calls
+    kill ^CacheTemp.BuildDependencyGraph($job)
+
+    // Open method definition
+    set methodDef = ##class(%Dictionary.MethodDefinition).%OpenId("%IPM.Storage.Module||BuildDependencyGraph")
+
+    // Save original implementation so we can restore it
+    set ^CacheTemp.BuildDependencyGraph("orig", $job) = methodDef.Implementation.Read()
+
+    // Build wrapped implementation
+    set newImp = ##class(%Stream.TmpCharacter).%New()
+
+    do newImp.WriteLine(
+        "    set ^CacheTemp.BuildDependencyGraph($job)=$increment(^CacheTemp.BuildDependencyGraph($job))"
+    )
+
+    // Rewind original and copy it
+    do methodDef.Implementation.Rewind()
+    while 'methodDef.Implementation.AtEnd {
+        do newImp.WriteLine(methodDef.Implementation.ReadLine())
+    }
+
+    // Replace implementation
+    set methodDef.Implementation = newImp
+    do methodDef.%Save()
+
+    // Recompile the class
+    do $system.OBJ.Compile("%IPM.Storage.Module", "cuk")
+    return $$$OK
 }
 
 /// Counts the number of times that BuildDependencyGraph() gets invoked on test modules' installation to catch regressions
 Method TestBuildDependencyGraphCount()
 {
-    // Install base module C
-    set moduleDir = ..GetModuleDir("build-dependency-graph-loop/module-c")
-    set status = ##class(%IPM.Main).Shell("load -verbose "_moduleDir)
-    do $$$AssertStatusOK(status,"Module module-c successfully installed")
-
-    // Install module A (which has dependencies B-snapshot-version and C) with hidden flags UpdateSnapshots and IgnoreInstalled
     kill params
-    set params("UpdateSnapshots") = 1
     set params("IgnoreInstalled") = 1
-    set params("Verbose") = 1
+    set params("UpdateSnapshots") = 1
 
-    set moduleDir = ..GetModuleDir("build-dependency-graph-loop/module-a")
-    set sc = ##class(%IPM.Utils.Module).LoadNewModule(moduleDir, .params)
+    write !, "TTTTT", !
+    zwrite $get(^CacheTemp.BuildDependencyGraph($job),0)
+
+    set sc = ##class(%IPM.Utils.Module).LoadNewModule(..GetModuleDir("build-dependency-graph-loop/module-a"), .params)
     do $$$AssertStatusOK(sc)
 
-    // TODO: Note that this number 4 is just what the number of BuildDependencyGraphCount gets cut down to with the fix for #1011. Without #1011 the number is 5. This is just to ensure no regressions for the future, but will be an even lower number with #998.
-    do $$$AssertTrue(^IPMTest("BuildDependencyGraphCount") <= 4)
+    write !, "SSSSSSS", !
+    zwrite $get(^CacheTemp.BuildDependencyGraph($job),0)
+
+    do $$$AssertTrue($get(^CacheTemp.BuildDependencyGraph($job), 0) > 0)
+    do $$$AssertTrue($get(^CacheTemp.BuildDependencyGraph($job), 0) < 4)
 }
 
 Method OnAfterAllTests() As %Status
 {
-    kill ^IPMTest
+    set methodDef = ##class(%Dictionary.MethodDefinition).%OpenId("%IPM.Storage.Module||BuildDependencyGraph")
+
+    if $data(^CacheTemp.BuildDependencyGraph("orig", $job)) {
+        set imp = ##class(%Stream.TmpCharacter).%New()
+        do imp.Write(^CacheTemp.BuildDependencyGraph("orig", $job))
+        set methodDef.Implementation = imp
+        do methodDef.%Save()
+        do $system.OBJ.Compile("%IPM.Storage.Module", "cuk")
+    }
+
+    kill ^CacheTemp.BuildDependencyGraph($job)
 
     set sc = ##class(%IPM.Main).Shell("repo -delete -name build-dependency-graph")
     do $$$AssertStatusOK(sc, "Deleted build-dependency-graph repo successfully.")
-    return sc
+    return $$$OK
 }
 
 }