From 69971a1004458b93adee6285528c718294d60d4f Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Fri, 18 Nov 2022 16:13:32 +0500 Subject: [PATCH] remove CacheDB from tests --- .../ServicesTests/DepositCrudCacheServiceTest.cs | 2 +- .../ServicesTests/DetectedOperationServiceTest.cs | 3 --- .../ServicesTests/DrillerServiceTest.cs | 5 ----- .../ServicesTests/EventServiceTest.cs | 3 --- .../ServicesTests/FileCategoryServiceTest.cs | 6 ++---- .../ServicesTests/TelemetryDataSaubServiceTest.cs | 11 +++++------ AsbCloudWebApi.Tests/TestHelpter.cs | 3 +++ 7 files changed, 11 insertions(+), 22 deletions(-) diff --git a/AsbCloudWebApi.Tests/ServicesTests/DepositCrudCacheServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/DepositCrudCacheServiceTest.cs index 91664385..e95c7cc3 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/DepositCrudCacheServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/DepositCrudCacheServiceTest.cs @@ -22,7 +22,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests protected override ICrudService MakeService() { var dbContext = TestHelpter.MakeRealTestContext(); - return new CrudCacheServiceBase(dbContext); + return new CrudCacheServiceBase(dbContext, TestHelpter.MemoryCache); } } } diff --git a/AsbCloudWebApi.Tests/ServicesTests/DetectedOperationServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/DetectedOperationServiceTest.cs index f341a15a..00bca2aa 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/DetectedOperationServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/DetectedOperationServiceTest.cs @@ -3,8 +3,6 @@ using AsbCloudApp.Requests; using AsbCloudApp.Services; using AsbCloudDb.Model; using AsbCloudInfrastructure.Repository; -using AsbCloudInfrastructure.Services; -using AsbCloudInfrastructure.Services.Cache; using AsbCloudInfrastructure.Services.DetectOperations; using Moq; using System; @@ -19,7 +17,6 @@ namespace AsbCloudWebApi.Tests.ServicesTests public class DetectedOperationServiceTest { private readonly AsbCloudDbContext context; - private readonly CacheDb cacheDb; private readonly DetectedOperationService service; private readonly DetectedOperationRequest request; private Deposit deposit = new Deposit { Id = 1, Caption = "Депозит 1" }; diff --git a/AsbCloudWebApi.Tests/ServicesTests/DrillerServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/DrillerServiceTest.cs index 7c1e60ff..f829c76c 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/DrillerServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/DrillerServiceTest.cs @@ -1,10 +1,5 @@ using AsbCloudApp.Data; -using AsbCloudApp.Repositories; using AsbCloudApp.Services; -using AsbCloudDb.Model; -using AsbCloudInfrastructure.Repository; -using AsbCloudInfrastructure.Services; -using AsbCloudInfrastructure.Services.Cache; using Moq; using System.Collections.Generic; using System.Linq; diff --git a/AsbCloudWebApi.Tests/ServicesTests/EventServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/EventServiceTest.cs index 0c406f1e..b13cab4e 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/EventServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/EventServiceTest.cs @@ -1,7 +1,6 @@ using AsbCloudApp.Data.SAUB; using AsbCloudApp.Services; using AsbCloudDb.Model; -using AsbCloudInfrastructure.Services.Cache; using AsbCloudInfrastructure.Services.SAUB; using Moq; using System.Collections.Generic; @@ -14,13 +13,11 @@ namespace AsbCloudWebApi.Tests.ServicesTests; public class EventServiceTest { private readonly AsbCloudDbContext context; - private readonly CacheDb cacheDb; private readonly EventService service; public EventServiceTest() { context = TestHelpter.MakeRealTestContext(); - cacheDb = new CacheDb(); var telemetryTracker = new Mock(); var imezoneServiceMock = new Mock(); var telemetryService = new TelemetryService(context, telemetryTracker.Object, imezoneServiceMock.Object); diff --git a/AsbCloudWebApi.Tests/ServicesTests/FileCategoryServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/FileCategoryServiceTest.cs index 345f2693..12874dea 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/FileCategoryServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/FileCategoryServiceTest.cs @@ -1,7 +1,5 @@ -using AsbCloudApp.Data; -using AsbCloudDb.Model; +using AsbCloudDb.Model; using AsbCloudInfrastructure.Services; -using AsbCloudInfrastructure.Services.Cache; using System.Linq; using System.Threading; using System.Threading.Tasks; @@ -19,7 +17,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests context = TestHelpter.MakeRealTestContext(); context.SaveChanges(); - service = new FileCategoryService(context); + service = new FileCategoryService(context, TestHelpter.MemoryCache); } ~FileCategoryServiceTest() diff --git a/AsbCloudWebApi.Tests/ServicesTests/TelemetryDataSaubServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/TelemetryDataSaubServiceTest.cs index 46d9136d..6d395cf2 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/TelemetryDataSaubServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/TelemetryDataSaubServiceTest.cs @@ -2,7 +2,6 @@ using AsbCloudApp.Data.SAUB; using AsbCloudApp.Services; using AsbCloudDb.Model; -using AsbCloudInfrastructure.Services.Cache; using AsbCloudInfrastructure.Services.SAUB; using Moq; using System; @@ -20,9 +19,9 @@ namespace AsbCloudWebApi.Tests.ServicesTests private readonly Mock timezoneService; private readonly SimpleTimezoneDto timezone; private readonly AsbCloudDbContext context; - private readonly CacheDb cacheDb; private readonly TelemetryService telemetryService; - + private readonly TelemetryUserService telemetryUserService; + private readonly TelemetryDataCache telemetryDataSaubCache; private readonly DateTime drillingStartDate; private readonly string uuid; public TelemetryDataSaubServiceTest() @@ -41,9 +40,9 @@ namespace AsbCloudWebApi.Tests.ServicesTests .Returns(timezone); context = TestHelpter.MakeRealTestContext(); - cacheDb = new CacheDb(); telemetryService = new TelemetryService(context, telemetryTracker.Object, timezoneService.Object); - + telemetryUserService = new TelemetryUserService(context, telemetryService, TestHelpter.MemoryCache); + telemetryDataSaubCache = TelemetryDataCache.GetInstance(context, out Task _); var info = new TelemetryInfoDto { TimeZoneOffsetTotalHours = timezone.Hours, @@ -64,7 +63,7 @@ namespace AsbCloudWebApi.Tests.ServicesTests public async Task UpdateDataAsync() { // Arrange - var telemetryDataSaubService = new TelemetryDataSaubService(context, telemetryService, null, cacheDb); + var telemetryDataSaubService = new TelemetryDataSaubService(context, telemetryService, telemetryUserService, telemetryDataSaubCache); var now = DateTimeOffset.UtcNow.ToOffset(TimeSpan.FromHours(timezone.Hours)).DateTime; var tuser = "Завулон"; diff --git a/AsbCloudWebApi.Tests/TestHelpter.cs b/AsbCloudWebApi.Tests/TestHelpter.cs index 94bf1392..ad71a71f 100644 --- a/AsbCloudWebApi.Tests/TestHelpter.cs +++ b/AsbCloudWebApi.Tests/TestHelpter.cs @@ -1,5 +1,6 @@ using AsbCloudDb.Model; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.Caching.Memory; using Moq; using System.Collections.Generic; using System.Linq; @@ -10,6 +11,8 @@ namespace AsbCloudWebApi.Tests { // Попробовать когда-нибудь https://github.com/MichalJankowskii/Moq.EntityFrameworkCore + public static IMemoryCache MemoryCache = new MemoryCache(new MemoryCacheOptions()); + public static AsbCloudDbContext MakeRealTestContext() { var options = new DbContextOptionsBuilder()