Skip to content

Commit d592aa8

Browse files
author
Milos Todic
committed
Modifying tests not to require any prepared resources. Addressing comments.
1 parent d7df235 commit d592aa8

File tree

4 files changed

+35420
-3973
lines changed

4 files changed

+35420
-3973
lines changed

src/Sql/Sql.Test/ScenarioTests/VirtualClusterCrudScenarioTests.ps1

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
function Test-GetVirtualCluster
2222
{
2323
# Setup
24-
$location = "eastus"
24+
$location = Get-ProviderLocation "Microsoft.Sql/virtualclusters"
2525
$rg = Create-ResourceGroupForTest $location
2626

27-
$rgName = "RG_MIPlayground"
28-
$vnetName = "VNET_MIPlayground"
29-
$subnetName = "VCReservedSubnet"
27+
$rgName = $rg.ResourceGroupName
28+
$vnetName = "cl_initial"
29+
$subnetName = "Cool"
3030

3131
# Setup VNET
3232
$virtualNetwork = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $location $rgName
33-
$subnetId = $virtualNetwork.Subnets.where({ $_.Name -eq $subnetName }).Id
33+
$subnetId = $virtualNetwork.Subnets.where({ $_.Name -eq $subnetName })[0].Id
3434

3535
$managedInstance = Create-ManagedInstanceForTest $rg $subnetId
3636

@@ -39,18 +39,15 @@ function Test-GetVirtualCluster
3939
# Test using all parameters
4040
$virtualClusterList = Get-AzSqlVirtualCluster
4141
$virtualCluster = $virtualClusterList.where({$_.SubnetId -eq $subnetId})
42-
Assert-AreEqual $location $virtualCluster.Location
4342
Assert-AreEqual $rgName $virtualCluster.ResourceGroupName
4443
$virtualClusterName = $virtualCluster.VirtualClusterName
4544

4645
$virtualClusterList = Get-AzSqlVirtualCluster -ResourceGroupName $rgName
4746
$virtualCluster = $virtualClusterList.where({$_.SubnetId -eq $subnetId})
48-
Assert-AreEqual $location $virtualCluster.Location
4947
Assert-AreEqual $rgName $virtualCluster.ResourceGroupName
5048
Assert-AreEqual $virtualClusterName $virtualCluster.VirtualClusterName
5149

5250
$virtualCluster = Get-AzSqlVirtualCluster -ResourceGroupName $rgName -Name $virtualClusterName
53-
Assert-AreEqual $location $virtualCluster.Location
5451
Assert-AreEqual $rgName $virtualCluster.ResourceGroupName
5552
Assert-AreEqual $virtualClusterName $virtualCluster.VirtualClusterName
5653
Assert-AreEqual $subnetId $virtualCluster.SubnetId
@@ -70,16 +67,16 @@ function Test-GetVirtualCluster
7067
function Test-RemoveVirtualCluster
7168
{
7269
# Setup
73-
$location = "eastus"
70+
$location = Get-ProviderLocation "Microsoft.Sql/virtualclusters"
7471
$rg = Create-ResourceGroupForTest $location
7572

76-
$rgName = "RG_MIPlayground"
77-
$vnetName = "VNET_MIPlayground"
78-
$subnetName = "VCReservedSubnet"
73+
$rgName = $rg.ResourceGroupName
74+
$vnetName = "cl_initial"
75+
$subnetName = "Cool"
7976

8077
# Setup VNET
8178
$virtualNetwork = CreateAndGetVirtualNetworkForManagedInstance $vnetName $subnetName $location $rgName
82-
$subnetId = $virtualNetwork.Subnets.where({ $_.Name -eq $subnetName }).Id
79+
$subnetId = $virtualNetwork.Subnets.where({ $_.Name -eq $subnetName })[0].Id
8380

8481
$managedInstance = Create-ManagedInstanceForTest $rg $subnetId
8582

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.VirtualClusterCrudScenarioTests/TestGetVirtualCluster.json

Lines changed: 24978 additions & 360 deletions
Large diffs are not rendered by default.

src/Sql/Sql.Test/SessionRecords/Microsoft.Azure.Commands.Sql.Test.ScenarioTests.VirtualClusterCrudScenarioTests/TestRemoveVirtualCluster.json

Lines changed: 10431 additions & 3599 deletions
Large diffs are not rendered by default.

src/Sql/Sql/Az.Sql.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ PrivateData = @{
272272
# IconUri = ''
273273

274274
# ReleaseNotes of this module
275-
ReleaseNotes = '* Add Virtual Cluster cmdlets'
275+
ReleaseNotes = '* Support Database Data Classification.'
276276

277277
# Prerelease string of this module
278278
# Prerelease = ''

0 commit comments

Comments
 (0)