Responding to review feedback

markcowl · markcowl · commit 6ab15dafe748 · 2016-02-18T09:47:15.000-08:00
diff --git a/src/Common/Commands.Common.Authentication.Test/AzureRMProfileTests.cs b/src/Common/Commands.Common.Authentication.Test/AzureRMProfileTests.cs
@@ -31,7 +31,8 @@ public void ProfileSerializeDeserializeWorks()
         {
             var dataStore = new MockDataStore();
             AzureSession.DataStore = dataStore;
-            var currentProfile = new AzureRMProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile));
+            var profilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AzureSession.ProfileFile);
+            var currentProfile = new AzureRMProfile(profilePath);
             var tenantId = Guid.NewGuid().ToString();
             var environment = new AzureEnvironment
             {
@@ -128,7 +129,7 @@ public void SavingProfileWorks()
     ""TokenCache"": ""AQIDBAUGCAkA""
   }
 }";
-            string path = Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile);
+            var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AzureSession.ProfileFile);
             var dataStore = new MockDataStore();
             AzureSession.DataStore = dataStore;
             AzureRMProfile profile = new AzureRMProfile(path);
@@ -211,7 +212,7 @@ public void LoadingProfileWorks()
     }
   }
 }";
-            string path = Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile);
+            var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AzureSession.ProfileFile);
             var dataStore = new MockDataStore();
             AzureSession.DataStore = dataStore;
             dataStore.WriteFile(path, contents);
diff --git a/src/Common/Commands.Common.Authentication.Test/AzureSMProfileTests.cs b/src/Common/Commands.Common.Authentication.Test/AzureSMProfileTests.cs
@@ -32,7 +32,8 @@ public class AzureSMProfileTests
         public void ProfileSaveDoesNotSerializeContext()
         {
             var dataStore = new MockDataStore();
-            var profile = new AzureSMProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile));
+            var profilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AzureSession.ProfileFile);
+            var profile = new AzureSMProfile(profilePath);
             AzureSession.DataStore = dataStore;
             var tenant = Guid.NewGuid().ToString();
             var environment = new AzureEnvironment
@@ -82,7 +83,8 @@ public void ProfileSaveDoesNotSerializeContext()
        public void ProfileSerializeDeserializeWorks()
         {
             var dataStore = new MockDataStore();
-            var profile = new AzureSMProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile));
+            var profilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AzureSession.ProfileFile);
+            var profile = new AzureSMProfile(profilePath);
             AzureSession.DataStore = dataStore;
             var tenant = Guid.NewGuid().ToString();
             var environment = new AzureEnvironment
diff --git a/src/Common/Commands.Common.Authentication.Test/ConversionUtilitiesTests.cs b/src/Common/Commands.Common.Authentication.Test/ConversionUtilitiesTests.cs
@@ -23,7 +23,7 @@ public class ConversionUtilitiesTests
     {
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-       public void DeserializeJsonWorksForSimpleCases()
+        public void DeserializeJsonWorksForSimpleCases()
         {
             const string json1 =
                 @"{

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,8 @@ public void ProfileSerializeDeserializeWorks()`
`31`	`31`	`{`
`32`	`32`	`var dataStore = new MockDataStore();`
`33`	`33`	`AzureSession.DataStore = dataStore;`
`34`		`- var currentProfile = new AzureRMProfile(Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile));`
	`34`	`+ var profilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AzureSession.ProfileFile);`
	`35`	`+ var currentProfile = new AzureRMProfile(profilePath);`
`35`	`36`	`var tenantId = Guid.NewGuid().ToString();`
`36`	`37`	`var environment = new AzureEnvironment`
`37`	`38`	`{`
`@@ -128,7 +129,7 @@ public void SavingProfileWorks()`
`128`	`129`	`""TokenCache"": ""AQIDBAUGCAkA""`
`129`	`130`	`}`
`130`	`131`	`}";`
`131`		`- string path = Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile);`
	`132`	`+ var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AzureSession.ProfileFile);`
`132`	`133`	`var dataStore = new MockDataStore();`
`133`	`134`	`AzureSession.DataStore = dataStore;`
`134`	`135`	`AzureRMProfile profile = new AzureRMProfile(path);`
`@@ -211,7 +212,7 @@ public void LoadingProfileWorks()`
`211`	`212`	`}`
`212`	`213`	`}`
`213`	`214`	`}";`
`214`		`- string path = Path.Combine(AzureSession.ProfileDirectory, AzureSession.ProfileFile);`
	`215`	`+ var path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, AzureSession.ProfileFile);`
`215`	`216`	`var dataStore = new MockDataStore();`
`216`	`217`	`AzureSession.DataStore = dataStore;`
`217`	`218`	`dataStore.WriteFile(path, contents);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class ConversionUtilitiesTests`
`23`	`23`	`{`
`24`	`24`	`[Fact]`
`25`	`25`	`[Trait(Category.AcceptanceType, Category.CheckIn)]`
`26`		`- public void DeserializeJsonWorksForSimpleCases()`
	`26`	`+ public void DeserializeJsonWorksForSimpleCases()`
`27`	`27`	`{`
`28`	`28`	`const string json1 =`
`29`	`29`	`@"{`