Merge pull request #1020 from cocoa-mhlw/fix/sonarcloud_issues

fix remaining items of SonarCloud

src/Covid19Radar.Api.Common/Common/KeyLock.cs

@@ -43,12 +43,12 @@ public class LockItem
  /// <summary>
  /// Lock wait handle
  /// </summary>
- System.Threading.EventWaitHandle ev;
+ readonly System.Threading.EventWaitHandle ev;
 
  /// <summary>
  /// Identification key to lock
  /// </summary>
- string key;
+ readonly string key;
 
  /// <summary>
  /// Constructor for initialization and acquireing locks

src/Covid19Radar.Api.Tests/Common/QueryCacheTest.cs

@@ -17,20 +17,6 @@ namespace Covid19Radar.Api.Tests.Common
  [TestCategory("Common")]
  public class QueryCacheTest
  {
- [DataTestMethod]
- [DataRow(-1)]
- [DataRow(0)]
- [DataRow(1)]
- [DataRow(10)]
- [DataRow(100)]
- [DataRow(int.MaxValue)]
- [DataRow(int.MinValue)]
- public void CreateMethod(int cacheTimeout)
- {
- // preparation
- // action
- var instance = new QueryCache<string>(cacheTimeout);
- }
 
  [DataTestMethod]
  [DataRow(60, "", "", 1)]

src/Covid19Radar.Api.Tests/Covid19Radar.Api.Tests.csproj

@@ -32,6 +32,7 @@
  <None Remove="Files\eventlog_submission_parameter1-cleartext.txt" />
  </ItemGroup>
  <ItemGroup>
+ <Folder Include="Common\DataAccess\" />
  <Folder Include="Files\" />
  </ItemGroup>
  <ItemGroup>

src/Covid19Radar.Api.Tests/DiagnosisApiTest.cs

@@ -25,19 +25,19 @@ public void CreateMethod()
  // preparation
  var config = new Mock<IConfiguration>();
  config.Setup(_ => _["SupportRegions"]).Returns("Region1,Region2");
- var diagnosisRepo = new Mock<IDiagnosisRepository>();
  var tekRepo = new Mock<ITemporaryExposureKeyRepository>();
  var validationServer = new Mock<IValidationServerService>();
  var deviceCheck = new Mock<IDeviceValidationService>();
  var verification = new Mock<IVerificationService>();
  var logger = new Mock.LoggerMock<DiagnosisApi>();
  var diagnosisApi = new DiagnosisApi(config.Object,
- diagnosisRepo.Object,
  tekRepo.Object,
  deviceCheck.Object,
  verification.Object,
  validationServer.Object,
  logger);
+
+ Assert.IsNotNull(diagnosisApi);
  }
 
  [DataTestMethod]
