Add ArrayList support

ili101 · Nov 9, 2020 · 84e3894 · 84e3894
1 parent 91d03f2
commit 84e3894
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.2 - 2020/10/XX (Stable)
+### New
+* Add ArrayList input support.
+
 ## 2.0.1 - 2019/08/24 (Stable)
 ### Documentation
 * Updated Description and Tags.

diff --git a/Join-Object.ps1 b/Join-Object.ps1
@@ -777,7 +777,7 @@ function Join-Object {
     if ($Left -is [Data.DataTable]) {
         $LeftNew = [DataTableExtensions]::AsEnumerable($Left)
     }
-    elseif ($Left -is [PSCustomObject]) {
+    elseif ($Left -is [PSCustomObject] -or $Left -is [Collections.ArrayList]) {
         $LeftNew = @($Left)
     }
     else {
@@ -786,7 +786,7 @@ function Join-Object {
     if ($Right -is [Data.DataTable]) {
         $RightNew = [DataTableExtensions]::AsEnumerable($Right)
     }
-    elseif ($Right -is [PSCustomObject]) {
+    elseif ($Right -is [PSCustomObject] -or $Right -is [Collections.ArrayList]) {
         $RightNew = @($Right)
     }
     else {

diff --git a/Tests/CompareData/DataSetSmall, [Collections.ArrayList]PSCustomObject - DataTable.xml b/Tests/CompareData/DataSetSmall, [Collections.ArrayList]PSCustomObject - DataTable.xml
@@ -0,0 +1,41 @@
+<Objs Version="1.1.0.1" xmlns="http://schemas.microsoft.com/powershell/2004/04">
+  <Obj RefId="0">
+    <TN RefId="0">
+      <T>System.Object[]</T>
+      <T>System.Array</T>
+      <T>System.Object</T>
+    </TN>
+    <LST>
+      <Obj RefId="1">
+        <TN RefId="1">
+          <T>System.Management.Automation.PSCustomObject</T>
+          <T>System.Object</T>
+        </TN>
+        <MS>
+          <I32 N="ID">1</I32>
+          <S N="Subscription">S1</S>
+          <S N="R_Name">A</S>
+          <I32 N="R_IntT">5</I32>
+        </MS>
+      </Obj>
+      <Obj RefId="2">
+        <TNRef RefId="1" />
+        <MS>
+          <I32 N="ID">2</I32>
+          <S N="Subscription">S2</S>
+          <Nil N="R_Name" />
+          <Nil N="R_IntT" />
+        </MS>
+      </Obj>
+      <Obj RefId="3">
+        <TNRef RefId="1" />
+        <MS>
+          <I32 N="ID">3</I32>
+          <S N="Subscription">S3</S>
+          <S N="R_Name">C</S>
+          <Nil N="R_IntT" />
+        </MS>
+      </Obj>
+    </LST>
+  </Obj>
+</Objs>
diff --git a/Tests/Join-Object.Tests.ps1 b/Tests/Join-Object.Tests.ps1
@@ -815,6 +815,17 @@ Describe -Name 'Join-Object' -Fixture {
                     RightMultiMode    = 'DuplicateLines'
                 }
             }
+            Format-Test @{
+                Params = @{
+                    Left                   = '[Collections.ArrayList]PSCustomObject'
+                    Right                  = 'DataTable'
+                    LeftJoinProperty       = 'ID'
+                    RightJoinProperty      = 'IDD'
+                    LeftProperties         = @{ ID = 'ID' ; Sub = 'Subscription' }
+                    ExcludeRightProperties = 'Junk'
+                    Prefix                 = 'R_'
+                }
+            }
         )
         if ($FilterTests) {
             $TestCases = $TestCases | Where-Object TestName -In $FilterTests

diff --git a/Tests/TestHelpers.ps1 b/Tests/TestHelpers.ps1
@@ -130,6 +130,9 @@ function Get-Params {
         elseif ($ParamSplit[0] -eq '[DataTable]') {
             $Output = (Get-Variable -Name $ParamSplit[1]).Value | ConvertTo-DataTable
         }
+        elseif ($ParamSplit[0] -eq '[Collections.ArrayList]') {
+            $Output = [Collections.ArrayList](Get-Variable -Name $ParamSplit[1]).Value
+        }
         else {
             $Output = (Get-Variable -Name $ParamSplit[0]).Value
         }