Fix IsSameWeek and IsSameMonth. Add tests for that.

Author: shana

src/GitHub.VisualStudio/Services/UsageService.cs

@@ -32,12 +32,12 @@ public bool IsSameDay(DateTimeOffset lastUpdated)
 
         public bool IsSameWeek(DateTimeOffset lastUpdated)
         {
-            return GetIso8601WeekOfYear(lastUpdated) == GetIso8601WeekOfYear(DateTimeOffset.Now) && lastUpdated.Year != DateTimeOffset.Now.Year;
+            return GetIso8601WeekOfYear(lastUpdated) == GetIso8601WeekOfYear(DateTimeOffset.Now) && lastUpdated.Year == DateTimeOffset.Now.Year;
         }
 
         public bool IsSameMonth(DateTimeOffset lastUpdated)
         {
-            return lastUpdated.Month == DateTimeOffset.Now.Month;
+            return lastUpdated.Month == DateTimeOffset.Now.Month && lastUpdated.Year == DateTimeOffset.Now.Year;
         }
 
         public IDisposable StartTimer(Func<Task> callback, TimeSpan dueTime, TimeSpan period)

…sualStudio/Services/UsageTrackerTests.cs …ub.VisualStudio/Services/MetricsTests.cstest/UnitTests/GitHub.VisualStudio/Services/UsageTrackerTests.cs renamed to test/UnitTests/GitHub.VisualStudio/Services/MetricsTests.cs test/UnitTests/GitHub.VisualStudio/Services/UsageTrackerTests.cs renamed to test/UnitTests/GitHub.VisualStudio/Services/MetricsTests.cs

@@ -7,11 +7,9 @@
 using GitHub.Settings;
 using NSubstitute;
 using NUnit.Framework;
-using System.Reflection;
 using System.Linq;
 using System.Globalization;
 using GitHub.Reflection;
-using GitHub;
 
 namespace MetricsTests
 {
@@ -418,4 +416,90 @@ static IUsageService CreateUsageService(
             return result;
         }
     }
+
+    public class UsageServiceTests : TestBaseClass
+    {
+        [Test]
+        public void IsSameDayWorks()
+        {
+            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>());
+            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)));
+            Assert.False(usageService.IsSameDay(new DateTimeOffset(now.Year, now.Month, now.Day+1, 0, 0, 0, TimeSpan.Zero)));
+            Assert.False(usageService.IsSameDay(new DateTimeOffset(now.Year, now.Month, now.Day-1, 0, 0, 0, TimeSpan.Zero)));
+            Assert.True(usageService.IsSameDay(new DateTimeOffset(now.Year, now.Month, now.Day, 10, 3, 1, TimeSpan.Zero)));
+            Assert.False(usageService.IsSameDay(new DateTimeOffset(now.Year, now.Month, now.Day+1, 10, 3, 1, TimeSpan.Zero)));
+            Assert.False(usageService.IsSameDay(new DateTimeOffset(now.Year, now.Month, now.Day-1, 10, 3, 1, TimeSpan.Zero)));
+        }
+
+        [Test]
+        public void IsSameWeekWorks()
+        {
+            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>());
+            var now = DateTimeOffset.Now;
+
+            Assert.True(usageService.IsSameWeek(now));
+            var nowWeek = GetIso8601WeekOfYear(now);
+
+            DateTimeOffset nextWeek = now;
+            for (int i = 1; i < 8; i++)
+            {
+                nextWeek = nextWeek.AddDays(1);
+                var week = GetIso8601WeekOfYear(nextWeek);
+                Assert.AreEqual(week == nowWeek, usageService.IsSameWeek(nextWeek));
+            }
+
+            DateTimeOffset prevWeek = now;
+            for (int i = 1; i < 8; i++)
+            {
+                prevWeek = prevWeek.AddDays(-1);
+                var week = GetIso8601WeekOfYear(prevWeek);
+                Assert.AreEqual(week == nowWeek, usageService.IsSameWeek(prevWeek));
+            }
+
+            Assert.False(usageService.IsSameWeek(now.AddYears(1)));
+        }
+
+        [Test]
+        public void IsSameMonthWorks()
+        {
+            var usageService = new UsageService(Substitute.For<IGitHubServiceProvider>());
+            var now = DateTimeOffset.Now;
+
+            Assert.True(usageService.IsSameMonth(now));
+
+            DateTimeOffset nextMonth = now;
+            for (int i = 1; i < 40; i++)
+            {
+                nextMonth = nextMonth.AddDays(1);
+                Assert.AreEqual(nextMonth.Month == now.Month, usageService.IsSameMonth(nextMonth));
+            }
+
+            DateTimeOffset prevMonth = now;
+            for (int i = 1; i < 40; i++)
+            {
+                prevMonth = prevMonth.AddDays(-1);
+                Assert.AreEqual(prevMonth.Month == now.Month, usageService.IsSameMonth(prevMonth));
+            }
+
+            Assert.False(usageService.IsSameMonth(now.AddYears(1)));
+        }
+
+        // http://blogs.msdn.com/b/shawnste/archive/2006/01/24/iso-8601-week-of-year-format-in-microsoft-net.aspx
+        static int GetIso8601WeekOfYear(DateTimeOffset time)
+        {
+            // Seriously cheat.  If its Monday, Tuesday or Wednesday, then it'll
+            // be the same week# as whatever Thursday, Friday or Saturday are,
+            // and we always get those right
+            DayOfWeek day = CultureInfo.InvariantCulture.Calendar.GetDayOfWeek(time.UtcDateTime);
+            if (day >= DayOfWeek.Monday && day <= DayOfWeek.Wednesday)
+            {
+                time = time.AddDays(3);
+            }
+
+            // Return the week of our adjusted day
+            return CultureInfo.InvariantCulture.Calendar.GetWeekOfYear(time.UtcDateTime, CalendarWeekRule.FirstFourDayWeek, DayOfWeek.Monday);
+        }
+    }
 }

test/UnitTests/UnitTests.csproj

@@ -268,7 +268,7 @@
     <Compile Include="GitHub.VisualStudio\Services\JsonConnectionCacheTests.cs" />
     <Compile Include="GitHub.VisualStudio\Services\ConnectionManagerTests.cs" />
     <Compile Include="GitHub.VisualStudio\Services\RepositoryPublishServiceTests.cs" />
-    <Compile Include="GitHub.VisualStudio\Services\UsageTrackerTests.cs" />
+    <Compile Include="GitHub.VisualStudio\Services\MetricsTests.cs" />
     <Compile Include="GitHub.VisualStudio\TeamExplorer\Home\GraphsNavigationItemTests.cs" />
     <Compile Include="Helpers\CommandTestHelpers.cs" />
     <Compile Include="Helpers\LazySubstitute.cs" />