Skip to content

Commit afd0f58

Browse files
huangpfhuangpf
committed
Merge pull request #6 from Azure/dev
`
2 parents f1df0b4 + d2fe114 commit afd0f58

File tree

13 files changed

+5566
-35
lines changed

13 files changed

+5566
-35
lines changed

‎src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.0.18.2-preview\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6666
</Reference>
6767
<Reference Include="Microsoft.Azure.Management.Sql">
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.25.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Sql.0.26.0-prerelease\lib\net40\Microsoft.Azure.Management.Sql.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7171
<SpecificVersion>False</SpecificVersion>
@@ -329,15 +329,27 @@
329329
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseCreate.json">
330330
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
331331
</None>
332+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseCreateV2.json">
333+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
334+
</None>
332335
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseGet.json">
333336
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
334337
</None>
338+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseGetV2.json">
339+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
340+
</None>
335341
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseRemove.json">
336342
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
337343
</None>
344+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseRemoveV2.json">
345+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
346+
</None>
338347
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseUpdate.json">
339348
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
340349
</None>
350+
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.DatabaseCrudTests\TestDatabaseUpdateV2.json">
351+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
352+
</None>
341353
<None Include="SessionRecords\Microsoft.Azure.Commands.Sql.Test.ScenarioTests.ElasticPoolCrudTests\TestElasticPoolCreate.json">
342354
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
343355
</None>

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,14 @@ function Remove-ResourceGroupForTest ($rg)
144144
.SYNOPSIS
145145
Creates the test environment needed to perform the Sql server CRUD tests
146146
#>
147-
function Create-ServerForTest ($resourceGroup, $location = "Japan East")
147+
function Create-ServerForTest ($resourceGroup, $serverVersion = "12.0", $location = "Japan East")
148148
{
149149
$serverName = Get-ServerName
150-
$version = "12.0"
151150
$serverLogin = "testusername"
152151
$serverPassword = "t357ingP@s5w0rd!"
153152
$credentials = new-object System.Management.Automation.PSCredential($serverLogin, ($serverPassword | ConvertTo-SecureString -asPlainText -Force))
154153

155-
$server = New-AzureSqlServer -ResourceGroupName $resourceGroup.ResourceGroupName -ServerName $serverName -Location $location -ServerVersion $version -SqlAdminCredentials $credentials
154+
$server = New-AzureSqlServer -ResourceGroupName $resourceGroup.ResourceGroupName -ServerName $serverName -Location $location -ServerVersion $serverVersion -SqlAdminCredentials $credentials
156155
return $server
157156
}
158157

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseCrudTests.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,33 @@ public void TestDatabaseRemove()
4747
{
4848
RunPowerShellTest("Test-RemoveDatabase");
4949
}
50+
51+
[Fact]
52+
[Trait(Category.Sql, Category.CheckIn)]
53+
public void TestDatabaseCreateV2()
54+
{
55+
RunPowerShellTest("Test-CreateDatabaseV2");
56+
}
57+
58+
[Fact]
59+
[Trait(Category.Sql, Category.CheckIn)]
60+
public void TestDatabaseUpdateV2()
61+
{
62+
RunPowerShellTest("Test-UpdateDatabaseV2");
63+
}
64+
65+
[Fact]
66+
[Trait(Category.Sql, Category.CheckIn)]
67+
public void TestDatabaseGetV2()
68+
{
69+
RunPowerShellTest("Test-GetDatabaseV2");
70+
}
71+
72+
[Fact]
73+
[Trait(Category.Sql, Category.CheckIn)]
74+
public void TestDatabaseRemoveV2()
75+
{
76+
RunPowerShellTest("Test-RemoveDatabaseV2");
77+
}
5078
}
5179
}

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/DatabaseCrudTests.ps1

Lines changed: 101 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,52 @@
1717
Tests creating a database
1818
#>
1919
function Test-CreateDatabase
20+
{
21+
Test-CreateDatabaseInternal "12.0"
22+
}
23+
24+
<#
25+
.SYNOPSIS
26+
Tests creating a database
27+
#>
28+
function Test-CreateDatabaseV2
29+
{
30+
Test-CreateDatabaseInternal "2.0" "North Central US"
31+
}
32+
33+
<#
34+
.SYNOPSIS
35+
Tests creating a database
36+
#>
37+
function Test-CreateDatabaseInternal ($serverVersion, $location = "Japan East")
2038
{
2139
# Setup
2240
$rg = Create-ResourceGroupForTest
23-
$server = Create-ServerForTest $rg
41+
$server = Create-ServerForTest $rg $serverVersion $location
2442

2543
try
2644
{
27-
# Create with default values
28-
$databaseName = Get-DatabaseName
29-
$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
30-
Assert-AreEqual $db.DatabaseName $databaseName
31-
Assert-NotNull $db.MaxSizeBytes
32-
Assert-NotNull $db.Edition
33-
Assert-NotNull $db.CurrentServiceLevelObjectiveName
34-
Assert-NotNull $db.CollationName
35-
36-
# Create with default values via piping
37-
$databaseName = Get-DatabaseName
38-
$db = $server | New-AzureSqlDatabase -DatabaseName $databaseName
39-
Assert-AreEqual $db.DatabaseName $databaseName
40-
Assert-NotNull $db.MaxSizeBytes
41-
Assert-NotNull $db.Edition
42-
Assert-NotNull $db.CurrentServiceLevelObjectiveName
43-
Assert-NotNull $db.CollationName
45+
if ($serverVersion -ne "2.0")
46+
{
47+
# Create with default values
48+
$databaseName = Get-DatabaseName
49+
$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
50+
Assert-AreEqual $db.DatabaseName $databaseName
51+
Assert-NotNull $db.MaxSizeBytes
52+
Assert-NotNull $db.Edition
53+
Assert-NotNull $db.CurrentServiceLevelObjectiveName
54+
Assert-NotNull $db.CollationName
4455

56+
# Create with default values via piping
57+
$databaseName = Get-DatabaseName
58+
$db = $server | New-AzureSqlDatabase -DatabaseName $databaseName
59+
Assert-AreEqual $db.DatabaseName $databaseName
60+
Assert-NotNull $db.MaxSizeBytes
61+
Assert-NotNull $db.Edition
62+
Assert-NotNull $db.CurrentServiceLevelObjectiveName
63+
Assert-NotNull $db.CollationName
64+
}
65+
4566
# Create with all parameters
4667
$databaseName = Get-DatabaseName
4768
$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
@@ -68,23 +89,40 @@ function Test-CreateDatabase
6889
}
6990
}
7091

71-
7292
<#
7393
.SYNOPSIS
7494
Tests updating a database
7595
#>
7696
function Test-UpdateDatabase
97+
{
98+
Test-UpdateDatabaseInternal "12.0"
99+
}
100+
101+
<#
102+
.SYNOPSIS
103+
Tests updating a database
104+
#>
105+
function Test-UpdateDatabaseV2
106+
{
107+
Test-UpdateDatabaseInternal "2.0" "North Central US"
108+
}
109+
110+
<#
111+
.SYNOPSIS
112+
Tests updating a database
113+
#>
114+
function Test-UpdateDatabaseInternal ($serverVersion, $location = "Japan East")
77115
{
78116
# Setup
79117
$rg = Create-ResourceGroupForTest
80-
$server = Create-ServerForTest $rg
118+
$server = Create-ServerForTest $rg $serverVersion $location
81119

82-
# Create with default values
83120
$databaseName = Get-DatabaseName
84-
$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
121+
$db = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName `
122+
-Edition Standard -MaxSizeBytes 250GB -RequestedServiceObjectiveName S0
85123
Assert-AreEqual $db.DatabaseName $databaseName
86124

