Skip to content

Commit 5224351

Browse files
andreasjordanandreasjordan
authored
Refactor tests to use variable server instead of instance for SMO server objects (part 1) (#9501)
1 parent 689268d commit 5224351

13 files changed

+148
-148
lines changed

‎tests/Add-DbaExtendedProperty.Tests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
1616

1717
BeforeAll {
1818
$random = Get-Random
19-
$instance2 = Connect-DbaInstance -SqlInstance $script:instance2
20-
$null = Get-DbaProcess -SqlInstance $instance2 | Where-Object Program -match dbatools | Stop-DbaProcess -Confirm:$false
19+
$server2 = Connect-DbaInstance -SqlInstance $script:instance2
20+
$null = Get-DbaProcess -SqlInstance $server2 | Where-Object Program -match dbatools | Stop-DbaProcess -Confirm:$false
2121
$newDbName = "dbatoolsci_newdb_$random"
22-
$db = New-DbaDatabase -SqlInstance $instance2 -Name $newDbName
22+
$db = New-DbaDatabase -SqlInstance $server2 -Name $newDbName
2323
}
2424

2525
AfterAll {

‎tests/Copy-DbaCredential.Tests.ps1

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
2020
$plaintext = "BigOlPassword!"
2121
$password = ConvertTo-SecureString $plaintext -AsPlainText -Force
2222

23-
$instance2 = Connect-DbaInstance -SqlInstance $script:instance2
24-
$instance3 = Connect-DbaInstance -SqlInstance $script:instance3
23+
$server2 = Connect-DbaInstance -SqlInstance $script:instance2
24+
$server3 = Connect-DbaInstance -SqlInstance $script:instance3
2525

2626
# Add user
2727
foreach ($login in $logins) {
@@ -58,14 +58,14 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
5858
#>
5959

6060
# check to see if a crypto provider is present on the instances
61-
$instance2CryptoProviders = $instance2.Query("SELECT name FROM sys.cryptographic_providers WHERE is_enabled = 1 ORDER BY name")
62-
$instance3CryptoProviders = $instance3.Query("SELECT name FROM sys.cryptographic_providers WHERE is_enabled = 1 ORDER BY name")
61+
$instance2CryptoProviders = $server2.Query("SELECT name FROM sys.cryptographic_providers WHERE is_enabled = 1 ORDER BY name")
62+
$instance3CryptoProviders = $server3.Query("SELECT name FROM sys.cryptographic_providers WHERE is_enabled = 1 ORDER BY name")
6363

6464
$cryptoProvider = ($instance2CryptoProviders | Where-Object { $_.name -eq $instance3CryptoProviders.name } | Select-Object -First 1).name
6565
}
6666
AfterAll {
67-
(Get-DbaCredential -SqlInstance $instance2 -Identity dbatoolsci_thor, dbatoolsci_thorsmomma, dbatoolsci_thor_crypto -ErrorAction Stop -WarningAction SilentlyContinue).Drop()
68-
(Get-DbaCredential -SqlInstance $instance3 -Identity dbatoolsci_thor, dbatoolsci_thorsmomma, dbatoolsci_thor_crypto -ErrorAction Stop -WarningAction SilentlyContinue).Drop()
67+
(Get-DbaCredential -SqlInstance $server2 -Identity dbatoolsci_thor, dbatoolsci_thorsmomma, dbatoolsci_thor_crypto -ErrorAction Stop -WarningAction SilentlyContinue).Drop()
68+
(Get-DbaCredential -SqlInstance $server3 -Identity dbatoolsci_thor, dbatoolsci_thorsmomma, dbatoolsci_thor_crypto -ErrorAction Stop -WarningAction SilentlyContinue).Drop()
6969

7070
foreach ($login in $logins) {
7171
$null = Invoke-Command2 -ScriptBlock { net user $args /delete *>&1 } -ArgumentList $login -ComputerName $script:instance2
@@ -75,16 +75,16 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
7575

7676
Context "Create new credential" {
7777
It "Should create new credentials with the proper properties" {
78-
$results = New-DbaCredential -SqlInstance $instance2 -Name dbatoolsci_thorcred -Identity dbatoolsci_thor -Password $password
78+
$results = New-DbaCredential -SqlInstance $server2 -Name dbatoolsci_thorcred -Identity dbatoolsci_thor -Password $password
7979
$results.Name | Should Be "dbatoolsci_thorcred"
8080
$results.Identity | Should Be "dbatoolsci_thor"
8181

82-
$results = New-DbaCredential -SqlInstance $instance2 -Identity dbatoolsci_thorsmomma -Password $password
82+
$results = New-DbaCredential -SqlInstance $server2 -Identity dbatoolsci_thorsmomma -Password $password
8383
$results.Name | Should Be "dbatoolsci_thorsmomma"
8484
$results.Identity | Should Be "dbatoolsci_thorsmomma"
8585

8686
if ($cryptoProvider) {
87-
$results = New-DbaCredential -SqlInstance $instance2 -Identity dbatoolsci_thor_crypto -Password $password -MappedClassType CryptographicProvider -ProviderName $cryptoProvider
87+
$results = New-DbaCredential -SqlInstance $server2 -Identity dbatoolsci_thor_crypto -Password $password -MappedClassType CryptographicProvider -ProviderName $cryptoProvider
8888
$results.Name | Should Be "dbatoolsci_thor_crypto"
8989
$results.Identity | Should Be "dbatoolsci_thor_crypto"
9090
$results.ProviderName | Should -Be $cryptoProvider
@@ -94,13 +94,13 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
9494

9595
Context "Copy Credential with the same properties." {
9696
It "Should copy successfully" {
97-
$results = Copy-DbaCredential -Source $instance2 -Destination $instance3 -Name dbatoolsci_thorcred
97+
$results = Copy-DbaCredential -Source $server2 -Destination $server3 -Name dbatoolsci_thorcred
9898
$results.Status | Should Be "Successful"
9999
}
100100

101101
It "Should retain its same properties" {
102-
$Credential1 = Get-DbaCredential -SqlInstance $instance2 -Name dbatoolsci_thor -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
103-
$Credential2 = Get-DbaCredential -SqlInstance $instance3 -Name dbatoolsci_thor -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
102+
$Credential1 = Get-DbaCredential -SqlInstance $server2 -Name dbatoolsci_thor -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
103+
$Credential2 = Get-DbaCredential -SqlInstance $server3 -Name dbatoolsci_thor -ErrorAction SilentlyContinue -WarningAction SilentlyContinue
104104

105105
# Compare its value
106106
$Credential1.Name | Should Be $Credential2.Name
@@ -110,26 +110,26 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
110110

111111
Context "No overwrite" {
112112
It "does not overwrite without force" {
113-
$results = Copy-DbaCredential -Source $instance2 -Destination $instance3 -Name dbatoolsci_thorcred
113+
$results = Copy-DbaCredential -Source $server2 -Destination $server3 -Name dbatoolsci_thorcred
114114
$results.Status | Should Be "Skipping"
115115
}
116116
}
117117

118118
# See https://github.com/dataplat/dbatools/issues/7896 and comments above in BeforeAll
119119
Context "Crypto provider cred" {
120120
It -Skip:(-not $cryptoProvider) "ensure copied credential is using the same crypto provider" {
121-
$results = Copy-DbaCredential -Source $instance2 -Destination $instance3 -Name dbatoolsci_thor_crypto
121+
$results = Copy-DbaCredential -Source $server2 -Destination $server3 -Name dbatoolsci_thor_crypto
122122
$results.Status | Should Be Successful
123-
$results = Get-DbaCredential -SqlInstance $instance3 -Name dbatoolsci_thor_crypto
123+
$results = Get-DbaCredential -SqlInstance $server3 -Name dbatoolsci_thor_crypto
124124
$results.Name | Should -Be dbatoolsci_thor_crypto
125125
$results.ProviderName | Should -Be $cryptoProvider
126126
}
127127

128128
It -Skip:(-not $cryptoProvider) "check warning message if crypto provider is not configured/enabled on destination" {
129-
Remove-DbaCredential -SqlInstance $instance3 -Credential dbatoolsci_thor_crypto -Confirm:$false
130-
$instance3.Query("ALTER CRYPTOGRAPHIC PROVIDER $cryptoProvider DISABLE")
131-
$results = Copy-DbaCredential -Source $instance2 -Destination $instance3 -Name dbatoolsci_thor_crypto
132-
$instance3.Query("ALTER CRYPTOGRAPHIC PROVIDER $cryptoProvider ENABLE")
129+
Remove-DbaCredential -SqlInstance $server3 -Credential dbatoolsci_thor_crypto -Confirm:$false
130+
$server3.Query("ALTER CRYPTOGRAPHIC PROVIDER $cryptoProvider DISABLE")
131+
$results = Copy-DbaCredential -Source $server2 -Destination $server3 -Name dbatoolsci_thor_crypto
132+
$server3.Query("ALTER CRYPTOGRAPHIC PROVIDER $cryptoProvider ENABLE")
133133
$results.Status | Should Be Failed
134134
$results.Notes | Should -Match "The cryptographic provider $cryptoProvider needs to be configured and enabled on"
135135
}

‎tests/Copy-DbaDbAssembly.Tests.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ Describe "$CommandName Unit Tests" -Tag 'UnitTests' {
1515

1616
Describe "$commandname Integration Tests" -Tag "IntegrationTests" {
1717
BeforeAll {
18-
$instance3 = Connect-DbaInstance -SqlInstance $script:instance3
19-
$instance3.Query("CREATE DATABASE dbclrassembly")
20-
$instance3.Query("EXEC sp_configure 'CLR ENABLED' , '1'")
21-
$instance3.Query("RECONFIGURE")
18+
$server3 = Connect-DbaInstance -SqlInstance $script:instance3
19+
$server3.Query("CREATE DATABASE dbclrassembly")
20+
$server3.Query("EXEC sp_configure 'CLR ENABLED' , '1'")
21+
$server3.Query("RECONFIGURE")
2222

23-
$instance2 = Connect-DbaInstance -SqlInstance $script:instance2
24-
$instance2.Query("CREATE DATABASE dbclrassembly")
25-
$instance2.Query("EXEC sp_configure 'CLR ENABLED' , '1'")
26-
$instance2.Query("RECONFIGURE")
23+
$server2 = Connect-DbaInstance -SqlInstance $script:instance2
24+
$server2.Query("CREATE DATABASE dbclrassembly")
25+
$server2.Query("EXEC sp_configure 'CLR ENABLED' , '1'")
26+
$server2.Query("RECONFIGURE")
2727

2828
$instance2DB = Get-DbaDatabase -SqlInstance $script:instance2 -Database dbclrassembly
2929
$instance2DB.Query("CREATE ASSEMBLY [resolveDNS] AUTHORIZATION [dbo] FROM 0x4D5A90000300000004000000FFFF0000B800000000000000400000000000000000000000000000000000000000000000000000000000000000000000800000000E1FBA0E00B409CD21B8014CCD21546869732070726F6772616D2063616E6E6F742062652072756E20696E20444F53206D6F64652E0D0D0A2400000000000000504500004C010300457830570000000000000000E00002210B010B000008000000060000000000002E260000002000000040000000000010002000000002000004000000000000000400000000000000008000000002000000000000030040850000100000100000000010000010000000000000100000000000000000000000E02500004B00000000400000B002000000000000000000000000000000000000006000000C000000A82400001C0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000080000000000000000000000082000004800000000000000000000002E7465787400000034060000002000000008000000020000000000000000000000000000200000602E72737263000000B00200000040000000040000000A0000000000000000000000000000400000402E72656C6F6300000C0000000060000000020000000E0000000000000000000000000000400000420000000000000000000000000000000010260000000000004800000002000500A42000000404000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001B3001002F000000010000110000026F0500000A280600000A6F0700000A6F0800000A0A06730900000A0BDE0B260002730900000A0BDE0000072A0001100000000001002021000B010000011E02280A00000A2A42534A4201000100000000000C00000076322E302E35303732370000000005006C00000070010000237E0000DC010000A401000023537472696E67730000000080030000080000002355530088030000100000002347554944000000980300006C00000023426C6F620000000000000002000001471502000900000000FA253300160000010000000A0000000200000002000000010000000A0000000400000001000000010000000300000000000A0001000000000006003E0037000A006600510006009D008A000F00B10000000600E000C00006000001C0000A00440129010600590137000E00700165010E007401650100000000010000000000010001000100100019000000050001000100502000000000960070000A0001009C200000000086187D001000020000000100830019007D00140029007D001A0031007D00100039007D00100041006001240049008001280051008D01240009009A01240011007D002E0009007D001000200023001F002E000B0039002E00130042002E001B004B0033000480000000000000000000000000000000001E01000002000000000000000000000001002E00000000000200000000000000000000000100450000000000020000000000000000000000010037000000000000000000003C4D6F64756C653E007265736F6C7665444E532E646C6C0055736572446566696E656446756E6374696F6E73006D73636F726C69620053797374656D004F626A6563740053797374656D2E446174610053797374656D2E446174612E53716C54797065730053716C537472696E67004950746F486F73744E616D65002E63746F72006970616464720053797374656D2E446961676E6F73746963730044656275676761626C6541747472696275746500446562756767696E674D6F6465730053797374656D2E52756E74696D652E436F6D70696C6572536572766963657300436F6D70696C6174696F6E52656C61786174696F6E734174747269627574650052756E74696D65436F6D7061746962696C697479417474726962757465007265736F6C7665444E53004D6963726F736F66742E53716C5365727665722E5365727665720053716C46756E6374696F6E41747472696275746500537472696E67005472696D0053797374656D2E4E657400446E73004950486F7374456E74727900476574486F7374456E747279006765745F486F73744E616D6500546F537472696E6700000003200000000000BBBB2D2F51E12E4791398BFA79459ABA0008B77A5C561934E08905000111090E03200001052001011111042001010804010000000320000E05000112290E042001010E0507020E11090801000701000000000801000800000000001E01000100540216577261704E6F6E457863657074696F6E5468726F7773010000000000004578305700000000020000001C010000C4240000C40600005253445357549849C5462E43AD588F97CA53634201000000633A5C74656D705C4461746162617365315C4461746162617365315C6F626A5C44656275675C7265736F6C7665444E532E706462000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000826000000000000000000001E260000002000000000000000000000000000000000000000000000102600000000000000005F436F72446C6C4D61696E006D73636F7265652E646C6C0000000000FF25002000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100100000001800008000000000000000000000000000000100010000003000008000000000000000000000000000000100000000004800000058400000540200000000000000000000540234000000560053005F00560045005200530049004F004E005F0049004E0046004F0000000000BD04EFFE00000100000000000000000000000000000000003F000000000000000400000002000000000000000000000000000000440000000100560061007200460069006C00650049006E0066006F00000000002400040000005400720061006E0073006C006100740069006F006E00000000000000B004B4010000010053007400720069006E006700460069006C00650049006E0066006F0000009001000001003000300030003000300034006200300000002C0002000100460069006C0065004400650073006300720069007000740069006F006E000000000020000000300008000100460069006C006500560065007200730069006F006E000000000030002E0030002E0030002E003000000040000F00010049006E007400650072006E0061006C004E0061006D00650000007200650073006F006C007600650044004E0053002E0064006C006C00000000002800020001004C006500670061006C0043006F00700079007200690067006800740000002000000048000F0001004F0072006900670069006E0061006C00460069006C0065006E0061006D00650000007200650073006F006C007600650044004E0053002E0064006C006C0000000000340008000100500072006F006400750063007400560065007200730069006F006E00000030002E0030002E0030002E003000000038000800010041007300730065006D0062006C0079002000560065007200730069006F006E00000030002E0030002E0030002E003000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000C000000303600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000")
3030

3131
$hash = $instance2DB.Query("SELECT HASHBYTES('SHA2_512', content) AS SHA2_512 FROM sys.assembly_files WHERE name = 'resolveDNS'")
3232
$hexStr = "0x$(($hash.SHA2_512 | ForEach-Object ToString X2) -join '')"
33-
$instance3.Query("
33+
$server3.Query("
3434
DECLARE
3535
@hash VARBINARY(64) = $hexStr
3636
, @assemblyName NVARCHAR(4000) = 'resolveDNS';
@@ -41,7 +41,7 @@ Describe "$commandname Integration Tests" -Tag "IntegrationTests" {
4141
}
4242
AfterAll {
4343
Get-DbaDatabase -SqlInstance $script:instance2, $script:instance3 -Database dbclrassembly | Remove-DbaDatabase -Confirm:$false
44-
$instance3.Query("
44+
$server3.Query("
4545
DECLARE
4646
@hash VARBINARY(64) = $hexStr
4747
, @assemblyName NVARCHAR(4000) = 'resolveDNS';

0 commit comments

Comments
 (0)