change: refactored test output and created new functions

source/tests/Test-RestrictStorageProvidersOutlook.ps1

@@ -14,46 +14,52 @@ function Test-RestrictStorageProvidersOutlook {
 
     process {
         try {
-        # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
+            # 6.5.3 (L2) Ensure additional storage providers are restricted in Outlook on the web
 
-        # Retrieve all OwaMailbox policies
-        $owaPolicies = Get-OwaMailboxPolicy
-        $nonCompliantPolicies = $owaPolicies | Where-Object { $_.AdditionalStorageProvidersAvailable }
+            # Retrieve all OwaMailbox policies
+            $owaPolicies = Get-OwaMailboxPolicy
+            $nonCompliantPolicies = $owaPolicies | Where-Object { $_.AdditionalStorageProvidersAvailable }
 
-        # Determine compliance
-        $allPoliciesRestricted = $nonCompliantPolicies.Count -eq 0
+            # Determine compliance
+            $allPoliciesRestricted = $nonCompliantPolicies.Count -eq 0
 
-        # Prepare failure reasons and details based on compliance
-        $failureReasons = if ($allPoliciesRestricted) {
-            "N/A"
-        }
-        else {
-            "One or more OwaMailbox policies allow AdditionalStorageProvidersAvailable."
+            # Prepare failure reasons and details based on compliance
+            $failureReasons = if ($allPoliciesRestricted) {
+                "N/A"
+            }
+            else {
+                "One or more OwaMailbox policies allow AdditionalStorageProvidersAvailable."
+            }
+
+            $details = if ($allPoliciesRestricted) {
+                "All OwaMailbox policies restrict AdditionalStorageProvidersAvailable"
+            }
+            else {
+                "Non-compliant OwaMailbox policies: $($nonCompliantPolicies.Name -join ', ')"
+            }
+
+            # Create and populate the CISAuditResult object
+            $params = @{
+                Rec           = $recnum
+                Result        = $allPoliciesRestricted
+                Status        = if ($allPoliciesRestricted) { "Pass" } else { "Fail" }
+                Details       = $details
+                FailureReason = $failureReasons
+            }
+            $auditResult = Initialize-CISAuditResult @params
         }
+        catch {
+            Write-Error "An error occurred during the test: $_"
 
-        $details = if ($allPoliciesRestricted) {
-            "All OwaMailbox policies restrict AdditionalStorageProvidersAvailable"
-        }
-        else {
-            "Non-compliant OwaMailbox policies: $($nonCompliantPolicies.Name -join ', ')"
-        }
+            # Retrieve the description from the test definitions
+            $testDefinition = $script:TestDefinitionsObject | Where-Object { $_.Rec -eq $recnum }
+            $description = if ($testDefinition) { $testDefinition.RecDescription } else { "Description not found" }
 
-        # Create and populate the CISAuditResult object
-        $params = @{
-            Rec            = $recnum
-            Result         = $allPoliciesRestricted
-            Status         = if ($allPoliciesRestricted) { "Pass" } else { "Fail" }
-            Details        = $details
-            FailureReason  = $failureReasons
-        }
-        $auditResult = Initialize-CISAuditResult @params
-    }
-    catch {
-        Write-Error "An error occurred during the test: $_"
+            $script:FailedTests.Add([PSCustomObject]@{ Rec = $recnum; Description = $description; Error = $_ })
 
-        # Call Initialize-CISAuditResult with error parameters
-        $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
-    }
+            # Call Initialize-CISAuditResult with error parameters
+            $auditResult = Initialize-CISAuditResult -Rec $recnum -Failure
+        }
     }
 
     end {