Fix failing tests and resolve feedback

Author: cormacpayne

src/Common/Commands.Common.Authentication/AzureSessionInitializer.cs

@@ -78,7 +78,7 @@ static ContextAutosaveSettings InitializeSessionSettings(IDataStore store, strin
             {
                 CacheDirectory = profileDirectory,
                 ContextDirectory = profileDirectory,
-                Mode = ContextSaveMode.CurrentUser,
+                Mode = ContextSaveMode.Process,
                 CacheFile = "TokenCache.dat",
                 ContextFile = "AzureRmContext.json"
             };
@@ -102,6 +102,7 @@ static ContextAutosaveSettings InitializeSessionSettings(IDataStore store, strin
                     FileUtilities.EnsureDirectoryExists(profileDirectory);
                     string autoSavePath = Path.Combine(profileDirectory, settingsFile);
                     store.WriteFile(autoSavePath, JsonConvert.SerializeObject(result));
+                    result.Mode = ContextSaveMode.CurrentUser;
                 }
             }
             catch

src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/AzureRmProfile.cs

@@ -40,7 +40,7 @@ public class AzureRmProfile : IAzureContextContainer, IProfileOperations
         public IDictionary<string, IAzureContext> Contexts { get; set; } = new ConcurrentDictionary<string, IAzureContext>(StringComparer.CurrentCultureIgnoreCase);
 
         /// <summary>
-        /// Gets the path of the profile file. 
+        /// Gets the path of the profile file.
         /// </summary>
         [JsonIgnore]
         [XmlIgnore]
@@ -271,7 +271,7 @@ public void Save(IFileProvider provider, bool serializeCache = true)
                     writer.Write(contents);
                     writer.Flush();
 
-                    // When writing to a stream, ensure that the file is truncated 
+                    // When writing to a stream, ensure that the file is truncated
                     // so that previous data is overwritten
                     provider.Stream.SetLength(provider.Stream.Position);
                 }
@@ -386,20 +386,9 @@ public bool TryGetContextName(IAzureContext context, out string name)
             if (context != null)
             {
 
-                if ((context.Account != null && !string.IsNullOrWhiteSpace(context.Account.Id)) || context.Subscription != null)
+                if (context.Subscription != null)
                 {
-                    List<string> components = new List<string>();
-                    if (context.Account != null && !string.IsNullOrWhiteSpace(context.Account.Id))
-                    {
-                        components.Add(context.Account.Id);
-                    }
-
-                    if (context.Subscription != null)
-                    {
-                        components.Add(context.Subscription.GetId().ToString());
-                    }
-
-                    name = string.Format("[{0}]", string.Join(", ", components));
+                    name = string.Format("{0} - {1}", context.Subscription.Name, context.Subscription.Id);
                     result = true;
                 }
                 else

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

@@ -96,12 +96,7 @@ public void GetAzureContextNoLogin()
             }
 
             // Verify
-            Assert.True(commandRuntimeMock.OutputPipeline.Count == 1);
-            var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0];
-            Assert.True(context == null || context.Account == null || context.Account.Id == null);
-            Assert.True(commandRuntimeMock.ErrorStream.Count == 1);
-            var error = commandRuntimeMock.ErrorStream[0];
-            Assert.Equal("Run Connect-AzureRmAccount to login.", error.Exception.Message);
+            Assert.True(commandRuntimeMock.OutputPipeline.Count == 0);
         }
 
         [Fact]
@@ -131,9 +126,7 @@ public void ListAzureContextNoLogin()
 
             // Verify
             Assert.Equal(0, commandRuntimeMock.OutputPipeline.Count);
-            Assert.True(commandRuntimeMock.ErrorStream.Count == 1);
-            var error = commandRuntimeMock.ErrorStream[0];
-            Assert.Equal("Run Connect-AzureRmAccount to login.", error.Exception.Message);
+            Assert.True(commandRuntimeMock.ErrorStream.Count == 0);
         }
 
 

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

@@ -83,7 +83,7 @@ public void DataCollectionSettingPreventsFileWrite()
                 Assert.Equal(typeof(AuthenticationStoreTokenCache), session.TokenCache.GetType());
                 Assert.NotNull(AzureRmProfileProvider.Instance);
                 Assert.Equal(typeof(ResourceManagerProfileProvider), AzureRmProfileProvider.Instance.GetType());
-                store.Verify(f => f.WriteFile(It.IsAny<string>(), It.IsAny<string>()), Times.Never);
+                store.Verify(f => f.WriteFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
             }
             finally
             {
@@ -103,7 +103,7 @@ public void TestInitializationCannotCheckDirectoryExistence()
                 AzureSessionInitializer.CreateOrReplaceSession(store.Object);
                 var session = AzureSession.Instance;
                 Assert.NotNull(session);
-                Assert.Equal(ContextSaveMode.Process, session.ARMContextSaveMode);
+                Assert.Equal(ContextSaveMode.CurrentUser, session.ARMContextSaveMode);
                 Assert.NotNull(session.TokenCache);
                 Assert.Equal(typeof(AuthenticationStoreTokenCache), session.TokenCache.GetType());
                 Assert.NotNull(AzureRmProfileProvider.Instance);
@@ -178,7 +178,7 @@ public void TestInitializationCannotCreateDirectory()
                 AzureSessionInitializer.CreateOrReplaceSession(store.Object);
                 var session = AzureSession.Instance;
                 Assert.NotNull(session);
-                Assert.Equal(ContextSaveMode.Process, session.ARMContextSaveMode);
+                Assert.Equal(ContextSaveMode.CurrentUser, session.ARMContextSaveMode);
                 Assert.NotNull(session.TokenCache);
                 Assert.Equal(typeof(AuthenticationStoreTokenCache), session.TokenCache.GetType());
                 Assert.NotNull(AzureRmProfileProvider.Instance);