Merge pull request #6 from gesbeckj/xDescription

gesbeckj · web-flow · commit 71cc59ea0670 · 2017-09-03T12:26:51.000-05:00
Additional Formatting Fixes
diff --git a/Tests/Unit/MSFT_xComputer.Tests.ps1 b/Tests/Unit/MSFT_xComputer.Tests.ps1
@@ -31,10 +31,12 @@ try
             $SecPassword = New-Object -Type SecureString
             $Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList 'USER', $SecPassword
             $NotComputerName = if ($env:COMPUTERNAME -ne 'othername')
-            {'othername'
+            {
+                'othername'
             }
             else
-            {'name'
+            {
+                'name'
             }
 
             Context "$($Global:DSCResourceName)\Test-TargetResource" {
@@ -59,7 +61,9 @@ try
                             PartOfDomain = $true
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {'contoso.com'}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        'contoso.com'
+                    }
                     Test-TargetResource -Name $Env:ComputerName -DomainName 'Contoso.com' -Credential $Credential | Should Be $true
                 }
                 It 'Should return True if Workgroup name is same as specified' {
@@ -70,7 +74,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Test-TargetResource -Name $Env:ComputerName -WorkGroupName 'workgroup' | Should Be $true
                 }
                 It 'Should return True if ComputerName and Domain name is same as specified' {
@@ -95,7 +101,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Test-TargetResource -Name $Env:ComputerName -WorkGroupName 'workgroup' | Should Be $true
                     Test-TargetResource -Name 'localhost' -WorkGroupName 'workgroup' | Should Be $true
                 }
@@ -107,7 +115,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Test-TargetResource -Name $Env:ComputerName | Should Be $true
                     Test-TargetResource -Name 'localhost' | Should Be $true
                     Mock -CommandName Get-WmiObject {
@@ -131,7 +141,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Test-TargetResource -Name $NotComputerName | Should Be $false
                     Mock -CommandName Get-WmiObject -MockWith {
                         [PSCustomObject] @{
@@ -140,7 +152,9 @@ try
                             PartOfDomain = $true
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {'contoso.com'}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        'contoso.com'
+                    }
                     Test-TargetResource -Name $NotComputerName | Should Be $false
                 }
                 It 'Should return False if Domain name is not same as specified' {
@@ -165,7 +179,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Test-TargetResource -Name $Env:ComputerName -WorkGroupName 'NOTworkgroup' | Should Be $false
                     Test-TargetResource -Name 'localhost' -WorkGroupName 'NOTworkgroup' | Should Be $false
                 }
@@ -177,7 +193,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Test-TargetResource -Name $NotComputerName -WorkGroupName 'workgroup' | Should Be $false
                     Mock -CommandName Get-WMIObject -MockWith {
                         [PSCustomObject] @{
@@ -199,7 +217,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Test-TargetResource -Name $Env:ComputerName -DomainName 'contoso.com' -Credential $Credential | Should Be $false
                     Test-TargetResource -Name 'localhost' -DomainName 'contoso.com' -Credential $Credential | Should Be $false
                 }
@@ -331,7 +351,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Set-TargetResource -Name $NotComputerName -DomainName 'Contoso.com' -Credential $Credential | Should BeNullOrEmpty
                     Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It
                     Assert-MockCalled -CommandName Add-Computer -Exactly -Times 1 -Scope It -ParameterFilter {$DomainName -and $NewName}
@@ -345,7 +367,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Set-TargetResource -Name $NotComputerName -DomainName 'Contoso.com' -JoinOU 'OU=Computers,DC=contoso,DC=com' -Credential $Credential | Should BeNullOrEmpty
                     Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It
                     Assert-MockCalled -CommandName Add-Computer -Exactly -Times 1 -Scope It -ParameterFilter {$DomainName -and $NewName}
@@ -359,7 +383,9 @@ try
                             PartOfDomain = $false
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Set-TargetResource -Name $NotComputerName -WorkGroupName 'adventure-works' | Should BeNullOrEmpty
                     Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It
                     Assert-MockCalled -CommandName Add-Computer -Exactly -Times 1 -Scope It -ParameterFilter {$WorkGroupName -and $NewName}
@@ -441,7 +467,9 @@ try
                             PartOfDomain = $true
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Set-TargetResource -Name $Env:ComputerName -WorkGroupName 'Contoso' -UnjoinCredential $Credential | Should BeNullOrEmpty
                     Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It
                     Assert-MockCalled -CommandName Add-Computer -Exactly -Times 0 -Scope It -ParameterFilter {$NewName}
@@ -456,7 +484,9 @@ try
                             PartOfDomain = $true
                         }
                     }
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Set-TargetResource -Name 'localhost' -WorkGroupName 'Contoso' -UnjoinCredential $Credential | Should BeNullOrEmpty
                     Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It
                     Assert-MockCalled -CommandName Add-Computer -Exactly -Times 0 -Scope It -ParameterFilter {$NewName}
@@ -479,7 +509,9 @@ try
                     Assert-MockCalled -CommandName Add-Computer -Exactly -Times 0 -Scope It
                 }
                 It 'Changes only ComputerName in Workgroup' {
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Mock -CommandName Get-WMIObject -MockWith {
                         [PSCustomObject] @{
                             Domain       = 'Contoso';
@@ -498,7 +530,9 @@ try
                     {Set-TargetResource -Name "ThisIsBad<>"} | Should Throw
                 }
                 It 'Changes computer description in a workgroup' {
-                    Mock -CommandName Get-ComputerDomain -MockWith {''}
+                    Mock -CommandName Get-ComputerDomain -MockWith {
+                        ''
+                    }
                     Mock -CommandName Get-WMIObject {
                         [PSCustomObject] @{
                             Domain       = 'Contoso';

Original file line number	Diff line number	Diff line change
`@@ -31,10 +31,12 @@ try`
`31`	`31`	`$SecPassword = New-Object -Type SecureString`
`32`	`32`	`$Credential = New-Object -TypeName System.Management.Automation.PSCredential -ArgumentList 'USER', $SecPassword`
`33`	`33`	`$NotComputerName = if ($env:COMPUTERNAME -ne 'othername')`
`34`		`- {'othername'`
	`34`	`+ {`
	`35`	`+ 'othername'`
`35`	`36`	`}`
`36`	`37`	`else`
`37`		`- {'name'`
	`38`	`+ {`
	`39`	`+ 'name'`
`38`	`40`	`}`
`39`	`41`
`40`	`42`	`Context "$($Global:DSCResourceName)\Test-TargetResource" {`
`@@ -59,7 +61,9 @@ try`
`59`	`61`	`PartOfDomain = $true`
`60`	`62`	`}`
`61`	`63`	`}`
`62`		`- Mock -CommandName Get-ComputerDomain -MockWith {'contoso.com'}`
	`64`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`65`	`+ 'contoso.com'`
	`66`	`+ }`
`63`	`67`	`Test-TargetResource -Name $Env:ComputerName -DomainName 'Contoso.com' -Credential $Credential \| Should Be $true`
`64`	`68`	`}`
`65`	`69`	`It 'Should return True if Workgroup name is same as specified' {`
`@@ -70,7 +74,9 @@ try`
`70`	`74`	`PartOfDomain = $false`
`71`	`75`	`}`
`72`	`76`	`}`
`73`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`77`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`78`	`+ ''`
	`79`	`+ }`
`74`	`80`	`Test-TargetResource -Name $Env:ComputerName -WorkGroupName 'workgroup' \| Should Be $true`
`75`	`81`	`}`
`76`	`82`	`It 'Should return True if ComputerName and Domain name is same as specified' {`
`@@ -95,7 +101,9 @@ try`
`95`	`101`	`PartOfDomain = $false`
`96`	`102`	`}`
`97`	`103`	`}`
`98`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`104`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`105`	`+ ''`
	`106`	`+ }`
`99`	`107`	`Test-TargetResource -Name $Env:ComputerName -WorkGroupName 'workgroup' \| Should Be $true`
`100`	`108`	`Test-TargetResource -Name 'localhost' -WorkGroupName 'workgroup' \| Should Be $true`
`101`	`109`	`}`
`@@ -107,7 +115,9 @@ try`
`107`	`115`	`PartOfDomain = $false`
`108`	`116`	`}`
`109`	`117`	`}`
`110`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`118`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`119`	`+ ''`
	`120`	`+ }`
`111`	`121`	`Test-TargetResource -Name $Env:ComputerName \| Should Be $true`
`112`	`122`	`Test-TargetResource -Name 'localhost' \| Should Be $true`
`113`	`123`	`Mock -CommandName Get-WmiObject {`
`@@ -131,7 +141,9 @@ try`
`131`	`141`	`PartOfDomain = $false`
`132`	`142`	`}`
`133`	`143`	`}`
`134`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`144`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`145`	`+ ''`
	`146`	`+ }`
`135`	`147`	`Test-TargetResource -Name $NotComputerName \| Should Be $false`
`136`	`148`	`Mock -CommandName Get-WmiObject -MockWith {`
`137`	`149`	`[PSCustomObject] @{`
`@@ -140,7 +152,9 @@ try`
`140`	`152`	`PartOfDomain = $true`
`141`	`153`	`}`
`142`	`154`	`}`
`143`		`- Mock -CommandName Get-ComputerDomain -MockWith {'contoso.com'}`
	`155`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`156`	`+ 'contoso.com'`
	`157`	`+ }`
`144`	`158`	`Test-TargetResource -Name $NotComputerName \| Should Be $false`
`145`	`159`	`}`
`146`	`160`	`It 'Should return False if Domain name is not same as specified' {`
`@@ -165,7 +179,9 @@ try`
`165`	`179`	`PartOfDomain = $false`
`166`	`180`	`}`
`167`	`181`	`}`
`168`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`182`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`183`	`+ ''`
	`184`	`+ }`
`169`	`185`	`Test-TargetResource -Name $Env:ComputerName -WorkGroupName 'NOTworkgroup' \| Should Be $false`
`170`	`186`	`Test-TargetResource -Name 'localhost' -WorkGroupName 'NOTworkgroup' \| Should Be $false`
`171`	`187`	`}`
`@@ -177,7 +193,9 @@ try`
`177`	`193`	`PartOfDomain = $false`
`178`	`194`	`}`
`179`	`195`	`}`
`180`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`196`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`197`	`+ ''`
	`198`	`+ }`
`181`	`199`	`Test-TargetResource -Name $NotComputerName -WorkGroupName 'workgroup' \| Should Be $false`
`182`	`200`	`Mock -CommandName Get-WMIObject -MockWith {`
`183`	`201`	`[PSCustomObject] @{`
`@@ -199,7 +217,9 @@ try`
`199`	`217`	`PartOfDomain = $false`
`200`	`218`	`}`
`201`	`219`	`}`
`202`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`220`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`221`	`+ ''`
	`222`	`+ }`
`203`	`223`	`Test-TargetResource -Name $Env:ComputerName -DomainName 'contoso.com' -Credential $Credential \| Should Be $false`
`204`	`224`	`Test-TargetResource -Name 'localhost' -DomainName 'contoso.com' -Credential $Credential \| Should Be $false`
`205`	`225`	`}`
`@@ -331,7 +351,9 @@ try`
`331`	`351`	`PartOfDomain = $false`
`332`	`352`	`}`
`333`	`353`	`}`
`334`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`354`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`355`	`+ ''`
	`356`	`+ }`
`335`	`357`	`Set-TargetResource -Name $NotComputerName -DomainName 'Contoso.com' -Credential $Credential \| Should BeNullOrEmpty`
`336`	`358`	`Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It`
`337`	`359`	`Assert-MockCalled -CommandName Add-Computer -Exactly -Times 1 -Scope It -ParameterFilter {$DomainName -and $NewName}`
`@@ -345,7 +367,9 @@ try`
`345`	`367`	`PartOfDomain = $false`
`346`	`368`	`}`
`347`	`369`	`}`
`348`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`370`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`371`	`+ ''`
	`372`	`+ }`
`349`	`373`	`Set-TargetResource -Name $NotComputerName -DomainName 'Contoso.com' -JoinOU 'OU=Computers,DC=contoso,DC=com' -Credential $Credential \| Should BeNullOrEmpty`
`350`	`374`	`Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It`
`351`	`375`	`Assert-MockCalled -CommandName Add-Computer -Exactly -Times 1 -Scope It -ParameterFilter {$DomainName -and $NewName}`
`@@ -359,7 +383,9 @@ try`
`359`	`383`	`PartOfDomain = $false`
`360`	`384`	`}`
`361`	`385`	`}`
`362`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`386`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`387`	`+ ''`
	`388`	`+ }`
`363`	`389`	`Set-TargetResource -Name $NotComputerName -WorkGroupName 'adventure-works' \| Should BeNullOrEmpty`
`364`	`390`	`Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It`
`365`	`391`	`Assert-MockCalled -CommandName Add-Computer -Exactly -Times 1 -Scope It -ParameterFilter {$WorkGroupName -and $NewName}`
`@@ -441,7 +467,9 @@ try`
`441`	`467`	`PartOfDomain = $true`
`442`	`468`	`}`
`443`	`469`	`}`
`444`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`470`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`471`	`+ ''`
	`472`	`+ }`
`445`	`473`	`Set-TargetResource -Name $Env:ComputerName -WorkGroupName 'Contoso' -UnjoinCredential $Credential \| Should BeNullOrEmpty`
`446`	`474`	`Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It`
`447`	`475`	`Assert-MockCalled -CommandName Add-Computer -Exactly -Times 0 -Scope It -ParameterFilter {$NewName}`
`@@ -456,7 +484,9 @@ try`
`456`	`484`	`PartOfDomain = $true`
`457`	`485`	`}`
`458`	`486`	`}`
`459`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`487`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`488`	`+ ''`
	`489`	`+ }`
`460`	`490`	`Set-TargetResource -Name 'localhost' -WorkGroupName 'Contoso' -UnjoinCredential $Credential \| Should BeNullOrEmpty`
`461`	`491`	`Assert-MockCalled -CommandName Rename-Computer -Exactly -Times 0 -Scope It`
`462`	`492`	`Assert-MockCalled -CommandName Add-Computer -Exactly -Times 0 -Scope It -ParameterFilter {$NewName}`
`@@ -479,7 +509,9 @@ try`
`479`	`509`	`Assert-MockCalled -CommandName Add-Computer -Exactly -Times 0 -Scope It`
`480`	`510`	`}`
`481`	`511`	`It 'Changes only ComputerName in Workgroup' {`
`482`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`512`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`513`	`+ ''`
	`514`	`+ }`
`483`	`515`	`Mock -CommandName Get-WMIObject -MockWith {`
`484`	`516`	`[PSCustomObject] @{`
`485`	`517`	`Domain = 'Contoso';`
`@@ -498,7 +530,9 @@ try`
`498`	`530`	`{Set-TargetResource -Name "ThisIsBad<>"} \| Should Throw`
`499`	`531`	`}`
`500`	`532`	`It 'Changes computer description in a workgroup' {`
`501`		`- Mock -CommandName Get-ComputerDomain -MockWith {''}`
	`533`	`+ Mock -CommandName Get-ComputerDomain -MockWith {`
	`534`	`+ ''`
	`535`	`+ }`
`502`	`536`	`Mock -CommandName Get-WMIObject {`
`503`	`537`	`[PSCustomObject] @{`
`504`	`538`	`Domain = 'Contoso';`