Fixing tests.

Author: akromm-zz

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Resources/MockSessions.xml

@@ -92,7 +92,6 @@ public void InitializeTest()
                                                 testSession);
         }
 
-
         [TestCleanup]
         public void CleanupTest()
         {

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCertAuthTests.cs

@@ -25,12 +25,22 @@ public static class DatabaseTestHelper
         /// The unique GUID for identifying the Shared SLO.
         /// </summary>
         public static readonly Guid SharedSloGuid = new Guid("910b4fcb-8a29-4c3e-958f-f7ba794388b2");
-
+        
         /// <summary>
         /// The unique GUID for identifying the System SLO.
         /// </summary>
         public static readonly Guid SystemSloGuid = new Guid("26e021db-f1f9-4c98-84c6-92af8ef433d7");
 
+        /// <summary>
+        /// The unique GUID for identifying the System2 SLO.
+        /// </summary>
+        public static readonly Guid System2SloGuid = new Guid("620323bf-2879-4807-b30d-c2e6d7b3b3aa");
+
+        /// <summary>
+        /// The unique GUID for identifying the Business SLO.
+        /// </summary>
+        public static readonly Guid BusinessSloGuid = new Guid("4518ce8e-6026-4113-b4fd-3b5d777c6881");
+        
         /// <summary>
         /// The unique GUID for identifying the Basic SLO.
         /// </summary>

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/AzureSqlDatabaseCopyCertAuthTests.cs

@@ -346,7 +346,7 @@ public static void CreateTestDatabasesWithCertAuth(System.Management.Automation.
                         @"-ServerName $serverName " +
                         @"-DatabaseName testdb2 " +
                         @"-Collation Japanese_CI_AS " +
-                        @"-Edition Web " +
+                        @"-Edition Standard " +
                         @"-MaxSizeGB 5 " +
                         @"-Force",
                         @"$testdb2");
@@ -365,15 +365,15 @@ public static void CreateTestDatabasesWithCertAuth(System.Management.Automation.
 
                 Services.Server.Database database = database1.Single().BaseObject as Services.Server.Database;
                 Assert.IsTrue(database != null, "Expecting a Database object");
-                DatabaseTestHelper.ValidateDatabaseProperties(database, "testdb1", "Web", 1, 1073741824L, "SQL_Latin1_General_CP1_CI_AS", "Shared", false, DatabaseTestHelper.SharedSloGuid);
+                DatabaseTestHelper.ValidateDatabaseProperties(database, "testdb1", "Standard", 250, 268435456000L, "SQL_Latin1_General_CP1_CI_AS", "S0", false, DatabaseTestHelper.StandardS0SloGuid);
 
                 database = database2.Single().BaseObject as Services.Server.Database;
                 Assert.IsTrue(database != null, "Expecting a Database object");
-                DatabaseTestHelper.ValidateDatabaseProperties(database, "testdb2", "Web", 5, 5368709120L, "Japanese_CI_AS", "Shared", false, DatabaseTestHelper.SharedSloGuid);
+                DatabaseTestHelper.ValidateDatabaseProperties(database, "testdb2", "Standard", 250, 268435456000L, "Japanese_CI_AS", "S0", false, DatabaseTestHelper.StandardS0SloGuid);
 
                 database = database3.Single().BaseObject as Services.Server.Database;
                 Assert.IsTrue(database != null, "Expecting a Database object");
-                DatabaseTestHelper.ValidateDatabaseProperties(database, "testdb3", "Web", 0, 104857600L, "SQL_Latin1_General_CP1_CI_AS", "Shared", false, DatabaseTestHelper.SharedSloGuid);
+                DatabaseTestHelper.ValidateDatabaseProperties(database, "testdb3", "Standard", 0, 104857600L, "SQL_Latin1_General_CP1_CI_AS", "S0", false, DatabaseTestHelper.StandardS0SloGuid);
             }
         }
 

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/DatabaseTestHelper.cs

@@ -290,10 +290,13 @@ public static AzureSubscription SetupUnitTestSubscription(System.Management.Auto
         {
             UnitTestHelper.ImportAzureModule(powershell);
 
+            X509Certificate2 certificate = UnitTestHelper.GetUnitTestClientCertificate();
+            Guid subscriptionId = new Guid(UnitTestSubscriptionId);
+
             // Set the client certificate used in the subscription
             powershell.Runspace.SessionStateProxy.SetVariable(
                 "clientCertificate",
-                UnitTestHelper.GetUnitTestClientCertificate());
+                certificate);
 
             ProfileClient client = new ProfileClient();
             client.Profile.Environments[UnitTestEnvironmentName] = new AzureEnvironment
@@ -308,13 +311,13 @@ public static AzureSubscription SetupUnitTestSubscription(System.Management.Auto
 
             var account = new AzureAccount
             {
-                Id = UnitTestHelper.GetUnitTestClientCertificate().Thumbprint,
+                Id = certificate.Thumbprint,
                 Type = AzureAccount.AccountType.Certificate
             };
 
             var subscription = new AzureSubscription
             {
-                Id = new Guid(UnitTestSubscriptionId),
+                Id = subscriptionId,
                 Name = UnitTestSubscriptionName,
                 Environment = UnitTestEnvironmentName,
                 Account = account.Id
@@ -324,7 +327,7 @@ public static AzureSubscription SetupUnitTestSubscription(System.Management.Auto
             client.AddOrSetSubscription(subscription);
             client.SetSubscriptionAsCurrent(UnitTestSubscriptionName, account.Id);
             client.Profile.Save();
-            
+
             return subscription;
         }
 

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/NewAzureSqlDatabaseTests.cs

@@ -351,8 +351,7 @@ private void PopulateSloCache()
             this.AddTracingHeaders(sqlManagementClient);
 
             // Retrieve the specified database
-            ServiceObjectiveListResponse response = sqlManagementClient.ServiceObjectives.List(
-                this.serverName);
+            ServiceObjectiveListResponse response = sqlManagementClient.ServiceObjectives.List(this.serverName);
 
             // Populate the cache;
             objectivesCache = response.Select(serviceObjective => CreateServiceObjectiveFromResponse(serviceObjective)).ToArray();