Fix test results

Author: Gijsreyn

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

@@ -275,7 +275,7 @@ Describe 'PowerShell adapter resource tests' {
     $out | Should -BeLike "*ERROR*Credential object 'Credential' requires both 'username' and 'password' properties*"
   }
 
-  It 'Config is able to return proper enum value' {
+  It 'Config get is able to return proper enum value' {
     $yaml = @"
         `$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
         resources:
@@ -287,7 +287,28 @@ Describe 'PowerShell adapter resource tests' {
 "@
 
     $out = dsc config get -i $yaml | ConvertFrom-Json
+    Write-Verbose -Message ($out | ConvertTo-Json -Depth 10 | Out-String) -Verbose
     $LASTEXITCODE | Should -Be 0
-    $out.results.result.actualState.result.Ensure | Should -Be 'Present'
+    $out.results.result.actualState.Ensure | Should -Be 'Present'
+  }
+
+  It 'Config export is able to return proper enum value' {
+    $yaml = @"
+      `$schema: https://aka.ms/dsc/schemas/v3/bundled/config/document.json
+      resources:
+      - name: Working with class-based resources
+        type: Microsoft.DSC/PowerShell
+        properties:
+          resources:
+          - name: Class-resource Info
+            type: TestClassResource/TestClassResource
+"@
+
+    $out = dsc config export -i $yaml | ConvertFrom-Json
+    Write-Verbose -Message ($out | ConvertTo-Json -Depth 10 | Out-String) -Verbose
+    $LASTEXITCODE | Should -Be 0
+    $out.resources[0].properties.result.count | Should -Be 5
+    $out.resources[0].properties.result[0].Name | Should -Be "Object1"
+    $out.resources[0].properties.result[0].Prop1 | Should -Be "Property of object1"
   }
 }

powershell-adapter/psDscAdapter/psDscAdapter.psm1

@@ -446,15 +446,15 @@ function Invoke-DscOperation {
                             $Result = @{}
                             $raw_obj = $dscResourceInstance.Get()
                             $ValidProperties | ForEach-Object { 
-                                # if ($raw_obj.$_ -is [System.Enum]) {
-                                #     $Result[$_] = $raw_obj.$_.ToString()
-                                # }
-                                # else {
-                                #     $Result[$_] = $raw_obj.$_
-                                # }
-                                $Result[$_] = $raw_obj.$_
+                                if ($raw_obj.$_ -is [System.Enum]) {
+                                    $Result[$_] = $raw_obj.$_.ToString()
+
+                                }
+                                else 
+                                {
+                                    $Result[$_] = $raw_obj.$_
+                                }
                             }
-                            $Result[$_] = $raw_obj.$_
                             $addToActualState.properties = $Result
                         }
                         'Set' {
@@ -482,13 +482,15 @@ function Invoke-DscOperation {
                             $raw_obj_array = $method.Invoke($null, $null)
                             foreach ($raw_obj in $raw_obj_array) {
                                 $Result_obj = @{}
-                                $ValidProperties | ForEach-Object { if ($raw_obj.$_ -is [System.Enum]) {
-                                        $Result[$_] = $raw_obj.$_.ToString()
+                                $ValidProperties | ForEach-Object { 
+                                    if ($raw_obj.$_ -is [System.Enum]) {
+                                        $Result_obj[$_] = $raw_obj.$_.ToString()
                                     }
-                                    else {
-                                        $Result[$_] = $raw_obj.$_
-                                    } 
-                                }
+                                    else 
+                                    { 
+                                        $Result_obj[$_] = $raw_obj.$_ 
+                                    }
+                          }
                                 $resultArray += $Result_obj
                             }
                             $addToActualState = $resultArray