Fix up resource test

Author: Gijsreyn

.vscode/launch.json

@@ -1,39 +1,39 @@
-// {
-//     // Use IntelliSense to learn about possible attributes.
-//     // Hover to view descriptions of existing attributes.
-//     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-//     "version": "0.2.0",
-//     "configurations": [
-//         {
-//             "type": "lldb",
-//             "request": "launch",
-//             "name": "Debug config",
-//             "program": "${workspaceFolder}/config/target/debug/config",
-//             "args": [
-//                 "list",
-//                 "r*"
-//             ],
-//             "cwd": "${workspaceFolder}"
-//         },
-//         {
-//             "name": "(macOS) Attach",
-//             "type": "lldb",
-//             "request": "attach",
-//             "pid": "${command:pickMyProcess}",
-//         },
-//         {
-//             "name": "(Windows) Attach",
-//             "type": "cppvsdbg",
-//             "request": "attach",
-//             "processId": "${command:pickProcess}",
-//         },
-//         {
-//             "name": "Debug sshdconfig",
-//             "type": "cppvsdbg",
-//             "request": "launch",
-//             "program": "${workspaceFolder}/sshdconfig/target/debug/sshdconfig.exe",
-//             "args": ["get"],
-//             "cwd": "${workspaceFolder}"
-//         }
-//     ]
-// }
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug config",
+            "program": "${workspaceFolder}/config/target/debug/config",
+            "args": [
+                "list",
+                "r*"
+            ],
+            "cwd": "${workspaceFolder}"
+        },
+        {
+            "name": "(macOS) Attach",
+            "type": "lldb",
+            "request": "attach",
+            "pid": "${command:pickMyProcess}",
+        },
+        {
+            "name": "(Windows) Attach",
+            "type": "cppvsdbg",
+            "request": "attach",
+            "processId": "${command:pickProcess}",
+        },
+        {
+            "name": "Debug sshdconfig",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/sshdconfig/target/debug/sshdconfig.exe",
+            "args": ["get"],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

build.ps1

@@ -518,7 +518,7 @@ if ($Test) {
         (Get-Module -Name Pester -ListAvailable).Path
     }
 
-    Invoke-Pester -ErrorAction Stop -Output Detailed -Verbose
+    Invoke-Pester -ErrorAction Stop
 }
 
 function Find-MakeAppx() {

powershell-adapter/Tests/TestClassResource/0.0.1/TestClassResource.psm1

@@ -107,7 +107,7 @@ class TestClassResource : BaseTestClass {
         return $resultList.ToArray()
     }
 
-    [string] WhatIf() {
+    [hashtable] WhatIf() {
         $out = @{
             Name      = $this.Name
             _metadata = @{

powershell-adapter/Tests/powershellgroup.config.tests.ps1

@@ -101,7 +101,7 @@ Describe 'PowerShell adapter resource tests' {
     $out = $yaml | dsc config export -f - 2>&1 | Out-String
     $LASTEXITCODE | Should -Be 2
     $out | Should -Not -BeNullOrEmpty
-    $out | Should -BeLike "*ERROR*'Export' method not implemented by resource 'NoExport'*"
+    $out | Should -BeLike "*ERROR*Method 'Export' not implemented by resource 'NoExport'*"
   }
 
   It 'Custom psmodulepath in config works' {
@@ -322,11 +322,9 @@ Describe 'PowerShell adapter resource tests' {
             Ensure: 'Present'
 "@
     $out = dsc config set -i $yaml -w | ConvertFrom-Json
-
-    Write-Verbose -Message ("Output: $($out | ConvertTo-Json -Depth 10)") -Verbose
     $LASTEXITCODE | Should -Be 0
-    $out.results.result.afterstate.result[0].name | Should -Be "TestClassResource"
-    $out.results.result.afterstate.result[0]._metadata.whatIf | Should -Be "A test message from the WhatIf method of TestClassResource"
+    $out.results.result.afterstate.name | Should -Be "TestClassResource"
+    $out.results.result.afterstate._metadata.whatIf | Should -Be "A test message from the WhatIf method of TestClassResource"
   }
 }
 

powershell-adapter/Tests/powershellgroup.resource.tests.ps1

@@ -199,13 +199,13 @@ Describe 'PowerShell adapter resource tests' {
         $files | Copy-Item -Destination $path4
 
         $filePath = Join-Path $path1 'TestClassResource.psd1'
-        (Get-Content -Raw $filePath).Replace("ModuleVersion = `'0.0.1`'", "ModuleVersion = `'1.0`'") | Set-Content $filePath
+        (Get-Content -Raw $filePath).Replace("ModuleVersion        = '0.0.1'", "ModuleVersion = `'1.0`'") | Set-Content $filePath
         $filePath = Join-Path $path2 'TestClassResource.psd1'
-        (Get-Content -Raw $filePath).Replace("ModuleVersion = `'0.0.1`'", "ModuleVersion = `'1.1`'") | Set-Content $filePath
+        (Get-Content -Raw $filePath).Replace("ModuleVersion        = '0.0.1'", "ModuleVersion = `'1.1`'") | Set-Content $filePath
         $filePath = Join-Path $path3 'TestClassResource.psd1'
-        (Get-Content -Raw $filePath).Replace("ModuleVersion = `'0.0.1`'", "ModuleVersion = `'2.0`'") | Set-Content $filePath
+        (Get-Content -Raw $filePath).Replace("ModuleVersion        = '0.0.1'", "ModuleVersion = `'2.0`'") | Set-Content $filePath
         $filePath = Join-Path $path4 'TestClassResource.psd1'
-        (Get-Content -Raw $filePath).Replace("ModuleVersion = `'0.0.1`'", "ModuleVersion = `'2.0.1`'") | Set-Content $filePath
+        (Get-Content -Raw $filePath).Replace("ModuleVersion        = '0.0.1'", "ModuleVersion = '2.0.1'") | Set-Content $filePath
 
 
         $oldPath = $env:PSModulePath