Merge pull request #148 from NJLangley/bug-147

Fixes for bug 147

Author: NowinskiK

private/ConvertFrom-OrderedHashTablesToArrays.ps1

@@ -24,15 +24,15 @@ function ConvertFrom-OrderedHashTablesToArrays {
 
                 Write-Verbose "Converting ordered hash table to array";
 
-                # First convert each item in the array to have ordered hashtables instead of arrays if required
+                # First convert each item in the array to have arrays instead of ordered hashtables if required
                 for ($i=0; $i -lt $Item.$prop.Count; $i++ ){
                     $Item.$prop[$i] = ConvertFrom-OrderedHashTablesToArrays -Item $Item.$prop[$i];
                 }
-                # Then convert the actual array to a ordered hashtables
+                # Then convert the actual ordered hashtables back to an array
 
                 # Without the ForEach-Object we get a OrderedDictionaryKeyValueCollection back, which is not too useful. We need an array, or the JSON
                 # gets saved using the keys as properties instead of an array. The foreeach unboxes back to an array for us.
-                $Item.$prop = $Item.$prop.Values | ForEach-Object { $_ };
+                $Item.$prop = @($Item.$prop.Values | ForEach-Object { $_ });
             }
             elseif ( $Item.$prop.GetType().Name -eq "PSCustomObject" ) {
                 Write-Verbose "Converting PSCustomObject property using a recursive function call...";

test/BigFactorySample2/pipeline/Multiple Waits.json

@@ -54,6 +54,17 @@
                                 "waitTimeInSeconds": 3
                             }
                         }
+                    ],
+                    "ifFalseActivities": [
+                        {
+                            "name": "Wait 5",
+                            "type": "Wait",
+                            "dependsOn": [],
+                            "userProperties": [],
+                            "typeProperties": {
+                                "waitTimeInSeconds": 2
+                            }
+                        }
                     ]
                 }
             },

test/Update-PropertiesFromFile.Tests.ps1

@@ -199,7 +199,7 @@ InModuleScope azure.datafactory.tools {
 
         Context 'When called and CSV has array indexers in object name column' {
             It 'Should complete' {
-                # Changing activity names means we can index into it if another test already ran, so reload the files
+                # Changing activity names means we cant index into it if another test already ran, so reload the files
                 Copy-Item -Path "$SrcFolder" -Destination "$TmpFolder" -Filter "*.*" -Recurse:$true -Force
                 $script:adf = Import-AdfFromFolder -FactoryName "xyz" -RootFolder "$RootFolder"
                 $script:option = New-AdfPublishOption
@@ -220,7 +220,7 @@ InModuleScope azure.datafactory.tools {
         }
         Context 'When called and CSV has array indexers in object name column' {
             It 'Should update properties of correct activities' {
-                # Changing activity names means we can index into it if another test already ran, so reload the files
+                # Changing activity names means we cant index into it if another test already ran, so reload the files
                 Copy-Item -Path "$SrcFolder" -Destination "$TmpFolder" -Filter "*.*" -Recurse:$true -Force
                 $script:adf = Import-AdfFromFolder -FactoryName "xyz" -RootFolder "$RootFolder"
                 $script:option = New-AdfPublishOption
@@ -229,10 +229,18 @@ InModuleScope azure.datafactory.tools {
                 Update-PropertiesFromFile -adf $script:adf -stage "array"
                 $t = Get-AdfObjectByName -adf $script:adf -name "Multiple Waits" -type "Pipeline"
                 $t.Body.properties.activities[0].name | Should -Be "Wait Number 1"
+
+                # New check for correct type on arrays passed back. Make sure arrays with multiple elements are not boxed up again (Issue #147)
+                $t.Body.properties.activities[1].typeProperties.ifTrueActivities.GetType().BaseType.Name | Should -Be "Array"
+                $t.Body.properties.activities[1].typeProperties.ifTrueActivities[0].GetType().BaseType.Name | Should -Be "Object"
+                $t.Body.properties.activities[1].typeProperties.ifFalseActivities.GetType().BaseType.Name | Should -Be "Array"
+                $t.Body.properties.activities[1].typeProperties.ifTrueActivities[0].GetType().BaseType.Name | Should -Be "Object"
+                
                 $t.Body.properties.activities[1].typeProperties.ifTrueActivities[0].name | Should -Be "Wait Number 2"
                 $t.Body.properties.activities[1].typeProperties.ifTrueActivities[0].typeProperties.waitTimeInSeconds | Should -Be 22
                 $t.Body.properties.activities[1].typeProperties.ifTrueActivities[1].name | Should -Be "Wait Number 3"
                 $t.Body.properties.activities[1].typeProperties.ifTrueActivities[1].typeProperties.waitTimeInSeconds | Should -Be 33
+
                 $t.Body.properties.activities[2].name | Should -Be "Wait Number 4"
             }
         }