87-
#Default database will be Standard s0 with maxsize: 268435456000 (250GB)
125+
# Database will be Standard s0 with maxsize: 268435456000 (250GB)
88126

89127
try
90128
{
@@ -117,14 +155,32 @@ function Test-UpdateDatabase
117155
Tests Getting a database
118156
#>
119157
function Test-GetDatabase
158+
{
159+
Test-GetDatabaseInternal "12.0"
160+
}
161+
162+
<#
163+
.SYNOPSIS
164+
Tests Getting a database
165+
#>
166+
function Test-GetDatabaseV2
167+
{
168+
Test-GetDatabaseInternal "2.0" "North Central US"
169+
}
170+
171+
<#
172+
.SYNOPSIS
173+
Tests Getting a database
174+
#>
175+
function Test-GetDatabaseInternal ($serverVersion, $location = "Japan East")
120176
{
121177
# Setup
122178
$rg = Create-ResourceGroupForTest
123-
$server = Create-ServerForTest $rg
179+
$server = Create-ServerForTest $rg $serverVersion $location
124180

125181
# Create with default values
126182
$databaseName = Get-DatabaseName
127-
$db1 = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
183+
$db1 = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -MaxSizeBytes 1GB
128184
Assert-AreEqual $db1.DatabaseName $databaseName
129185

130186
# Create database with non-defaults
@@ -166,14 +222,32 @@ function Test-GetDatabase
166222
Tests Deleting a database
167223
#>
168224
function Test-RemoveDatabase
225+
{
226+
Test-RemoveDatabaseInternal "12.0"
227+
}
228+
229+
<#
230+
.SYNOPSIS
231+
Tests Deleting a database
232+
#>
233+
function Test-RemoveDatabaseV2
234+
{
235+
Test-RemoveDatabaseInternal "2.0" "North Central US"
236+
}
237+
238+
<#
239+
.SYNOPSIS
240+
Tests Deleting a database
241+
#>
242+
function Test-RemoveDatabaseInternal ($serverVersion, $location = "Japan East")
169243
{
170244
# Setup
171245
$rg = Create-ResourceGroupForTest
172-
$server = Create-ServerForTest $rg
246+
$server = Create-ServerForTest $rg $serverVersion $location
173247

174248
# Create with default values
175249
$databaseName = Get-DatabaseName
176-
$db1 = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName
250+
$db1 = New-AzureSqlDatabase -ResourceGroupName $rg.ResourceGroupName -ServerName $server.ServerName -DatabaseName $databaseName -MaxSizeBytes 1GB
177251
Assert-AreEqual $db1.DatabaseName $databaseName
178252

179253
# Create database with non-defaults

‎src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/RecommendedElasticPoolTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.Sql.Test.ScenarioTests
2020
{
2121
public class RecommendedElasticPoolTests : SqlTestsBase
2222
{
23-
[Fact]
23+
[Fact(Skip="Test needs to be regenerated. Will be done by recommendations team.")]
2424
[Trait(Category.Sql, Category.CheckIn)]
2525
public void TestRecommendedElasticPoolList()
2626
{

0 commit comments

Comments
 (0)