@@ -56,12 +56,7 @@ public async Task RunAsyncMethod(bool isValid,
  // preparation
  var config = new Mock<IConfiguration>();
  config.Setup(_ => _["SupportRegions"]).Returns("Region1,Region2");
- var diagnosisRepo = new Mock<IDiagnosisRepository>();
- diagnosisRepo.Setup(_ => _.SubmitDiagnosisAsync(It.IsAny<string>(),
- It.IsAny<DateTimeOffset>(),
- It.IsAny<string>(),
- It.IsAny<TemporaryExposureKeyModel[]>()))
- .ReturnsAsync(new DiagnosisModel());
+
  var tekRepo = new Mock<ITemporaryExposureKeyRepository>();
  var validationServer = new Mock<IValidationServerService>();
  validationServer.Setup(_ => _.Validate(It.IsAny<HttpRequest>())).Returns(IValidationServerService.ValidateResult.Success);
@@ -72,7 +67,6 @@ public async Task RunAsyncMethod(bool isValid,
  var verification = new Mock<IVerificationService>();
  var logger = new Mock.LoggerMock<DiagnosisApi>();
  var diagnosisApi = new DiagnosisApi(config.Object,
- diagnosisRepo.Object,
  tekRepo.Object,
  deviceCheck.Object,
  verification.Object,

src/Covid19Radar.Api.Tests/V2DiagnosisApiTest.cs

@@ -28,14 +28,12 @@ public void CreateMethod()
  // preparation
  var config = new Mock<IConfiguration>();
  config.Setup(_ => _["SupportRegions"]).Returns("Region1,Region2");
- var diagnosisRepo = new Mock<IDiagnosisRepository>();
  var tekRepo = new Mock<ITemporaryExposureKeyRepository>();
  var validationServer = new Mock<IValidationServerService>();
  var deviceCheck = new Mock<IDeviceValidationService>();
  var verification = new Mock<IVerificationService>();
  var logger = new Mock.LoggerMock<Covid19Radar.Api.V2DiagnosisApi>();
  var diagnosisApi = new V2DiagnosisApi(config.Object,
- diagnosisRepo.Object,
  tekRepo.Object,
  deviceCheck.Object,
  verification.Object,
@@ -68,12 +66,7 @@ HttpStatusCode expectedStatusCode
  // preparation
  var config = new Mock<IConfiguration>();
  config.Setup(_ => _["SupportRegions"]).Returns("Region1,Region2");
- var diagnosisRepo = new Mock<IDiagnosisRepository>();
- diagnosisRepo.Setup(_ => _.SubmitDiagnosisAsync(It.IsAny<string>(),
- It.IsAny<DateTimeOffset>(),
- It.IsAny<string>(),
- It.IsAny<TemporaryExposureKeyModel[]>()))
- .ReturnsAsync(new DiagnosisModel());
+
  var tekRepo = new Mock<ITemporaryExposureKeyRepository>();
  var validationServer = new Mock<IValidationServerService>();
  validationServer.Setup(_ => _.Validate(It.IsAny<HttpRequest>())).Returns(IValidationServerService.ValidateResult.Success);
@@ -84,7 +77,6 @@ HttpStatusCode expectedStatusCode
  var verification = new Mock<IVerificationService>();
  var logger = new Mock.LoggerMock<Covid19Radar.Api.V2DiagnosisApi>();
  var diagnosisApi = new V2DiagnosisApi(config.Object,
- diagnosisRepo.Object,
  tekRepo.Object,
  deviceCheck.Object,
  verification.Object,

src/Covid19Radar.Api.Tests/V3DiagnosisApiTest.cs

@@ -75,12 +75,7 @@ HttpStatusCode expectedStatusCode
  // preparation
  var config = new Mock<IConfiguration>();
  config.Setup(_ => _["SupportRegions"]).Returns("Region1,Region2");
- var diagnosisRepo = new Mock<IDiagnosisRepository>();
- diagnosisRepo.Setup(_ => _.SubmitDiagnosisAsync(It.IsAny<string>(),
- It.IsAny<DateTimeOffset>(),
- It.IsAny<string>(),
- It.IsAny<TemporaryExposureKeyModel[]>()))
- .ReturnsAsync(new DiagnosisModel());
+
  var tekRepo = new Mock<ITemporaryExposureKeyRepository>();
  var validationServer = new Mock<IValidationServerService>();
  validationServer.Setup(_ => _.Validate(It.IsAny<HttpRequest>())).Returns(IValidationServerService.ValidateResult.Success);
@@ -184,12 +179,7 @@ HttpStatusCode expectedStatusCode
  // preparation
  var config = new Mock<IConfiguration>();
  config.Setup(_ => _["SupportRegions"]).Returns("Region1,Region2");
- var diagnosisRepo = new Mock<IDiagnosisRepository>();
- diagnosisRepo.Setup(_ => _.SubmitDiagnosisAsync(It.IsAny<string>(),
- It.IsAny<DateTimeOffset>(),
- It.IsAny<string>(),
- It.IsAny<TemporaryExposureKeyModel[]>()))
- .ReturnsAsync(new DiagnosisModel());
+
  var tekRepo = new Mock<ITemporaryExposureKeyRepository>();
  var validationServer = new Mock<IValidationServerService>();
  validationServer.Setup(_ => _.Validate(It.IsAny<HttpRequest>())).Returns(IValidationServerService.ValidateResult.Success);