Skip to content

Commit 57a5968

Browse files
author
maddieclayton
committed
fix prefix in test files
1 parent ee5b523 commit 57a5968

File tree

427 files changed

+14158
-14158
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

427 files changed

+14158
-14158
lines changed

‎src/Accounts/Accounts.Test/ArgumentCompleterTests.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ function Test-LocationCompleter
2525
$assembly = [System.Reflection.Assembly]::LoadFrom($filePath)
2626
$resourceTypes = @("Microsoft.Batch/operations")
2727
$locations = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.LocationCompleterAttribute]::FindLocations($resourceTypes, -1)
28-
$expectedResourceType = Get-AzureRmResourceProvider -ProviderNamespace "Microsoft.Batch" | Where-Object {$_.ResourceTypes.ResourceTypeName -eq "operations"}
28+
$expectedResourceType = Get-AzResourceProvider -ProviderNamespace "Microsoft.Batch" | Where-Object {$_.ResourceTypes.ResourceTypeName -eq "operations"}
2929
$expectedLocations = $expectedResourceType.Locations | ForEach-Object {"`'" + $_ + "`'"}
3030
Assert-AreEqualArray $locations $expectedLocations
3131
}
@@ -43,7 +43,7 @@ function Test-ResourceGroupCompleter
4343
}
4444
$assembly = [System.Reflection.Assembly]::LoadFrom($filePath)
4545
$resourceGroups = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.ResourceGroupCompleterAttribute]::GetResourceGroups(-1)
46-
$expectResourceGroups = Get-AzureRmResourceGroup | ForEach-Object {$_.ResourceGroupName}
46+
$expectResourceGroups = Get-AzResourceGroup | ForEach-Object {$_.ResourceGroupName}
4747
Assert-AreEqualArray $resourceGroups $expectResourceGroups
4848
}
4949

@@ -59,7 +59,7 @@ function Test-ResourceIdCompleter
5959
}
6060
[System.Reflection.Assembly]::LoadFrom($filePath)
6161
$resourceType = "Microsoft.Storage/storageAccounts"
62-
$expectResourceIds = Get-AzureRmResource -ResourceType $resourceType | ForEach-Object {$_.Id}
62+
$expectResourceIds = Get-AzResource -ResourceType $resourceType | ForEach-Object {$_.Id}
6363
# take data from Azure and put to cache
6464
$resourceIds = [Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters.ResourceIdCompleterAttribute]::GetResourceIds($resourceType)
6565
Assert-AreEqualArray $resourceIds $expectResourceIds

‎src/Accounts/Accounts.Test/DefaultCmdletTests.ps1

+20-20
Original file line numberDiff line numberDiff line change
@@ -20,52 +20,52 @@ function Test-DefaultResourceGroup
2020
{
2121
# Setup
2222
$rgname = Get-ResourceGroupName
23-
Clear-AzureRmDefault -ResourceGroup
23+
Clear-AzDefault -ResourceGroup
2424

2525
try
2626
{
2727
# Test GetDefault when default not set
28-
$output = Get-AzureRmDefault
28+
$output = Get-AzDefault
2929
Assert-Null($output)
30-
$output = Get-AzureRmDefault -ResourceGroup
30+
$output = Get-AzDefault -ResourceGroup
3131
Assert-Null($output)
32-
$storedValue = (Get-AzureRmContext).ExtendedProperties["Default Resource Group"]
32+
$storedValue = (Get-AzContext).ExtendedProperties["Default Resource Group"]
3333
Assert-Null($storedValue)
3434

3535
# Test Resoure Group created when it doesn't exist
36-
$output = Set-AzureRmDefault -ResourceGroupName $rgname -Force
37-
$resourcegroup = Get-AzureRmResourceGroup -Name $rgname
36+
$output = Set-AzDefault -ResourceGroupName $rgname -Force
37+
$resourcegroup = Get-AzResourceGroup -Name $rgname
3838
Assert-AreEqual $output.Name $resourcegroup.ResourceGroupName
39-
$context = Get-AzureRmContext
39+
$context = Get-AzContext
4040
$storedValue = $context.ExtendedProperties["Default Resource Group"]
4141
Assert-AreEqual $storedValue $output.Name
4242

4343
# Test GetDefault when default is set
44-
$output = Get-AzureRmDefault
44+
$output = Get-AzDefault
4545
Assert-AreEqual $output.Name $resourceGroup.ResourceGroupName
46-
$output = Get-AzureRmDefault -ResourceGroup
46+
$output = Get-AzDefault -ResourceGroup
4747
Assert-AreEqual $output.Name $resourceGroup.ResourceGroupName
4848

49-
# Test Clear-AzureRmDefault (no parameters shown)
50-
Clear-AzureRmDefault -Force
51-
$output = Get-AzureRmDefault
49+
# Test Clear-AzDefault (no parameters shown)
50+
Clear-AzDefault -Force
51+
$output = Get-AzDefault
5252
Assert-Null($output)
53-
$context = Get-AzureRmContext
53+
$context = Get-AzContext
5454
$storedValue = $context.ExtendedProperties["Default Resource Group"]
5555
Assert-Null($storedValue)
5656

5757
# Test SetDefault when resource group exists
58-
$output = Set-AzureRmDefault -ResourceGroupName $rgname
58+
$output = Set-AzDefault -ResourceGroupName $rgname
5959
Assert-AreEqual $output.Name $resourcegroup.ResourceGroupName
60-
$context = Get-AzureRmContext
60+
$context = Get-AzContext
6161
$storedValue = $context.ExtendedProperties["Default Resource Group"]
6262
Assert-AreEqual $storedValue $output.Name
6363

64-
# Test Clear-AzureRmDefault (no parameters shown)
65-
Clear-AzureRmDefault -ResourceGroup
66-
$output = Get-AzureRmDefault
64+
# Test Clear-AzDefault (no parameters shown)
65+
Clear-AzDefault -ResourceGroup
66+
$output = Get-AzDefault
6767
Assert-Null($output)
68-
$context = Get-AzureRmContext
68+
$context = Get-AzContext
6969
$storedValue = $context.ExtendedProperties["Default Resource Group"]
7070
Assert-Null($storedValue)
7171
}
@@ -91,6 +91,6 @@ Cleans the created resource groups
9191
function Clean-ResourceGroup($rgname)
9292
{
9393
if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback) {
94-
Remove-AzureRmResourceGroup -Name $rgname -Force
94+
Remove-AzResourceGroup -Name $rgname -Force
9595
}
9696
}

