Cleaning up Profile tests per design guidelines and review feedback

Author: markcowl

src/ResourceManager/Profile/Commands.Profile.Test/AzureRMProfileTests.cs

@@ -18,10 +18,10 @@
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Profile;
 using Microsoft.Azure.Commands.Profile.Models;
+using Microsoft.Azure.Commands.Profile.Test;
 using Microsoft.Azure.Commands.ScenarioTest;
 using Microsoft.Azure.Internal.Subscriptions.Models;
 using Microsoft.Azure.ServiceManagemenet.Common.Models;
-using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Microsoft.Rest;
 using Microsoft.Rest.Azure;
 using Microsoft.WindowsAzure.Commands.Common;
@@ -901,12 +901,11 @@ public void LoadingProfileWorks()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void CanRenwTokenLogin()
+        public void CanRenewTokenLogin()
         {
             var tenants = new List<string> { DefaultTenant.ToString() };
             var subscriptions = new List<string> { DefaultSubscription.ToString() };
             var profile = SetupLogin(tenants, subscriptions, subscriptions);
-
             var cmdlet = new AddAzureRMAccountCommand();
             cmdlet.CommandRuntime = new MockCommandRuntime();
             cmdlet.DefaultProfile = profile;
@@ -931,7 +930,6 @@ public void CanRenwTokenLogin()
             Assert.Equal(graphToken1, account.GetProperty(AzureAccount.Property.GraphAccessToken));
             Assert.True(account.IsPropertySet(AzureAccount.Property.KeyVaultAccessToken));
             Assert.Equal(keyVaultToken1, account.GetProperty(AzureAccount.Property.KeyVaultAccessToken));
-
             var toss = SetupLogin(tenants, subscriptions, subscriptions);
             var cmdlet2 = new AddAzureRMAccountCommand();
             cmdlet2.CommandRuntime = new MockCommandRuntime();
@@ -956,7 +954,6 @@ public void CanRenwTokenLogin()
             Assert.Equal(graphToken2, account.GetProperty(AzureAccount.Property.GraphAccessToken));
             Assert.True(account.IsPropertySet(AzureAccount.Property.KeyVaultAccessToken));
             Assert.Equal(keyVaultToken2, account.GetProperty(AzureAccount.Property.KeyVaultAccessToken));
-
             var factory = new ClientFactory();
             var rmClient = factory.CreateArmClient<MockServiceClient>(profile.DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
             var rmCred = rmClient.Credentials as TokenCredentials;
@@ -966,7 +963,6 @@ public void CanRenwTokenLogin()
             Assert.NotNull(message.Headers.Authorization);
             Assert.NotNull(message.Headers.Authorization.Parameter);
             Assert.Contains(accessToken2, message.Headers.Authorization.Parameter);
-
             var graphClient = factory.CreateArmClient<MockServiceClient>(profile.DefaultContext, AzureEnvironment.Endpoint.Graph);
             var graphCred = graphClient.Credentials as TokenCredentials;
             Assert.NotNull(graphCred);
@@ -1011,24 +1007,4 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
             }
         }
     }
-        public class MockServiceClient : ServiceClient<MockServiceClient>
-        {
-            public MockServiceClient(Uri uri, ServiceClientCredentials credentials)
-            {
-                BaseUri = uri;
-                Credentials = credentials;
-            }
-
-        public MockServiceClient(Uri uri, ServiceClientCredentials credentials, params DelegatingHandler[] handlers)
-        {
-            BaseUri = uri;
-            Credentials = credentials;
-        }
-
-        public string SubscriptionId { get; set; }
-
-            public ServiceClientCredentials Credentials { get; set; }
-
-            public Uri BaseUri { get; set; }
-        }
 }

src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj

@@ -192,6 +192,7 @@
     <Compile Include="ErrorResolutionTests.cs" />
     <Compile Include="LocationCompleterUnitTests.cs" />
     <Compile Include="MockDataStore.cs" />
+    <Compile Include="MockServiceClient.cs" />
     <Compile Include="MockSubscriptionClientFactory.cs" />
     <Compile Include="NullClient.cs" />
     <Compile Include="ProfileController.cs" />

src/ResourceManager/Profile/Commands.Profile.Test/ContextModelTests.cs

@@ -12,25 +12,13 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Common.Authentication;
-using Microsoft.Azure.Commands.Common.Authentication.Models;
-using Microsoft.Azure.Commands.Profile;
-using Microsoft.Azure.Commands.Profile.Models;
-using Microsoft.Azure.ServiceManagemenet.Common.Models;
-using Microsoft.WindowsAzure.Commands.Common.Test.Mocks;
-using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
-using Microsoft.WindowsAzure.Commands.Utilities.Common;
-using Xunit;
-using Xunit.Abstractions;
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
-using System;
-using Microsoft.Azure.Commands.ScenarioTest.Extensions;
-using Microsoft.Azure.Commands.Profile.Context;
-using System.Linq;
+using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.Azure.Commands.Common.Authentication.ResourceManager;
-using Microsoft.Azure.Commands.Profile.Common;
 using Microsoft.Azure.Commands.ScenarioTest;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using System;
+using Xunit;
 
 namespace Microsoft.Azure.Commands.Profile.Test
 {
@@ -48,7 +36,6 @@ public class ContextModelTests
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SetContextCopiesAccountProperties()
         {
-
             TestExecutionHelpers.SetUpSessionAndProfile();
             var context = new AzureContext();
             var newContext = new AzureContext();
@@ -87,7 +74,6 @@ public void SetDefaultContextCopiesAccountProperties()
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void SetContextWithNameCopiesAccountProperties()
         {
-
             TestExecutionHelpers.SetUpSessionAndProfile();
             var context = new AzureContext();
             var newContext = new AzureContext();

src/ResourceManager/Profile/Commands.Profile.Test/MockServiceClient.cs

@@ -0,0 +1,42 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Rest;
+using System;
+using System.Net.Http;
+
+namespace Microsoft.Azure.Commands.Profile.Test
+{
+
+    public class MockServiceClient : ServiceClient<MockServiceClient>
+    {
+        public MockServiceClient(Uri uri, ServiceClientCredentials credentials)
+        {
+            BaseUri = uri;
+            Credentials = credentials;
+        }
+
+        public MockServiceClient(Uri uri, ServiceClientCredentials credentials, params DelegatingHandler[] handlers)
+        {
+            BaseUri = uri;
+            Credentials = credentials;
+        }
+
+        public string SubscriptionId { get; set; }
+
+        public ServiceClientCredentials Credentials { get; set; }
+
+        public Uri BaseUri { get; set; }
+    }
+}