Skip to content

Commit bcce6c2

Browse files
PlagueHOPlagueHO
committed
Changes as per PR Comments
1 parent 072d521 commit bcce6c2

3 files changed

Lines changed: 28 additions & 31 deletions

File tree

‎DSCResources/MSFT_xComputer/MSFT_xComputer.psm1‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidGlobalVars", "", Scope = "Function")]
1+
[Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSAvoidGlobalVars', '', Scope = 'Function')]
22
param
33
(
44
)
@@ -441,8 +441,6 @@ function Test-TargetResource
441441

442442
Write-Verbose -Message ($script:localizedData.TestingComputerStateMessage -f $Name)
443443

444-
Write-Verbose -Message ($script:localizedData.CheckingComputerNameMessage -f $Name)
445-
446444
if (($Name -ne 'localhost') -and ($Name -ne $env:COMPUTERNAME))
447445
{
448446
return $false
@@ -490,7 +488,7 @@ function Test-TargetResource
490488
}
491489
catch
492490
{
493-
Write-Verbose -Message ($script:localizedData.CheckingNotDomainMemberMessage -f $DomainName)
491+
Write-Verbose -Message ($script:localizedData.CheckingNotDomainMemberMessage)
494492

495493
return $false
496494
}
@@ -545,7 +543,7 @@ function Assert-DomainOrWorkGroup
545543
Returns the domain the computer is joined to.
546544
547545
.PARAMETER NetBios
548-
Specifies if the Net Bios name is returned instead of
546+
Specifies if the NetBIOS name is returned instead of
549547
the fully qualified domain name.
550548
#>
551549
function Get-ComputerDomain

‎DSCResources/MSFT_xComputer/en-US/MSFT_xComputer.strings.psd1‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ConvertFrom-StringData @'
99
JoinedWorkgroupMessage = Added computer to workgroup '{0}'.
1010
CredentialsNotSpecifiedError = Must to specify credentials with domain.
1111
TestingComputerStateMessage = Testing computer state for '{0}'.
12-
CheckingComputerNameMessage = Checking if computer name is {0}.
1312
CheckingComputerDescriptionMessage = Checking if computer description is '{0}'.
1413
CheckingDomainMemberMessage = Checking if the machine is a member of domain '{0}'.
1514
CheckingNotDomainMemberMessage = Checking if the machine is a not a member of a domain.

‎Tests/Unit/MSFT_xComputer.Tests.ps1‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ try
5555

5656
{
5757
Test-TargetResource `
58-
-Name $Env:ComputerName `
58+
-Name $env:COMPUTERNAME `
5959
-DomainName 'contoso.com' `
6060
-WorkGroupName 'workgroup' `
6161
-Verbose
@@ -69,7 +69,7 @@ try
6969

7070
{
7171
Test-TargetResource `
72-
-Name $Env:ComputerName `
72+
-Name $env:COMPUTERNAME `
7373
-DomainName 'contoso.com' `
7474
-Verbose
7575
} | Should Throw $errorRecord
@@ -89,7 +89,7 @@ try
8989
}
9090

9191
Test-TargetResource `
92-
-Name $Env:ComputerName `
92+
-Name $env:COMPUTERNAME `
9393
-DomainName 'Contoso.com' `
9494
-Credential $credential `
9595
-Verbose | Should Be $true
@@ -109,7 +109,7 @@ try
109109
}
110110

111111
Test-TargetResource `
112-
-Name $Env:ComputerName `
112+
-Name $env:COMPUTERNAME `
113113
-WorkGroupName 'workgroup' `
114114
-Verbose | Should Be $true
115115
}
@@ -128,7 +128,7 @@ try
128128
}
129129

130130
Test-TargetResource `
131-
-Name $Env:ComputerName `
131+
-Name $env:COMPUTERNAME `
132132
-DomainName 'contoso.com' `
133133
-Credential $credential `
134134
-Verbose | Should Be $true
@@ -154,7 +154,7 @@ try
154154
}
155155

156156
Test-TargetResource `
157-
-Name $Env:ComputerName `
157+
-Name $env:COMPUTERNAME `
158158
-WorkGroupName 'workgroup' `
159159
-Verbose | Should Be $true
160160

@@ -178,7 +178,7 @@ try
178178
}
179179

180180
Test-TargetResource `
181-
-Name $Env:ComputerName `
181+
-Name $env:COMPUTERNAME `
182182
-Verbose | Should Be $true
183183

184184
Test-TargetResource `
@@ -198,7 +198,7 @@ try
198198
}
199199

200200
Test-TargetResource `
201-
-Name $Env:ComputerName `
201+
-Name $env:COMPUTERNAME `
202202
-Verbose | Should Be $true
203203

204204
Test-TargetResource `
@@ -254,7 +254,7 @@ try
254254
}
255255

256256
Test-TargetResource `
257-
-Name $Env:ComputerName `
257+
-Name $env:COMPUTERNAME `
258258
-DomainName 'adventure-works.com' `
259259
-Credential $credential `
260260
-Verbose | Should Be $false
@@ -280,7 +280,7 @@ try
280280
}
281281

