Add metrics tests and move some code around so it's simpler to mock

Author: shana

script

@@ -168,7 +168,7 @@ public ITask InitializeRepository()
                 })
                 .ThenInUI(() =>
                 {
-                    TaskManager.Run(UsageTracker.ProjectsInitialized);
+                    TaskManager.Run(UsageTracker.IncrementProjectsInitialized);
                     InitializeUI();
                 });
             return task;
@@ -191,8 +191,6 @@ protected void SetupMetrics(string unityVersion, bool firstRun, Guid instanceId)
         {
             //Logger.Trace("Setup metrics");
 
-            var usagePath = Environment.UserCachePath.Combine(Constants.UsageFile);
-
             string userId = null;
             if (UserSettings.Exists(Constants.GuidKey))
             {
@@ -212,7 +210,7 @@ protected void SetupMetrics(string unityVersion, bool firstRun, Guid instanceId)
                 Environment.NodeJsExecutablePath,
                 Environment.OctorunScriptPath);
 
-            UsageTracker = new UsageTracker(metricsService, UserSettings, usagePath, userId, unityVersion, instanceId.ToString());
+            UsageTracker = new UsageTracker(metricsService, UserSettings, Environment, userId, unityVersion, instanceId.ToString());
 
             if (firstRun)
             {

src/GitHub.Api/Application/ApplicationManagerBase.cs

@@ -4,41 +4,18 @@ public interface IUsageTracker
     {
         bool Enabled { get; set; }
         void IncrementNumberOfStartups();
-        void ChangesViewButtonCommit();
-        void HistoryViewToolbarButtonFetch();
-        void HistoryViewToolbarButtonPush();
-        void HistoryViewToolbarButtonPull();
-        void AuthenticationViewButtonAuthentication();
-        void ProjectsInitialized();
-        void BranchesViewButtonCreateBranch();
-        void BranchesViewButtonDeleteBranch();
-        void BranchesViewButtonCheckoutLocalBranch();
-        void BranchesViewButtonCheckoutRemoteBranch();
-        void SettingsViewUnlockButtonLfsUnlock();
-        void AssetExplorerContextMenuLfsLock();
-        void AssetExplorerContextMenuLfsUnlock();
-    }
-
-    class NullUsageTracker : IUsageTracker
-    {
-        public bool Enabled { get; set; }
-        public void IncrementNumberOfStartups() { }
-        public void ChangesViewButtonCommit() { }
-        public void HistoryViewToolbarButtonFetch() { }
-        public void HistoryViewToolbarButtonPush() { }
-        public void HistoryViewToolbarButtonPull() { }
-        public void AuthenticationViewButtonAuthentication() { }
-        public void ProjectsInitialized() { }
-        public void BranchesViewButtonCreateBranch() { }
-        public void BranchesViewButtonDeleteBranch() { }
-        public void BranchesViewButtonCheckoutLocalBranch() { }
-        public void BranchesViewButtonCheckoutRemoteBranch() { }
-        public void SettingsViewUnlockButtonLfsUnlock() { }
-
-        public void AssetExplorerContextMenuLfsLock() { }
-
-        public void AssetExplorerContextMenuLfsUnlock() { }
-
-        public void SetMetricsService(IMetricsService instance) { }
+        void IncrementChangesViewButtonCommit();
+        void IncrementHistoryViewToolbarButtonFetch();
+        void IncrementHistoryViewToolbarButtonPush();
+        void IncrementHistoryViewToolbarButtonPull();
+        void IncrementAuthenticationViewButtonAuthentication();
+        void IncrementProjectsInitialized();
+        void IncrementBranchesViewButtonCreateBranch();
+        void IncrementBranchesViewButtonDeleteBranch();
+        void IncrementBranchesViewButtonCheckoutLocalBranch();
+        void IncrementBranchesViewButtonCheckoutRemoteBranch();
+        void IncrementSettingsViewUnlockButtonLfsUnlock();
+        void IncrementAssetExplorerContextMenuLfsLock();
+        void IncrementAssetExplorerContextMenuLfsUnlock();
     }
 }

src/GitHub.Api/Metrics/IUsageTracker.cs

@@ -1,7 +1,9 @@
-using System;
+using GitHub.Logging;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using System.Text;
 
 namespace GitHub.Unity
 {
@@ -94,5 +96,10 @@ class UsageStore
     {
         public DateTimeOffset LastUpdated { get; set; } = DateTimeOffset.UtcNow;
         public UsageModel Model { get; set; } = new UsageModel();
+
+        public Measures GetCurrentMeasures(string appVersion, string unityVersion, string instanceId)
+        {
+            return Model.GetCurrentUsage(appVersion, unityVersion, instanceId).Measures;
+        }
     }
 }