From 2080920a64654b89e2a647fc2526d0ec894d1c24 Mon Sep 17 00:00:00 2001
From: TingLiu6 <v-litin@microsoft.com>
Date: Mon, 16 May 2016 00:36:59 -0700
Subject: [PATCH 1/2] Add Unit Test for ConvertTo-Csv

---
 test/powershell/ConvertTo-Csv.Tests.ps1 | 33 +++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/test/powershell/ConvertTo-Csv.Tests.ps1 b/test/powershell/ConvertTo-Csv.Tests.ps1
index 1cba11622..7e323b19b 100644
--- a/test/powershell/ConvertTo-Csv.Tests.ps1
+++ b/test/powershell/ConvertTo-Csv.Tests.ps1
@@ -1,3 +1,36 @@
+Describe "ConvertTo-Csv DRT Unit Tests" -Tags DRT{
+    $inputObject = [pscustomobject]@{ First = 1; Second = 2 } 
+
+    It "Test convertto-csv with psobject pipelined" {        
+        $returnObject = $inputObject | ConvertTo-Csv
+        $returnObject[0] | Should Be "#TYPE System.Management.Automation.PSCustomObject"
+        $returnObject[1] | Should Be "`"First`",`"Second`""
+        $returnObject[2] | Should Be "`"1`",`"2`""
+    }
+
+    It "Test convertto-csv with NoTypeInformation and psobject pipelined" {
+        $returnObject = $inputObject | ConvertTo-Csv -NoTypeInformation
+        $returnObject[0] | Should Be "`"First`",`"Second`""
+        $returnObject[1] | Should Be "`"1`",`"2`""
+    }
+
+    It "Test convertto-csv with a useculture flag" {
+        #The default value is ','
+        $returnObject = $inputObject | ConvertTo-Csv -UseCulture
+        $returnObject[0] | Should Be "#TYPE System.Management.Automation.PSCustomObject"
+        $returnObject[1] | Should Be "`"First`",`"Second`""
+        $returnObject[2] | Should Be "`"1`",`"2`""
+    }
+
+    It "Test convertto-csv with Delimiter" {
+        #The default value is ','
+        $returnObject = $inputObject | ConvertTo-Csv -Delimiter ";"
+        $returnObject[0] | Should Be "#TYPE System.Management.Automation.PSCustomObject"
+        $returnObject[1] | Should Be "`"First`";`"Second`""
+        $returnObject[2] | Should Be "`"1`";`"2`""
+    }
+}
+
 Describe "ConvertTo-Csv" {
     $Name = "Hello"; $Data = "World";
     $testObject = New-Object psobject -Property @{ FirstColumn = $Name; SecondColumn = $Data }

From 732b842f8b1602c0820371f8dfeceea1c5983388 Mon Sep 17 00:00:00 2001
From: TingLiu6 <v-litin@microsoft.com>
Date: Mon, 16 May 2016 19:40:31 -0700
Subject: [PATCH 2/2] Fix CR Issues

---
 test/powershell/ConvertTo-Csv.Tests.ps1 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/powershell/ConvertTo-Csv.Tests.ps1 b/test/powershell/ConvertTo-Csv.Tests.ps1
index 7e323b19b..01e352ec2 100644
--- a/test/powershell/ConvertTo-Csv.Tests.ps1
+++ b/test/powershell/ConvertTo-Csv.Tests.ps1
@@ -3,6 +3,7 @@ Describe "ConvertTo-Csv DRT Unit Tests" -Tags DRT{
 
     It "Test convertto-csv with psobject pipelined" {        
         $returnObject = $inputObject | ConvertTo-Csv
+        $returnObject.Count | Should Be 3
         $returnObject[0] | Should Be "#TYPE System.Management.Automation.PSCustomObject"
         $returnObject[1] | Should Be "`"First`",`"Second`""
         $returnObject[2] | Should Be "`"1`",`"2`""
@@ -10,6 +11,7 @@ Describe "ConvertTo-Csv DRT Unit Tests" -Tags DRT{
 
     It "Test convertto-csv with NoTypeInformation and psobject pipelined" {
         $returnObject = $inputObject | ConvertTo-Csv -NoTypeInformation
+        $returnObject.Count | Should Be 2
         $returnObject[0] | Should Be "`"First`",`"Second`""
         $returnObject[1] | Should Be "`"1`",`"2`""
     }
@@ -17,6 +19,7 @@ Describe "ConvertTo-Csv DRT Unit Tests" -Tags DRT{
     It "Test convertto-csv with a useculture flag" {
         #The default value is ','
         $returnObject = $inputObject | ConvertTo-Csv -UseCulture
+        $returnObject.Count | Should Be 3
         $returnObject[0] | Should Be "#TYPE System.Management.Automation.PSCustomObject"
         $returnObject[1] | Should Be "`"First`",`"Second`""
         $returnObject[2] | Should Be "`"1`",`"2`""
@@ -25,6 +28,7 @@ Describe "ConvertTo-Csv DRT Unit Tests" -Tags DRT{
     It "Test convertto-csv with Delimiter" {
         #The default value is ','
         $returnObject = $inputObject | ConvertTo-Csv -Delimiter ";"
+        $returnObject.Count | Should Be 3
         $returnObject[0] | Should Be "#TYPE System.Management.Automation.PSCustomObject"
         $returnObject[1] | Should Be "`"First`";`"Second`""
         $returnObject[2] | Should Be "`"1`";`"2`""