Fix race causing an integration test to fail

Author: XDex

.github/workflows/build.yml

@@ -48,6 +48,7 @@ jobs:
     - name: 'Upload Codecov Coverage'
       uses: codecov/codecov-action@v1
       with:
+        token: ${{ secrets.CODECOV_TOKEN }}
         directory: ./Artefacts/coverage
     - name: 'Dotnet Cake Pack'
       run: dotnet cake --target=Pack

Source/Adobe.Target.Client/OnDevice/CampaignMacroReplacer.cs

@@ -84,7 +84,7 @@ internal IList<Option> GetOptions()
 
         private static string SanitizedMacroKey(string macroKey)
         {
-            if (macroKey == "mbox.name")
+            if (macroKey is "mbox.name" or "view.name")
             {
                 macroKey = "location.name";
             }

Source/Adobe.Target.Client/OnDevice/Collator/TimeParamsCollator.cs

@@ -26,8 +26,10 @@ public Dictionary<string, object> CollateParams(TargetDeliveryRequest deliveryRe
         {
             var result = new Dictionary<string, object>();
             var dateTime = TimeProvider.Current.UtcNow;
-            result.Add(CurrentTimestamp, new DateTimeOffset(dateTime).ToUnixTimeMilliseconds());
-            result.Add(CurrentDay, dateTime.DayOfWeek == 0 ? 7 : (int)dateTime.DayOfWeek);
+            var currentTimeStamp = new DateTimeOffset(dateTime).ToUnixTimeMilliseconds();
+            var currentDay = dateTime.DayOfWeek == 0 ? 7 : (int)dateTime.DayOfWeek;
+            result.Add(CurrentTimestamp, currentTimeStamp);
+            result.Add(CurrentDay, currentDay);
             result.Add(CurrentTime, dateTime.ToString("HHmm"));
             return result;
         }

Source/Adobe.Target.Client/Util/DefaultTimeProvider.cs

@@ -20,6 +20,6 @@ private DefaultTimeProvider()
 
         public static TimeProvider Instance { get; } = new DefaultTimeProvider();
 
-        public override DateTime UtcNow => DateTime.Now;
+        public override DateTime UtcNow => DateTime.UtcNow;
     }
 }

Tests/Adobe.Target.Client.Test/DecisioningIntegrationTests.cs

@@ -24,6 +24,7 @@ namespace Adobe.Target.Client.Test
     using Xunit;
     using Xunit.Abstractions;
 
+    [Collection("Datetime-mocked Collection")]
     public class DecisioningIntegrationTests : IClassFixture<IntegrationTestFixture>
     {
         private readonly IntegrationTestFixture fixture;
@@ -47,11 +48,11 @@ public void RunIntegrationTests()
             }
         }
 
-        [Fact(Skip = "Run when needed")]
+        [Fact]
         public void RunSingleIntegrationTest()
         {
-            const string suiteName = "TEST_SUITE_TELEMETRY";
-            const string testName = "doesnt_send";
+            const string suiteName = "TEST_SUITE_TIMEFRAME";
+            const string testName = "date_range_1";
 
             var suite = (IDictionary<string, object>) this.fixture.Tests[suiteName];
             var test = ((IDictionary<string, object>) suite["test"])[testName];

Tests/Adobe.Target.Client.Test/ParamsCollatorsShould.cs

@@ -19,6 +19,7 @@ namespace Adobe.Target.Client.Test
     using Client.Util;
     using Xunit;
 
+    [Collection("Datetime-mocked Collection")]
     public class ParamsCollatorsShould
     {
         private const string testClientId = "testClientId";
@@ -110,7 +111,7 @@ public void CollateParams_ReturnTimeParams()
             var timeMock = new Mock<TimeProvider>();
             timeMock
                 .SetupGet(tp => tp.UtcNow)
-                .Returns(mockDateTime);
+                .Returns(mockDateTime.ToUniversalTime());
             TimeProvider.Current = timeMock.Object;
             var result = new TimeParamsCollator().CollateParams();
 

Tests/Adobe.Target.Client.Test/Util/IntegrationTestUtils.cs

@@ -151,7 +151,7 @@ public static void SetupMockDateTime(IDictionary<string, object> test)
             var timeMock = new Mock<TimeProvider>();
             timeMock
                 .SetupGet(tp => tp.UtcNow)
-                .Returns(mockDateTime);
+                .Returns(mockDateTime.ToUniversalTime());
             TimeProvider.Current = timeMock.Object;
         }