Skip to content
This repository has been archived by the owner on Apr 12, 2023. It is now read-only.

fix remaining items of SonarCloud #1020

Merged
merged 1 commit into from
May 31, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Covid19Radar.Api.Common/Common/KeyLock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

This file was deleted.

21 changes: 0 additions & 21 deletions src/Covid19Radar.Api.Common/DataAccess/IDiagnosisRepository.cs

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions src/Covid19Radar.Api.Tests/Common/QueryCacheTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
1 change: 1 addition & 0 deletions src/Covid19Radar.Api.Tests/Covid19Radar.Api.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<None Remove="Files\eventlog_submission_parameter1-cleartext.txt" />
</ItemGroup>
<ItemGroup>
<Folder Include="Common\DataAccess\" />
<Folder Include="Files\" />
</ItemGroup>
<ItemGroup>
Expand Down
12 changes: 3 additions & 9 deletions src/Covid19Radar.Api.Tests/DiagnosisApiTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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);
Expand All @@ -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,
Expand Down
10 changes: 1 addition & 9 deletions src/Covid19Radar.Api.Tests/V2DiagnosisApiTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand All @@ -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,
Expand Down
14 changes: 2 additions & 12 deletions src/Covid19Radar.Api.Tests/V3DiagnosisApiTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
Loading