Fixed Compute and SQL tests

Hovsep Mkrtchyan · Hovsep Mkrtchyan · commit 70cc5766cff6 · 2015-10-01T14:06:32.000-07:00
diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/PermissiveRecordMatcherWithApiExclusion.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/PermissiveRecordMatcherWithApiExclusion.cs
@@ -53,21 +53,24 @@ public string GetMatchingKey(System.Net.Http.HttpRequestMessage request)
         
         public string GetMatchingKey(RecordEntry recordEntry)
         {
-            var encodedPath = recordEntry.EncodedRequestUri;
-            if (recordEntry.RequestUri.Contains("?&"))
+            string path = recordEntry.RequestUri;
+            if(!string.IsNullOrEmpty(recordEntry.EncodedRequestUri))
             {
-                var updatedPath = recordEntry.RequestUri.Replace("?&", "?");
-
-
-                string version;
-                if (ContainsIgnoredProvider(updatedPath, out version))
-                {
-                    updatedPath = RemoveOrReplaceApiVersion(updatedPath, version);
-                }
+                path = Encoding.UTF8.GetString(Convert.FromBase64String(recordEntry.EncodedRequestUri));
+            }
 
-                encodedPath = Convert.ToBase64String(Encoding.UTF8.GetBytes(updatedPath));
+            if (path.Contains("?&"))
+            {
+                path = path.Replace("?&", "?");
             }
 
+            string version;
+            if (ContainsIgnoredProvider(path, out version))
+            {
+                path = RemoveOrReplaceApiVersion(path, version);
+            }
+            
+            var encodedPath = Convert.ToBase64String(Encoding.UTF8.GetBytes(path));
             return string.Format("{0} {1}", recordEntry.RequestMethod, encodedPath);
         }
 
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs b/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs
@@ -97,7 +97,7 @@ public void RunPsTestWorkflow(
             string mockName)
         {
             Dictionary<string, string> d = new Dictionary<string, string>();
-            d.Add("Microsoft.Authorization", "2014-07-01-preview");
+            d.Add("Microsoft.Authorization", null);
             HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);
 
             using (UndoContext context = UndoContext.Current)
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DscExtensionTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/DscExtensionTests.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
 {
     public class DscExtensionTests
     {
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestGetAzureRmVMDscExtension()
         {
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.cs
@@ -19,14 +19,14 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
 {
     public class VirtualMachineProfileTests
     {
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineProfile()
         {
             ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineProfile");
         }
 
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachineProfileWithoutAUC()
         {
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineProfileTests.ps1
@@ -116,7 +116,7 @@ function Test-VirtualMachineProfile
     $imgRef = Get-DefaultCRPWindowsImageOffline -loc $loc;
     $p = ($imgRef | Set-AzureRmVMSourceImage -VM $p);
 
-    $subid = (Get-AzureRmSubscription -Current).SubscriptionId;
+    $subid = (Get-AzureRmContext).Subscription.SubscriptionId;
 
     $referenceUri = "/subscriptions/" + $subid + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault123";
     $certStore = "My";
@@ -283,7 +283,7 @@ function Test-VirtualMachineProfileWithoutAUC
     $imgRef = Get-DefaultCRPWindowsImageOffline -loc $loc;
     $p = ($imgRef | Set-AzureRmVMSourceImage -VM $p);
 
-    $subid = (Get-AzureRmSubscription -Current).SubscriptionId;
+    $subid = (Get-AzureRmContext).Subscription.SubscriptionId;
 
     $referenceUri = "/subscriptions/" + $subid + "/resourceGroups/RgTest1/providers/Microsoft.KeyVault/vaults/TestVault123";
     $certStore = "My";
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests
 {
     public partial class VirtualMachineTests
     {
-        [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVirtualMachine()
         {
diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1 b/src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1
@@ -179,7 +179,7 @@ function Test-VirtualMachine
         Assert-NotNull $aset;
         Assert-AreEqual $asetName $aset.Name;
 
-        $asetId = ('/subscriptions/' + (Get-AzureRmSubscription -Current).SubscriptionId + '/resourceGroups/' + $rgname + '/providers/Microsoft.Compute/availabilitySets/' + $asetName);
+        $asetId = ('/subscriptions/' + (Get-AzureRmContext).Subscription.SubscriptionId + '/resourceGroups/' + $rgname + '/providers/Microsoft.Compute/availabilitySets/' + $asetName);
         $vmname2 = $vmname + '2';
         $p2 = New-AzureRmVMConfig -VMName $vmname2 -VMSize $vmsize -AvailabilitySetId $asetId;
         $p2.HardwareProfile = $p.HardwareProfile;
diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs
@@ -57,7 +57,7 @@ protected void RunPowerShellTest(params string[] scripts)
         {
             //HttpMockServer.Matcher = new PermissiveRecordMatcher();
             Dictionary<string, string> d = new Dictionary<string, string>();
-            d.Add("Microsoft.Authorization", "2014-07-01-preview");
+            d.Add("Microsoft.Authorization", null);
             HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);
             // Enable undo functionality as well as mock recording
             using (UndoContext context = UndoContext.Current)

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ public void RunPsTestWorkflow(`
`97`	`97`	`string mockName)`
`98`	`98`	`{`
`99`	`99`	`Dictionary<string, string> d = new Dictionary<string, string>();`
`100`		`- d.Add("Microsoft.Authorization", "2014-07-01-preview");`
	`100`	`+ d.Add("Microsoft.Authorization", null);`
`101`	`101`	`HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);`
`102`	`102`
`103`	`103`	`using (UndoContext context = UndoContext.Current)`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests`
`5`	`5`	`{`
`6`	`6`	`public class DscExtensionTests`
`7`	`7`	`{`
`8`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`8`	`+ [Fact]`
`9`	`9`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`10`	`10`	`public void TestGetAzureRmVMDscExtension()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests`
`19`	`19`	`{`
`20`	`20`	`public class VirtualMachineProfileTests`
`21`	`21`	`{`
`22`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`22`	`+ [Fact]`
`23`	`23`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`24`	`24`	`public void TestVirtualMachineProfile()`
`25`	`25`	`{`
`26`	`26`	`ComputeTestController.NewInstance.RunPsTest("Test-VirtualMachineProfile");`
`27`	`27`	`}`
`28`	`28`
`29`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`29`	`+ [Fact]`
`30`	`30`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`31`	`31`	`public void TestVirtualMachineProfileWithoutAUC()`
`32`	`32`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ namespace Microsoft.Azure.Commands.Compute.Test.ScenarioTests`
`19`	`19`	`{`
`20`	`20`	`public partial class VirtualMachineTests`
`21`	`21`	`{`
`22`		`- [Fact(Skip = "PSGet Migration: TODO: Get-AzureRmSubscription")]`
	`22`	`+ [Fact]`
`23`	`23`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`24`	`24`	`public void TestVirtualMachine()`
`25`	`25`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ protected void RunPowerShellTest(params string[] scripts)`
`57`	`57`	`{`
`58`	`58`	`//HttpMockServer.Matcher = new PermissiveRecordMatcher();`
`59`	`59`	`Dictionary<string, string> d = new Dictionary<string, string>();`
`60`		`- d.Add("Microsoft.Authorization", "2014-07-01-preview");`
	`60`	`+ d.Add("Microsoft.Authorization", null);`
`61`	`61`	`HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d);`
`62`	`62`	`// Enable undo functionality as well as mock recording`
`63`	`63`	`using (UndoContext context = UndoContext.Current)`