From e98df27d2ee69019e7b30374663f0c235840ccbb Mon Sep 17 00:00:00 2001 From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:06:39 +0900 Subject: [PATCH 1/2] Fixed request parameter of event log api --- Covid19Radar/Covid19Radar/Services/EventLogService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Covid19Radar/Covid19Radar/Services/EventLogService.cs b/Covid19Radar/Covid19Radar/Services/EventLogService.cs index 4e7788cba..b6befe67d 100644 --- a/Covid19Radar/Covid19Radar/Services/EventLogService.cs +++ b/Covid19Radar/Covid19Radar/Services/EventLogService.cs @@ -139,7 +139,7 @@ private async Task SendAsync(string idempotencyKey, List eventLo var request = new V1EventLogRequest() { IdempotencyKey = idempotencyKey, - Platform = _essentialsService.Platform, + Platform = _essentialsService.Platform.ToLowerInvariant(), AppPackageName = _essentialsService.AppPackageName, EventLogs = eventLogList, }; From bb81cac1f673b981a15531d7b7e144647d8b1d2e Mon Sep 17 00:00:00 2001 From: cocoa-dev004 <66989461+cocoa-dev004@users.noreply.github.com> Date: Fri, 22 Jul 2022 12:23:28 +0900 Subject: [PATCH 2/2] Fixed unit test --- .../Services/EventLogServiceTests.cs | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/EventLogServiceTests.cs b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/EventLogServiceTests.cs index 5cff245f4..090d2c8e2 100644 --- a/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/EventLogServiceTests.cs +++ b/Covid19Radar/Tests/Covid19Radar.UnitTests/Services/EventLogServiceTests.cs @@ -92,6 +92,9 @@ public async Task SendAllAsyncTest1() _deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny())).Returns(false); + _essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform"); + _essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name"); + // Test Case var unitUnderTest = CreateService(); await unitUnderTest.SendAllAsync(long.MaxValue, 1); @@ -100,7 +103,13 @@ public async Task SendAllAsyncTest1() _loggerService.Verify(x => x.Info("Event log send successful.", It.IsAny(), It.IsAny(), It.IsAny()), Times.Once()); _loggerService.Verify(x => x.Error(It.IsAny(), It.IsAny(), It.IsAny(), It.IsAny()), Times.Never()); - _httpDataService.Verify(x => x.PutEventLog(It.Is(x => x.EventLogs.Count == 1)), Times.Once()); + _httpDataService.Verify(x => x.PutEventLog( + It.Is(x => + x.EventLogs.Count == 1 && + x.Platform == "testplatform" && + x.AppPackageName == "test.package.name" + )), + Times.Once()); _deviceVerifier.Verify(x => x.VerifyAsync(It.IsAny()), Times.Once()); @@ -127,6 +136,9 @@ public async Task SendAllAsyncTest_withdrawn_consent() _deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny())).Returns(false); + _essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform"); + _essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name"); + // Test Case var unitUnderTest = CreateService(); await unitUnderTest.SendAllAsync(long.MaxValue, 1); @@ -168,6 +180,9 @@ public async Task SendAllAsyncTest_RetrySuccess() _deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny())).Returns(false); + _essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform"); + _essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name"); + // Test Case var unitUnderTest = CreateService(); await unitUnderTest.SendAllAsync(long.MaxValue, 3); @@ -202,6 +217,9 @@ public async Task SendAllAsyncTest_RetryFailure() _deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny())).Returns(false); + _essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform"); + _essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name"); + // Test Case var unitUnderTest = CreateService(); await unitUnderTest.SendAllAsync(long.MaxValue, 3); @@ -237,6 +255,9 @@ public async Task SendAllAsyncTest_RetryException() _deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny())).Returns(false); + _essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform"); + _essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name"); + // Test Case var unitUnderTest = CreateService(); await unitUnderTest.SendAllAsync(long.MaxValue, 3); @@ -272,6 +293,9 @@ public async Task SendAllAsyncTest_DisableAll() _deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny())).Returns(false); + _essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform"); + _essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name"); + // Test Case var unitUnderTest = CreateService(); await unitUnderTest.SendAllAsync(long.MaxValue, 1); @@ -298,6 +322,9 @@ public async Task SendAllAsyncTest_DeviceVerifierFailure() _deviceVerifier.Setup(x => x.IsErrorPayload(It.IsAny())).Returns(true); + _essentialsService.SetupGet(x => x.Platform).Returns("TestPlatform"); + _essentialsService.SetupGet(x => x.AppPackageName).Returns("test.package.name"); + // Test Case var unitUnderTest = CreateService(); await unitUnderTest.SendAllAsync(long.MaxValue, 0);