minor formatting, logic, and test updates

Author: nehrua

DSCResources/DSR_KeyValuePairFile/DSR_KeyValuePairFile.psm1

@@ -228,6 +228,7 @@ function Set-TargetResource
             {
                 $fileProperties.Add('Encoding', $Encoding)
             }
+
             if ($results.Count -eq 0)
             {
                 # The key value pair was not found so add it to the end of the file
@@ -248,27 +249,24 @@ function Set-TargetResource
 
                 Write-Verbose -Message ($localizedData.KeyUpdateMessage -f `
                     $Path, $Name)
-            }#> # if
+            } # if
         }
         else
         {
             if ($results.Count -eq 0)
             {
-                if ($PSBoundParameters.ContainsKey('Encoding'))
+                if ($PSBoundParameters.ContainsKey('Encoding') -and ($Encoding -eq $fileEncoding))
                 {
-                    if ($Encoding -eq $fileEncoding)
-                    {
                         # The Key does not exists and should not, and encoding is in the desired state, so don't do anything
                         return
-                    }
-                    else
-                    {
-                        Write-Verbose -Message ($localizedData.FileEncodingNotInDesiredState -f `
-                            $fileEncoding, $Encoding)
-
-                        # Add encoding parameter and value to the hashtable
-                        $fileProperties.add('Encoding', $Encoding)
-                    }
+                }
+                else
+                {
+                    Write-Verbose -Message ($localizedData.FileEncodingNotInDesiredState -f `
+                        $fileEncoding, $Encoding)
+
+                    # Add encoding parameter and value to the hashtable
+                    $fileProperties.add('Encoding', $Encoding)
                 }
             }
             else

Tests/Integration/DSR_KeyValuePairFile.Integration.Tests.ps1

@@ -16,6 +16,7 @@ if ( (-not (Test-Path -Path (Join-Path -Path $script:moduleRoot -ChildPath 'DSCR
 
 Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'DSCResource.Tests\TestHelper.psm1') -Force
 Import-Module (Join-Path -Path $script:moduleRoot -ChildPath "$($script:DSCModuleName).psd1") -Force
+# Import the helper module for the Get-FileEncoding function
 Import-Module (Join-Path -Path $script:moduleRoot -ChildPath 'Modules\FileContentDsc.Common') -Force
 $TestEnvironment = Initialize-TestEnvironment `
     -DSCModuleName $script:DSCModuleName `

Tests/Unit/DSR_KeyValuePairFile.Tests.ps1

@@ -520,6 +520,7 @@ $($script:testAddedName)=$($script:testText)
                     { Set-TargetResource `
                         -Path $script:testTextFile `
                         -Name $script:testName.ToUpper() `
+                        -Encoding $script:fileEncodingParameters.Encoding `
                         -Ensure 'Absent' `
                         -Verbose
                     } | Should -Not -Throw
@@ -536,7 +537,7 @@ $($script:testAddedName)=$($script:testText)
 
                     Assert-MockCalled `
                         -CommandName Set-Content `
-                        -Exactly 1
+                        -Exactly 0
                 }
             }
 
@@ -650,7 +651,7 @@ $($script:testAddedName)=$($script:testText)
                 }
             }
 
-            Context 'File exists and does not contain matching key but should not' {
+            Context 'File exists and does not contain matching key and should not' {
                 # verifiable (should be called) mocks
                 Mock `
                     -CommandName Assert-ParametersValid `