Unit tests almost completed

Author: dscottraynsford

Modules/FileContentDsc/DSCResources/MSFT_KeyValuePairFile/MSFT_KeyValuePairFile.psm1

@@ -60,30 +60,29 @@ function Get-TargetResource
     $regExOptions = [System.Text.RegularExpressions.RegexOptions]::Multiline
 
     # Search the key that matches the requested key
-    $results = [regex]::Matches($fileContent, "^[\s]*$Name=(.*)$", $regExOptions)
+    $results = [regex]::Matches($fileContent, "^[\s]*$Name=([^\n\r]*)", $regExOptions)
+
+    $ensure = 'Absent'
+    $text = $null
 
     if ($results.Count -eq 0)
     {
         # No matches found
-        $ensure = 'Absent'
-        $text = ''
-
         Write-Verbose -Message ($localizedData.KeyNotFoundMessage -f `
                 $Path, $Name)
     }
     else
     {
         # One of more key value pairs were found
         $ensure = 'Present'
+        $textValues = @()
 
-        $groups = @()
         foreach ($match in $results)
         {
-            Write-Verbose -Verbose -Message ($match.Groups[1])
-            $groups += $match.Groups[1]
+            $textValues += $match.Groups[1]
         }
 
-        $text = ($groups -join ',')
+        $text = ($textValues -join ',')
 
         Write-Verbose -Message ($localizedData.KeyFoundMessage -f `
                 $Path, $Name, $text)
@@ -195,11 +194,11 @@ function Set-TargetResource
     $regExOptions = [System.Text.RegularExpressions.RegexOptions]::Multiline
     if ($IgnoreNameCase)
     {
-        $regExOptions += [System.Text.RegularExpressions.RegexOptions]::IgnoreNameCase
+        $regExOptions += [System.Text.RegularExpressions.RegexOptions]::IgnoreCase
     }
 
     # Search the key that matches the requested key
-    $results = [regex]::Matches($fileContent, "^[\s]*$Name=(.*)$", $regExOptions)
+    $results = [regex]::Matches($fileContent, "^[\s]*$Name=([^\n\r]*)", $regExOptions)
 
     if ($Ensure -eq 'Present')
     {
@@ -230,7 +229,12 @@ function Set-TargetResource
     }
     else
     {
-        if ($results.Count -gt 0)
+        if ($results.Count -eq 0)
+        {
+            # The Key does not exists and should not so don't do anything
+            return
+        }
+        else
         {
             # The Key exists in the file but should not so remove it
             $fileContent = [regex]::Replace($fileContent, "^[\s]*$Name=(.*)$eolChars", '', $regExOptions)
@@ -336,11 +340,11 @@ function Test-TargetResource
     $regExOptions = [System.Text.RegularExpressions.RegexOptions]::Multiline
     if ($IgnoreNameCase)
     {
-        $regExOptions += [System.Text.RegularExpressions.RegexOptions]::IgnoreNameCase
+        $regExOptions += [System.Text.RegularExpressions.RegexOptions]::IgnoreCase
     }
 
     # Search the key that matches the requested key
-    $results = [regex]::Matches($fileContent, "^[\s]*$Name=(.*)$", $regExOptions)
+    $results = [regex]::Matches($fileContent, "^[\s]*$Name=([^\n\r]*)", $regExOptions)
 
     if ($results.Count -eq 0)
     {
@@ -374,8 +378,8 @@ function Test-TargetResource
             # Check each found key value pair and check it has the correct value
             foreach ($match in $results)
             {
-                if (($IgnoreValueCase -and ($match.Groups[1] -ne $Text)) -or `
-                    (-not $IgnoreValueCase -and ($match.Groups[1] -cne $Text)))
+                if (($IgnoreValueCase -and ($match.Groups[1].Value -ne $Text)) -or `
+                    (-not $IgnoreValueCase -and ($match.Groups[1].Value -cne $Text)))
                 {
                     $desiredConfigurationMatch = $false
                 } #

Modules/FileContentDsc/DSCResources/MSFT_KeyValuePairFile/en-US/MSFT_KeyValuePairFile.strings.psd1

@@ -7,7 +7,7 @@ ConvertFrom-StringData @'
     KeyReplaceSecretMessage = Key '{1}' found in file '{0}' being updated with secret value.
     KeyReplaceTextMessage = Key '{1}' found in file '{0}' being updated with '{2}'.
     KeyRemoveMessage = Key '{1}' found in file '{0}' but has been removed.
-    KeyAddMessage = Key '{1}' not found in file '{0}' so has being added.
+    KeyAddMessage = Key '{1}' not found in file '{0}' so has been added.
     KeyUpdateMessage = Key '{1}' found in file '{0}' and has been updated.
     KeyNotFoundButShouldExistMessage = Key '{1}' not found in file '{0}' but should exist. Change required.
     KeyNotFoundAndShouldNotExistMessage = Key '{1}' not found in file '{0}' and should not exist. Change not required.

TestFile.txt

@@ -0,0 +1,5 @@
+Setting1=Value1
+Setting.Two=Test Secret
+Setting.Two=Test Secret
+Setting.Two=Test Secret
+Setting3.Test=Value4

Tests/Integration/MSFT_KeyValuePairFile.Integration.Tests.ps1

@@ -15,15 +15,15 @@ try
         $script:configurationName = 'KeyValuePairFile'
         $script:testTextFile = Join-Path -Path $TestDrive -ChildPath 'TestFile.txt'
         $script:testName = 'Setting.Two'
-        $script:testText = 'TestText'
-        $script:testSecret = 'TestSecret'
+        $script:testText = 'Test Text'
+        $script:testSecret = 'Test Secret'
         $script:testSecureSecret = ConvertTo-SecureString -String $script:testSecret -AsPlainText -Force
         $script:testSecretCredential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList ('Dummy', $script:testSecureSecret)
 
         $script:testFileContent = @"
 Setting1=Value1
-$($script:testName)=Value2
-$($script:testName)=Value3
+$($script:testName)=Value 2
+$($script:testName)=Value 3
 $($script:testName)=$($script:testText)
 Setting3.Test=Value4
 
@@ -195,10 +195,10 @@ Setting3.Test=Value4
                     $configData = @{
                         AllNodes = @(
                             @{
-                                NodeName                    = 'localhost'
-                                Path                        = $script:testTextFile
-                                Name                        = $script:testName
-                                Ensure                      = 'Absent'
+                                NodeName = 'localhost'
+                                Path     = $script:testTextFile
+                                Name     = $script:testName
+                                Ensure   = 'Absent'
                             }
                         )
                     }