deinit test for additional properties + fix for deinit fractionCompleted calculation

Author: chloe-yeo

Sources/FoundationEssentials/ProgressManager/ProgressManager+State.swift

@@ -106,11 +106,13 @@ extension ProgressManager {
         var selfFraction: ProgressFraction
         var overallFraction: ProgressFraction {
             var overallFraction = selfFraction
-            for child in children {
-                if !child.childFraction.isFinished {
-                    let multiplier = ProgressFraction(completed: child.portionOfTotal, total: selfFraction.total)
-                    if let additionalFraction = multiplier * child.childFraction {
-                        overallFraction = overallFraction + additionalFraction
+            for childState in children {
+                if let _ = childState.child {
+                    if !childState.childFraction.isFinished {
+                        let multiplier = ProgressFraction(completed: childState.portionOfTotal, total: selfFraction.total)
+                        if let additionalFraction = multiplier * childState.childFraction {
+                            overallFraction = overallFraction + additionalFraction
+                        }
                     }
                 }
             }

Sources/FoundationEssentials/ProgressManager/ProgressManager.swift

@@ -297,12 +297,9 @@ internal import _FoundationCollections
     }
 
     deinit {
-        if !isFinished {
-            self.withProperties { properties in
-                if let totalCount = properties.totalCount {
-                    properties.completedCount = totalCount
-                }
-            }
+        if let totalCount = self.totalCount {
+            let diff = totalCount - self.completedCount
+            self.complete(count: diff)
         }
 
         let (propertiesInt, propertiesDouble, propertiesString, propertiesURL, propertiesUInt64, parents) = state.withLock { state in

Tests/FoundationEssentialsTests/ProgressManager/ProgressManagerPropertiesTests.swift

@@ -425,15 +425,19 @@ import Testing
             properties.fileURL = URL(string: "https://www.cats.com")
         }
 
-        let childManager = manager.subprogress(assigningCount: 1).start(totalCount: 2)
+        var childManager: ProgressManager? = manager.subprogress(assigningCount: 1).start(totalCount: 2)
 
-        childManager.withProperties { properties in
+        childManager?.withProperties { properties in
             properties.completedCount = 1
             properties.fileURL = URL(string: "https://www.kittens.com")
         }
 
         #expect(manager.fractionCompleted == 0.75)
         #expect(manager.summary(of: ProgressManager.Properties.FileURL.self) == [URL(string: "https://www.cats.com"), URL(string: "https://www.kittens.com")])
+                
+        childManager = nil
+        #expect(manager.fractionCompleted == 1.0)
+        #expect(manager.summary(of: ProgressManager.Properties.FileURL.self) == [URL(string: "https://www.cats.com")])
     }
 }