Fixed MockClientFactory behavior

Author: stankovski

src/Common/Commands.Common.Test/Mocks/MockClientFactory.cs

@@ -60,11 +60,20 @@ public TClient CreateClient<TClient>(AzureProfile profile, AzureEnvironment.Endp
 
         public TClient CreateClient<TClient>(AzureProfile profile, AzureSubscription subscription, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient<TClient>
         {
-            SubscriptionCloudCredentials creds = new TokenCloudCredentials(subscription == null ? "fake_subscription" : subscription.Id.ToString(), "fake_token");
+            if (subscription == null)
+            {
+                throw new ArgumentException(Commands.Common.Properties.Resources.InvalidDefaultSubscription);
+            }
+
+            if (profile == null)
+            {
+                profile = new AzureProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile));
+            }
+
+            SubscriptionCloudCredentials creds = new TokenCloudCredentials(subscription.Id.ToString(), "fake_token");
             if (HttpMockServer.GetCurrentMode() != HttpRecorderMode.Playback)
             {
-                ProfileClient profileClient = new ProfileClient(
-                                profile ?? new AzureProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile)));
+                ProfileClient profileClient = new ProfileClient(profile);
                 AzureContext context = new AzureContext(
                     subscription,
                     profileClient.GetAccount(subscription.Account),
@@ -74,7 +83,7 @@ public TClient CreateClient<TClient>(AzureProfile profile, AzureSubscription sub
                 creds = AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(context);
             }
 
-            Uri endpointUri = (new ProfileClient(profile ?? new AzureProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile)))).Profile.Environments[subscription.Environment].GetEndpointAsUri(endpoint);
+            Uri endpointUri = profile.Environments[subscription.Environment].GetEndpointAsUri(endpoint);
             return CreateCustomClient<TClient>(creds, endpointUri);
         }