‎src/Accounts/Accounts.Test/SubscriptionCmdletTests.ps1

+19-19
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,29 @@ SmokeTest
2020
#>
2121
function Test-GetSubscriptionsEndToEnd
2222
{
23-
$allSubscriptions = Get-AzureRmSubscription
23+
$allSubscriptions = Get-AzSubscription
2424
$firstSubscription = $allSubscriptions[0]
2525
$id = $firstSubscription.Id
2626
$tenant = $firstSubscription.TenantId
2727
$name = $firstSubscription.Name
28-
$subscription = $firstSubscription | Get-AzureRmSubscription
28+
$subscription = $firstSubscription | Get-AzSubscription
2929
Assert-True { $subscription -ne $null }
3030
Assert-AreEqual $id $subscription.Id
31-
$subscription = Get-AzureRmSubscription -SubscriptionId $id
31+
$subscription = Get-AzSubscription -SubscriptionId $id
3232
Assert-True { $subscription -ne $null }
3333
Assert-AreEqual $id $subscription.Id
34-
$subscription = Get-AzureRmSubscription -SubscriptionName $name -Tenant $tenant
34+
$subscription = Get-AzSubscription -SubscriptionName $name -Tenant $tenant
3535
Assert-True { $subscription -ne $null }
3636
Assert-AreEqual $name $subscription.Name
37-
$subscription = Get-AzureRmSubscription -SubscriptionName $name
37+
$subscription = Get-AzSubscription -SubscriptionName $name
3838
Assert-True { $subscription -ne $null }
3939
Assert-AreEqual $name $subscription.Name
40-
$subscription = Get-AzureRmSubscription -SubscriptionName $name.ToUpper()
40+
$subscription = Get-AzSubscription -SubscriptionName $name.ToUpper()
4141
Assert-True { $subscription -ne $null }
4242
Assert-AreEqual $name $subscription.Name
43-
$mostSubscriptions = Get-AzureRmSubscription
43+
$mostSubscriptions = Get-AzSubscription
4444
Assert-True {$mostSubscriptions.Count -gt 0}
45-
$tenantSubscriptions = Get-AzureRmSubscription -Tenant $tenant
45+
$tenantSubscriptions = Get-AzSubscription -Tenant $tenant
4646
Assert-True {$tenantSubscriptions.Count -gt 0}
4747
}
4848