282282
Test-TargetResource `
283-
-Name $Env:ComputerName `
283+
-Name $env:COMPUTERNAME `
284284
-WorkGroupName 'NOTworkgroup' `
285285
-Verbose | Should Be $false
286286

@@ -341,7 +341,7 @@ try
341341
}
342342

343343
Test-TargetResource `
344-
-Name $Env:ComputerName `
344+
-Name $env:COMPUTERNAME `
345345
-DomainName 'contoso.com' `
346346
-Credential $credential `
347347
-Verbose | Should Be $false
@@ -367,7 +367,7 @@ try
367367
}
368368

369369
Test-TargetResource `
370-
-Name $Env:ComputerName `
370+
-Name $env:COMPUTERNAME `
371371
-WorkGroupName 'Contoso' `
372372
-Credential $credential `
373373
-UnjoinCredential $credential `
@@ -384,23 +384,23 @@ try
384384
It 'Throws if name is to long' {
385385
{
386386
Test-TargetResource `
387-
-Name "ThisNameIsTooLong" `
387+
-Name 'ThisNameIsTooLong' `
388388
-Verbose
389389
} | Should Throw
390390
}
391391

392392
It 'Throws if name contains illegal characters' {
393393
{
394394
Test-TargetResource `
395-
-Name "ThisIsBad<>" `
395+
-Name 'ThisIsBad<>' `
396396
-Verbose
397397
} | Should Throw
398398
}
399399

400400
It 'Should not Throw if name is localhost' {
401401
{
402402
Test-TargetResource `
403-
-Name "localhost" `
403+
-Name 'localhost' `
404404
-Verbose
405405
} | Should Not Throw
406406
}
@@ -463,15 +463,15 @@ try
463463
It 'Throws if name is to long' {
464464
{
465465
Get-TargetResource `
466-
-Name "ThisNameIsTooLong" `
466+
-Name 'ThisNameIsTooLong' `
467467
-Verbose
468468
} | Should Throw
469469
}
470470

471471
It 'Throws if name contains illegal characters' {
472472
{
473473
Get-TargetResource `
474-
-Name "ThisIsBad<>" `
474+
-Name 'ThisIsBad<>' `
475475
-Verbose
476476
} | Should Throw
477477
}
@@ -488,7 +488,7 @@ try
488488

489489
{
490490
Set-TargetResource `
491-
-Name $Env:ComputerName `
491+
-Name $env:COMPUTERNAME `
492492
-DomainName 'contoso.com' `
493493
-WorkGroupName 'workgroup' `
494494
-Verbose
@@ -505,7 +505,7 @@ try
505505

506506
{
507507
Set-TargetResource `
508-
-Name $Env:ComputerName `
508+
-Name $env:COMPUTERNAME `
509509
-DomainName 'contoso.com' `
510510
-Verbose
511511
} | Should Throw $errorRecord
@@ -675,7 +675,7 @@ try
675675
}
676676

677677
Set-TargetResource `
678-
-Name $Env:ComputerName `
678+
-Name $env:COMPUTERNAME `
679679
-DomainName 'adventure-works.com' `
680680
-Credential $credential `
681681
-UnjoinCredential $credential `
@@ -727,7 +727,7 @@ try
727727
}
728728

729729
Set-TargetResource `
730-
-Name $Env:ComputerName `
730+
-Name $env:COMPUTERNAME `
731731
-DomainName 'adventure-works.com' `
732732
-JoinOU 'OU=Computers,DC=contoso,DC=com' `
733733
-Credential $credential `
@@ -781,7 +781,7 @@ try
781781
}
782782

783783
Set-TargetResource `
784-
-Name $Env:ComputerName `
784+
-Name $env:COMPUTERNAME `
785785
-WorkGroupName 'Contoso' `
786786
-UnjoinCredential $credential `
787787
-Verbose | Should BeNullOrEmpty
@@ -863,15 +863,15 @@ try
863863
It 'Throws if name is to long' {
864864
{
865865
Set-TargetResource `
866-
-Name "ThisNameIsTooLong" `
866+
-Name 'ThisNameIsTooLong' `
867867
-Verbose
868868
} | Should Throw
869869
}
870870

871871
It 'Throws if name contains illegal characters' {
872872
{
873873
Set-TargetResource `
874-
-Name "ThisIsBad<>" `
874+
-Name 'ThisIsBad<>' `
875875
-Verbose
876876
} | Should Throw
877877
}
@@ -912,7 +912,7 @@ try
912912
}
913913

914914
Set-TargetResource `
915-
-Name $env:ComputerName `
915+
-Name $env:COMPUTERNAME `
916916
-Verbose | Should BeNullOrEmpty
917917

918918
Set-TargetResource `

0 commit comments

Comments
 (0)