Fix test and added Export test

dsccommunity · Apr 6, 2021 · 759aa49 · 759aa49
1 parent 8cf6d64
commit 759aa49
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 2 deletions.
diff --git a/SharePointDsc/DSCResources/MSFT_SPUsageDefinition/MSFT_SPUsageDefinition.psm1 b/SharePointDsc/DSCResources/MSFT_SPUsageDefinition/MSFT_SPUsageDefinition.psm1
@@ -298,7 +298,7 @@ function Export-TargetResource
         $currentBlock = Convert-DSCStringParamToVariable -DSCBlock $currentBlock -ParameterName "PsDscRunAsCredential"
 
         $PartialContent += $currentBlock
-        $PartialContent += "        }`r`n`r`n"
+        $PartialContent += "        }`r`n"
         $Content += $PartialContent
     }
 

diff --git a/tests/Unit/SharePointDsc/SharePointDsc.SPUsageDefinition.Tests.ps1 b/tests/Unit/SharePointDsc/SharePointDsc.SPUsageDefinition.Tests.ps1
@@ -194,7 +194,7 @@ try
 
                     if ($Global:SPDscHelper.CurrentStubBuildNumber.Major -ne 15)
                     {
-                        $testParams.UsageDatabaseEnabled = $false
+                        $testParams.UsageDatabaseEnabled = $true
                     }
                 }
 
@@ -228,6 +228,65 @@ try
                     { Set-TargetResource @testParams } | Should -Throw "This resource cannot remove a Usage Definition. Please use ensure equals Present."
                 }
             }
+
+            Context -Name "Running ReverseDsc Export" -Fixture {
+                BeforeAll {
+                    Import-Module (Join-Path -Path (Split-Path -Path (Get-Module SharePointDsc -ListAvailable).Path -Parent) -ChildPath "Modules\SharePointDSC.Reverse\SharePointDSC.Reverse.psm1")
+
+                    Mock -CommandName Write-Host -MockWith { }
+
+                    Mock -CommandName Get-TargetResource -MockWith {
+                        return @{
+                            Name                 = "Administrative Actions"
+                            DaysRetained         = 14
+                            DaysToKeepUsageFiles = 1
+                            MaxTotalSizeInBytes  = 10000000000000
+                            Enabled              = $true
+                            Ensure               = "Present"
+                        }
+                    }
+
+                    if ($null -eq (Get-Variable -Name 'spFarmAccount' -ErrorAction SilentlyContinue))
+                    {
+                        $mockPassword = ConvertTo-SecureString -String "password" -AsPlainText -Force
+                        $Global:spFarmAccount = New-Object -TypeName System.Management.Automation.PSCredential ("contoso\spfarm", $mockPassword)
+                    }
+
+                    if ($null -eq (Get-Variable -Name 'DynamicCompilation' -ErrorAction SilentlyContinue))
+                    {
+                        $DynamicCompilation = $false
+                    }
+
+                    if ($null -eq (Get-Variable -Name 'StandAlone' -ErrorAction SilentlyContinue))
+                    {
+                        $StandAlone = $true
+                    }
+
+                    if ($null -eq (Get-Variable -Name 'ExtractionModeValue' -ErrorAction SilentlyContinue))
+                    {
+                        $Global:ExtractionModeValue = 2
+                        $Global:ComponentsToExtract = @('SPFarm')
+                    }
+
+                    $result = @'
+        SPUsageDefinition UsageDefinition_AdministrativeActions
+        {
+            DaysRetained         = 14;
+            DaysToKeepUsageFiles = 1;
+            Enabled              = $True;
+            Ensure               = "Present";
+            MaxTotalSizeInBytes  = 10000000000000;
+            Name                 = "Administrative Actions";
+            PsDscRunAsCredential = $Credsspfarm;
+        }
+
+'@
+                }
+
+                It "Should return valid DSC block from the Export method" {
+                    Export-TargetResource | Should -Be $result
+                }
+            }
         }
     }
 }