@@ -54,13 +54,13 @@ SmokeTest
5454
#>
5555
function Test-PipingWithContext
5656
{
57-
$allSubscriptions = Get-AzureRmSubscription
57+
$allSubscriptions = Get-AzSubscription
5858
$firstSubscription = $allSubscriptions[0]
5959
$id = $firstSubscription.Id
6060
$name = $firstSubscription.Name
61-
$nameContext = Get-AzureRmSubscription -SubscriptionName $name | Set-AzureRmContext
62-
$idContext = Get-AzureRmSubscription -SubscriptionId $id | Set-AzureRmContext
63-
$contextByName = Set-AzureRmContext -SubscriptionName $name
61+
$nameContext = Get-AzSubscription -SubscriptionName $name | Set-AzContext
62+
$idContext = Get-AzSubscription -SubscriptionId $id | Set-AzContext
63+
$contextByName = Set-AzContext -SubscriptionName $name
6464
Assert-True { $nameContext -ne $null }
6565
Assert-True { $nameContext.Subscription -ne $null }
6666
Assert-True { $nameContext.Subscription.Id -ne $null }
@@ -85,15 +85,15 @@ Tests each of the major parts of retrieving subscriptions in ARM mode
8585
function Test-SetAzureRmContextEndToEnd
8686
{
8787
# This test requires that the tenant contains atleast two subscriptions
88-
$allSubscriptions = Get-AzureRmSubscription
88+
$allSubscriptions = Get-AzSubscription
8989
$secondSubscription = $allSubscriptions[1]
9090
Assert-True { $allSubscriptions[0] -ne $null }
9191
Assert-True { $secondSubscription -ne $null }
92-
Set-AzureRmContext -SubscriptionId $secondSubscription.Id
93-
$context = Get-AzureRmContext
92+
Set-AzContext -SubscriptionId $secondSubscription.Id
93+
$context = Get-AzContext
9494
Assert-AreEqual $context.Subscription.Id $secondSubscription.Id
9595
$junkSubscriptionId = "49BC3D95-9A30-40F8-81E0-3CDEF0C3F8A5"
96-
Assert-ThrowsContains {Set-AzureRmContext -SubscriptionId $junkSubscriptionId} "provide a valid"
96+
Assert-ThrowsContains {Set-AzContext -SubscriptionId $junkSubscriptionId} "provide a valid"
9797
}
9898

9999
<#
@@ -104,15 +104,15 @@ SmokeTest
104104
#>
105105
function Test-SetAzureRmContextWithoutSubscription
106106
{
107-
$allSubscriptions = Get-AzureRmSubscription
107+
$allSubscriptions = Get-AzSubscription
108108
$firstSubscription = $allSubscriptions[0]
109109
$id = $firstSubscription.Id
110110
$tenantId = $firstSubscription.TenantId
111111

112112
Assert-True { $tenantId -ne $null }
113113

114-
Set-AzureRmContext -TenantId $tenantId
115-
$context = Get-AzureRmContext
114+
Set-AzContext -TenantId $tenantId
115+
$context = Get-AzContext
116116

117117
Assert-True { $context.Subscription -ne $null }
118118
Assert-True { $context.Tenant -ne $null }

‎src/Aks/Aks.Test/ScenarioTests/Common.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function Get-ProviderLocation($provider)
4747
if($provider.Contains("/"))
4848
{
4949
$type = $provider.Substring($namespace.Length + 1)
50-
$location = Get-AzureRmResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}
50+
$location = Get-AzResourceProvider -ProviderNamespace $namespace | where {$_.ResourceTypes[0].ResourceTypeName -eq $type}
5151

5252
if ($location -eq $null)
5353
{

‎src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.SYNOPSIS
33
Test Kubernetes stuff
44
#>
5-
function Test-AzureRmKubernetes
5+
function Test-AzKubernetes
66
{
77
# Setup
88
$resourceGroupName = Get-RandomResourceGroupName
@@ -11,27 +11,27 @@ function Test-AzureRmKubernetes
1111

1212
try
1313
{
14-
New-AzureRmResourceGroup -Name $resourceGroupName -Location $location
14+
New-AzResourceGroup -Name $resourceGroupName -Location $location
1515

1616
if (isLive) {
1717
$cred = $(createTestCredential "Unicorns" "Puppies")
18-
New-AzureRmAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -ClientIdAndSecret $cred
18+
New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -ClientIdAndSecret $cred
1919
} else {
20-
New-AzureRmAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
20+
New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
2121
}
22-
$cluster = Get-AzureRmAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
22+
$cluster = Get-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
2323
Assert-NotNull $cluster.Fqdn
2424
Assert-NotNull $cluster.DnsPrefix
2525
Assert-AreEqual 1 $cluster.AgentPoolProfiles.Length
2626
Assert-AreEqual "1.8.1" $cluster.KubernetesVersion
2727
Assert-AreEqual 3 $cluster.AgentPoolProfiles[0].Count;
28-
$cluster = $cluster | Set-AzureRmAks -NodeCount 2
28+
$cluster = $cluster | Set-AzAks -NodeCount 2
2929
Assert-AreEqual 2 $cluster.AgentPoolProfiles[0].Count;
30-
$cluster | Import-AzureRmAksCredential -Force
31-
$cluster | Remove-AzureRmAks -Force
30+
$cluster | Import-AzAksCredential -Force
31+
$cluster | Remove-AzAks -Force
3232
}
3333
finally
3434
{
35-
Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
35+
Remove-AzResourceGroup -Name $resourceGroupName -Force
3636
}
3737
}

0 commit comments

Comments
 (0)