Providing IEnvironment to UsageService

Author: StanleyGoldman

src/GitHub.VisualStudio/GitHubPackage.cs

@@ -20,6 +20,7 @@
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 using Octokit;
+using Rothko;
 using Serilog;
 using Task = System.Threading.Tasks.Task;
 
@@ -249,7 +250,8 @@ async Task<object> CreateService(IAsyncServiceContainer container, CancellationT
             else if (serviceType == typeof(IUsageService))
             {
                 var sp = await GetServiceAsync(typeof(IGitHubServiceProvider)) as IGitHubServiceProvider;
-                return new UsageService(sp);
+                var environment = await GetServiceAsync(typeof(IEnvironment)) as IEnvironment;
+                return new UsageService(sp, environment);
             }
             else if (serviceType == typeof(IUsageTracker))
             {

src/GitHub.VisualStudio/Services/UsageService.cs

@@ -23,16 +23,16 @@ public class UsageService : IUsageService
         static readonly ILogger log = LogManager.ForContext<UsageService>();
         static readonly Calendar cal = CultureInfo.InvariantCulture.Calendar;
         readonly IGitHubServiceProvider serviceProvider;
-        private readonly IFileFacade fileFacade;
+        private readonly IEnvironment environment;
         string storePath;
         string userStorePath;
         Guid? userGuid;
 
         [ImportingConstructor]
-        public UsageService(IGitHubServiceProvider serviceProvider, IFileFacade fileFacade)
+        public UsageService(IGitHubServiceProvider serviceProvider, IEnvironment environment)
         {
             this.serviceProvider = serviceProvider;
-            this.fileFacade = fileFacade;
+            this.environment = environment;
         }
 
         public async Task<Guid> GetUserGuid()
@@ -143,21 +143,17 @@ async Task Initialize()
                 await ThreadingHelper.SwitchToMainThreadAsync();
 
                 var program = serviceProvider.GetService<IProgram>();
-                storePath = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                    program.ApplicationName,
-                    StoreFileName);
-                userStorePath = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
-                    program.ApplicationName,
-                    UserStoreFileName);
+
+                var localApplicationDataPath = environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+
+                storePath = Path.Combine(localApplicationDataPath, program.ApplicationName, StoreFileName);
+                userStorePath = Path.Combine(localApplicationDataPath, program.ApplicationName, UserStoreFileName);
             }
         }
 
         async Task<string> ReadAllTextAsync(string path)
         {
-            var fileInfo = fileFacade.GetFile(path);
-            using (var s = fileInfo.OpenRead())
+            using (var s = File.OpenRead(path))
             using (var r = new StreamReader(s, Encoding.UTF8))
             {
                 return await r.ReadToEndAsync();
@@ -166,8 +162,7 @@ async Task<string> ReadAllTextAsync(string path)
 
         async Task WriteAllTextAsync(string path, string text)
         {
-            var fileInfo = fileFacade.GetFile(path);
-            using (var s = fileInfo.OpenWrite())
+            using (var s = new FileStream(path, FileMode.Create))
             using (var w = new StreamWriter(s, Encoding.UTF8))
             {
                 await w.WriteAsync(text);

test/UnitTests/GitHub.VisualStudio/Services/MetricsTests.cs

@@ -10,6 +10,7 @@
 using System.Linq;
 using System.Globalization;
 using GitHub.Reflection;
+using Rothko;
 
 namespace MetricsTests
 {
@@ -426,14 +427,14 @@ public class UsageServiceTests : TestBaseClass
         [Test]
         public async Task GetUserGuidWorks()
         {
-            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>());
+            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>(), Substitute.For<IEnvironment>());
             var guid = await usageService.GetUserGuid();
         }
 
         [Test]
         public void IsSameDayWorks()
         {
-            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>());
+            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>(), Substitute.For<IEnvironment>());
             var now = DateTimeOffset.Now;
             Assert.True(usageService.IsSameDay(now));
             Assert.True(usageService.IsSameDay(new DateTimeOffset(now.Year, now.Month, now.Day, 0, 0, 0, TimeSpan.Zero)));
@@ -447,7 +448,7 @@ public void IsSameDayWorks()
         [Test]
         public void IsSameWeekWorks()
         {
-            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>());
+            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>(), Substitute.For<IEnvironment>());
             var now = DateTimeOffset.Now;
 
             Assert.True(usageService.IsSameWeek(now));
@@ -475,7 +476,7 @@ public void IsSameWeekWorks()
         [Test]
         public void IsSameMonthWorks()
         {
-            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>());
+            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>(), Substitute.For<IEnvironment>());
             var now = DateTimeOffset.Now;
 
             Assert.True(usageService.IsSameMonth(now));