Skip to content

Commit 3dbc133

Browse files
johljujohlju
committed
Refactor ConvertTo-SqlDscDataFile and ConvertTo-SqlDscFileGroup integration tests to use updated parameter names
1 parent 062bdff commit 3dbc133

File tree

2 files changed

+13
-57
lines changed

2 files changed

+13
-57
lines changed

‎tests/Integration/Commands/ConvertTo-SqlDscDataFile.Integration.Tests.ps1‎

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Describe 'ConvertTo-SqlDscDataFile' -Tag @('Integration_SQL2017', 'Integration_S
7272
It 'Should convert a minimal DatabaseFileSpec to a DataFile object' {
7373
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -AsSpec
7474

75-
$result = ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup -DatabaseFileSpec $fileSpec
75+
$result = ConvertTo-SqlDscDataFile -FileGroupObject $script:mockFileGroup -DataFileSpec $fileSpec
7676

7777
$result | Should -Not -BeNullOrEmpty
7878
$result | Should -BeOfType [Microsoft.SqlServer.Management.Smo.DataFile]
@@ -83,7 +83,7 @@ Describe 'ConvertTo-SqlDscDataFile' -Tag @('Integration_SQL2017', 'Integration_S
8383
It 'Should convert a DatabaseFileSpec with Size to a DataFile object' {
8484
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -Size 100 -AsSpec
8585

86-
$result = ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup -DatabaseFileSpec $fileSpec
86+
$result = ConvertTo-SqlDscDataFile -FileGroupObject $script:mockFileGroup -DataFileSpec $fileSpec
8787

8888
$result | Should -Not -BeNullOrEmpty
8989
$result.Size | Should -Be 100
@@ -92,7 +92,7 @@ Describe 'ConvertTo-SqlDscDataFile' -Tag @('Integration_SQL2017', 'Integration_S
9292
It 'Should convert a DatabaseFileSpec with MaxSize to a DataFile object' {
9393
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -MaxSize 1000 -AsSpec
9494

95-
$result = ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup -DatabaseFileSpec $fileSpec
95+
$result = ConvertTo-SqlDscDataFile -FileGroupObject $script:mockFileGroup -DataFileSpec $fileSpec
9696

9797
$result | Should -Not -BeNullOrEmpty
9898
$result.MaxSize | Should -Be 1000
@@ -101,7 +101,7 @@ Describe 'ConvertTo-SqlDscDataFile' -Tag @('Integration_SQL2017', 'Integration_S
101101
It 'Should convert a DatabaseFileSpec with Growth to a DataFile object' {
102102
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -Growth 10 -AsSpec
103103

104-
$result = ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup -DatabaseFileSpec $fileSpec
104+
$result = ConvertTo-SqlDscDataFile -FileGroupObject $script:mockFileGroup -DataFileSpec $fileSpec
105105

106106
$result | Should -Not -BeNullOrEmpty
107107
$result.Growth | Should -Be 10
@@ -110,7 +110,7 @@ Describe 'ConvertTo-SqlDscDataFile' -Tag @('Integration_SQL2017', 'Integration_S
110110
It 'Should convert a DatabaseFileSpec with GrowthType to a DataFile object' {
111111
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -GrowthType 'Percent' -AsSpec
112112

113-
$result = ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup -DatabaseFileSpec $fileSpec
113+
$result = ConvertTo-SqlDscDataFile -FileGroupObject $script:mockFileGroup -DataFileSpec $fileSpec
114114

115115
$result | Should -Not -BeNullOrEmpty
116116
$result.GrowthType | Should -Be 'Percent'
@@ -119,7 +119,7 @@ Describe 'ConvertTo-SqlDscDataFile' -Tag @('Integration_SQL2017', 'Integration_S
119119
It 'Should convert a DatabaseFileSpec with IsPrimaryFile to a DataFile object' {
120120
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.mdf' -IsPrimaryFile $true -AsSpec
121121

122-
$result = ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup -DatabaseFileSpec $fileSpec
122+
$result = ConvertTo-SqlDscDataFile -FileGroupObject $script:mockFileGroup -DataFileSpec $fileSpec
123123

124124
$result | Should -Not -BeNullOrEmpty
125125
$result.IsPrimaryFile | Should -Be $true
@@ -128,7 +128,7 @@ Describe 'ConvertTo-SqlDscDataFile' -Tag @('Integration_SQL2017', 'Integration_S
128128
It 'Should convert a DatabaseFileSpec with all optional properties to a DataFile object' {
129129
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -Size 100 -MaxSize 1000 -Growth 10 -GrowthType 'Percent' -AsSpec
130130

131-
$result = ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup -DatabaseFileSpec $fileSpec
131+
$result = ConvertTo-SqlDscDataFile -FileGroupObject $script:mockFileGroup -DataFileSpec $fileSpec
132132

133133
$result | Should -Not -BeNullOrEmpty
134134
$result.Name | Should -Be 'TestFile'
@@ -139,25 +139,5 @@ Describe 'ConvertTo-SqlDscDataFile' -Tag @('Integration_SQL2017', 'Integration_S
139139
$result.GrowthType | Should -Be 'Percent'
140140
}
141141

142-
It 'Should accept DatabaseFileSpec from pipeline' {
143-
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -AsSpec
144-
145-
$result = $fileSpec | ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup
146-
147-
$result | Should -Not -BeNullOrEmpty
148-
$result | Should -BeOfType [Microsoft.SqlServer.Management.Smo.DataFile]
149-
$result.Name | Should -Be 'TestFile'
150-
}
151-
152-
It 'Should convert multiple DatabaseFileSpecs from pipeline' {
153-
$fileSpec1 = New-SqlDscDataFile -Name 'TestFile1' -FileName 'C:\Data\TestFile1.ndf' -AsSpec
154-
$fileSpec2 = New-SqlDscDataFile -Name 'TestFile2' -FileName 'C:\Data\TestFile2.ndf' -AsSpec
155-
156-
$result = @($fileSpec1, $fileSpec2) | ConvertTo-SqlDscDataFile -FileGroup $script:mockFileGroup
157-
158-
$result | Should -HaveCount 2
159-
$result[0].Name | Should -Be 'TestFile1'
160-
$result[1].Name | Should -Be 'TestFile2'
161-
}
162142
}
163143
}

‎tests/Integration/Commands/ConvertTo-SqlDscFileGroup.Integration.Tests.ps1‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Describe 'ConvertTo-SqlDscFileGroup' -Tag @('Integration_SQL2017', 'Integration_
6969
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -AsSpec
7070
$fileGroupSpec = New-SqlDscFileGroup -Name 'TestFileGroup' -Files @($fileSpec) -AsSpec
7171

72-
$result = ConvertTo-SqlDscFileGroup -Database $script:testDatabase -DatabaseFileGroupSpec $fileGroupSpec
72+
$result = ConvertTo-SqlDscFileGroup -DatabaseObject $script:testDatabase -FileGroupSpec $fileGroupSpec
7373

7474
$result | Should -Not -BeNullOrEmpty
7575
$result | Should -BeOfType [Microsoft.SqlServer.Management.Smo.FileGroup]
@@ -83,7 +83,7 @@ Describe 'ConvertTo-SqlDscFileGroup' -Tag @('Integration_SQL2017', 'Integration_
8383
$fileSpec2 = New-SqlDscDataFile -Name 'TestFile2' -FileName 'C:\Data\TestFile2.ndf' -AsSpec
8484
$fileGroupSpec = New-SqlDscFileGroup -Name 'TestFileGroup' -Files @($fileSpec1, $fileSpec2) -AsSpec
8585

86-
$result = ConvertTo-SqlDscFileGroup -Database $script:testDatabase -DatabaseFileGroupSpec $fileGroupSpec
86+
$result = ConvertTo-SqlDscFileGroup -DatabaseObject $script:testDatabase -FileGroupSpec $fileGroupSpec
8787

8888
$result | Should -Not -BeNullOrEmpty
8989
$result.Files.Count | Should -Be 2
@@ -95,7 +95,7 @@ Describe 'ConvertTo-SqlDscFileGroup' -Tag @('Integration_SQL2017', 'Integration_
9595
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -AsSpec
9696
$fileGroupSpec = New-SqlDscFileGroup -Name 'TestFileGroup' -Files @($fileSpec) -ReadOnly $true -AsSpec
9797

98-
$result = ConvertTo-SqlDscFileGroup -Database $script:testDatabase -DatabaseFileGroupSpec $fileGroupSpec
98+
$result = ConvertTo-SqlDscFileGroup -DatabaseObject $script:testDatabase -FileGroupSpec $fileGroupSpec
9999

100100
$result | Should -Not -BeNullOrEmpty
101101
$result.ReadOnly | Should -Be $true
@@ -105,7 +105,7 @@ Describe 'ConvertTo-SqlDscFileGroup' -Tag @('Integration_SQL2017', 'Integration_
105105
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -AsSpec
106106
$fileGroupSpec = New-SqlDscFileGroup -Name 'TestFileGroup' -Files @($fileSpec) -IsDefault $true -AsSpec
107107

108-
$result = ConvertTo-SqlDscFileGroup -Database $script:testDatabase -DatabaseFileGroupSpec $fileGroupSpec
108+
$result = ConvertTo-SqlDscFileGroup -DatabaseObject $script:testDatabase -FileGroupSpec $fileGroupSpec
109109

110110
$result | Should -Not -BeNullOrEmpty
111111
$result.IsDefault | Should -Be $true
@@ -116,7 +116,7 @@ Describe 'ConvertTo-SqlDscFileGroup' -Tag @('Integration_SQL2017', 'Integration_
116116
$fileSpec2 = New-SqlDscDataFile -Name 'TestFile2' -FileName 'C:\Data\TestFile2.ndf' -Growth 10 -GrowthType 'Percent' -AsSpec
117117
$fileGroupSpec = New-SqlDscFileGroup -Name 'TestFileGroup' -Files @($fileSpec1, $fileSpec2) -ReadOnly $false -IsDefault $false -AsSpec
118118

119-
$result = ConvertTo-SqlDscFileGroup -Database $script:testDatabase -DatabaseFileGroupSpec $fileGroupSpec
119+
$result = ConvertTo-SqlDscFileGroup -DatabaseObject $script:testDatabase -FileGroupSpec $fileGroupSpec
120120

121121
$result | Should -Not -BeNullOrEmpty
122122
$result.Name | Should -Be 'TestFileGroup'
@@ -129,36 +129,12 @@ Describe 'ConvertTo-SqlDscFileGroup' -Tag @('Integration_SQL2017', 'Integration_
129129
$result.IsDefault | Should -Be $false
130130
}
131131

132-
It 'Should accept DatabaseFileGroupSpec from pipeline' {
133-
$fileSpec = New-SqlDscDataFile -Name 'TestFile' -FileName 'C:\Data\TestFile.ndf' -AsSpec
134-
$fileGroupSpec = New-SqlDscFileGroup -Name 'TestFileGroup' -Files @($fileSpec) -AsSpec
135-
136-
$result = $fileGroupSpec | ConvertTo-SqlDscFileGroup -Database $script:testDatabase
137-
138-
$result | Should -Not -BeNullOrEmpty
139-
$result | Should -BeOfType [Microsoft.SqlServer.Management.Smo.FileGroup]
140-
$result.Name | Should -Be 'TestFileGroup'
141-
}
142-
143-
It 'Should convert multiple DatabaseFileGroupSpecs from pipeline' {
144-
$fileSpec1 = New-SqlDscDataFile -Name 'TestFile1' -FileName 'C:\Data\TestFile1.ndf' -AsSpec
145-
$fileSpec2 = New-SqlDscDataFile -Name 'TestFile2' -FileName 'C:\Data\TestFile2.ndf' -AsSpec
146-
$fileGroupSpec1 = New-SqlDscFileGroup -Name 'FileGroup1' -Files @($fileSpec1) -AsSpec
147-
$fileGroupSpec2 = New-SqlDscFileGroup -Name 'FileGroup2' -Files @($fileSpec2) -AsSpec
148-
149-
$result = @($fileGroupSpec1, $fileGroupSpec2) | ConvertTo-SqlDscFileGroup -Database $script:testDatabase
150-
151-
$result | Should -HaveCount 2
152-
$result[0].Name | Should -Be 'FileGroup1'
153-
$result[1].Name | Should -Be 'FileGroup2'
154-
}
155-
156132
It 'Should preserve file properties when converting FileGroup with complex file configurations' {
157133
$primaryFile = New-SqlDscDataFile -Name 'PrimaryFile' -FileName 'C:\Data\Primary.mdf' -IsPrimaryFile $true -Size 200 -MaxSize 2000 -Growth 20 -GrowthType 'KB' -AsSpec
158134
$secondaryFile = New-SqlDscDataFile -Name 'SecondaryFile' -FileName 'C:\Data\Secondary.ndf' -Size 100 -MaxSize 1000 -Growth 10 -GrowthType 'Percent' -AsSpec
159135
$fileGroupSpec = New-SqlDscFileGroup -Name 'ComplexFileGroup' -Files @($primaryFile, $secondaryFile) -AsSpec
160136

161-
$result = ConvertTo-SqlDscFileGroup -Database $script:testDatabase -DatabaseFileGroupSpec $fileGroupSpec
137+
$result = ConvertTo-SqlDscFileGroup -DatabaseObject $script:testDatabase -FileGroupSpec $fileGroupSpec
162138

163139
$result | Should -Not -BeNullOrEmpty
164140
$result.Files.Count | Should -Be 2

0 commit comments

Comments
 (0)