From 191f232519ac3d9b8f7a5142ec2e95cc014a003e Mon Sep 17 00:00:00 2001
From: JumpingYang001 <v-zhenpy@microsoft.com>
Date: Wed, 13 Apr 2016 00:01:49 -0700
Subject: [PATCH] Update fixed comments from PR for Get-Variable Pester unit
 test

---
 test/powershell/Get-Variable.Tests.ps1 | 29 +++++++++++++-------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/test/powershell/Get-Variable.Tests.ps1 b/test/powershell/Get-Variable.Tests.ps1
index 0d6d2fb82..6b26ff4a2 100644
--- a/test/powershell/Get-Variable.Tests.ps1
+++ b/test/powershell/Get-Variable.Tests.ps1
@@ -1,25 +1,23 @@
 
 Describe "Get-Variable DRT Unit Tests" -Tags DRT{
-	It "Get-Variable not exist variable Name should throw ItemNotFoundException"{	
-		$ErrorActionPreference = "Stop"
+	It "Get-Variable of not existing variable Name should throw ItemNotFoundException"{	
 		try { 
-			Get-Variable -Name nonexistingVariableName
+			Get-Variable -EA Stop -Name nonexistingVariableName
 			Throw "Execution OK"
 		} 
 		catch {
 			$_.FullyQualifiedErrorId | Should be "VariableNotFound,Microsoft.PowerShell.Commands.GetVariableCommand"
 		}
-		$ErrorActionPreference = "SilentlyContinue"
 	}
 	
-	It "Get-Variable exist variable Name with include and bogus exclude should work"{
+	It "Get-Variable of existing variable Name with include and bogus exclude should work"{
 		Set-Variable newVar testing
 		$var1=get-variable -Name newVar -Include newVar -Exclude bogus
 		$var1.Name|Should Be "newVar"
 		$var1.Value|Should Be "testing"
 	}
 	
-	It "Get-Variable exist variable Name with Description and Option should work"{
+	It "Get-Variable of existing variable Name with Description and Option should work"{
 		Set-Variable newVar testing -Option ReadOnly -Description "testing description"
 		$var1=get-variable -Name newVar
 		$var1.Name|Should Be "newVar"
@@ -28,11 +26,12 @@ Describe "Get-Variable DRT Unit Tests" -Tags DRT{
 		$var1.Description|Should Be "testing description"
 	}
 	
-	It "Get-Variable exist variable Globbing Name should work"{
+	It "Get-Variable of existing variable Globbing Name should work"{
 		Set-Variable abcaVar testing
 		Set-Variable bcdaVar "another test"
 		Set-Variable aVarfoo wow
 		$var1=get-variable -Name *aVar* -Scope local
+		$var1.Count | Should be 3
 		$var1[0].Name|Should Be "abcaVar"
 		$var1[0].Value|Should Be "testing"
 		$var1[1].Name|Should Be "aVarfoo"
@@ -41,10 +40,10 @@ Describe "Get-Variable DRT Unit Tests" -Tags DRT{
 		$var1[2].Value|Should Be "another test"
 	}
 	
-	It "Get-Variable an exist private variable Name should throw ItemNotFoundException skip now as bug#818" -Skip:$true{
+	It "Get-Variable of existing private variable Name should throw ItemNotFoundException skip now as bug#818" -Skip:$true{
 		try { 
 			Set-Variable newVar testing -Option Private
-			Get-Variable -Name newVar
+			&{Get-Variable -Name newVar}
 			Throw "Execution OK"
 		} 
 		catch {
@@ -73,7 +72,7 @@ Describe "Get-Variable" {
     }
 
     It "Should be able to call using the gv alias" {
-	{ gv } | Should Not Throw
+	(get-alias gv).Definition | Should be "Get-Variable"
     }
 
     It "Should be able to call using the Name switch" {
@@ -136,7 +135,7 @@ Describe "Get-Variable" {
 
 	$actual = Get-Variable -Exclude var1, var2
 
-	$actual | Where-Object { $_.Name -eq "var3" } | Should Not BeNullOrEmpty
+	$actual.Name -contains "var3" | Should Be $true
     }
 
     Context "Scope Tests" {
@@ -144,7 +143,7 @@ Describe "Get-Variable" {
 	It "Should be able to get a global scope variable using the global switch" {
 	    New-Variable globalVar -Value 1 -Scope global -Force
 
-	    (Get-Variable -Name globalVar -Scope global)[0].Value | Should Be 1
+	    (Get-Variable -Name globalVar -Scope global).Value | Should Be 1
 	}
 
 	It "Should not be able to clear a global scope variable using the local switch" {
@@ -155,9 +154,9 @@ Describe "Get-Variable" {
 
 	It "Should be able to get a global variable when there's one in the script scope" {
 	    New-Variable globalVar -Value 1 -Scope global -Force
-	    { New-Variable globalVar -Value 2 -Scope script -Force }
+	    { New-Variable globalVar -Value 2 -Scope script -Force}
 
-	    $(Get-Variable -Name globalVar).Value | Should Be 1
+	    (Get-Variable -Name globalVar).Value | Should Be 1
 	}
 
 	It "Should be able to get an item locally using the local switch" {
@@ -173,7 +172,7 @@ Describe "Get-Variable" {
 
 	    New-Variable localVar -Value 2 -Scope global -Force
 
-	    $(Get-Variable -Name localVar -Scope global).Value | Should Be 2
+	    (Get-Variable -Name localVar -Scope global).Value | Should Be 2
 	}
 
 	It "Should be able to get a script variable created using the script switch" {