From 03949ed625dd5296d6dbbe17ca51c795db995ff5 Mon Sep 17 00:00:00 2001 From: Olga Nemt Date: Wed, 31 May 2023 10:17:54 +0500 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D1=8B=20=D0=B0=D0=B2=D1=82=D0=BE=D1=82=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TrajectoryVisualizationServiceTest.cs | 76 ++++++++++++------- 1 file changed, 47 insertions(+), 29 deletions(-) diff --git a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs index 58abdf1d..3b653f8f 100644 --- a/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs +++ b/AsbCloudWebApi.Tests/ServicesTests/TrajectoryVisualizationServiceTest.cs @@ -13,8 +13,9 @@ namespace AsbCloudWebApi.Tests.ServicesTests { public class TrajectoryVisualizationServiceTest { - private Mock MakeTrajectoryRepositoryMock(IEnumerable dateForGetMethod) - where T : class, ITrajectoryPlanRepository + private Mock MakeTrajectoryRepositoryMock(IEnumerable dateForGetMethod) + where V : TrajectoryGeoDto + where T : class, ITrajectoryRepository { var mock = new Mock(); @@ -27,25 +28,25 @@ namespace AsbCloudWebApi.Tests.ServicesTests [Fact] public async Task GetTrajectoryAsync_SameCounts() { - var plannedTrajectory = new TrajectoryGeoFactDto[] + var plannedTrajectory = new TrajectoryGeoPlanDto[] { - new(0d, 0d, 0d), - new(0d, 0d, 10d), - new(0d, 30d, 20d), - new(30d, 0d, 30d), - new(30d, 90d, 40d), - new(0d, 0d, 50d), + new TrajectoryGeoPlanDto() { WellboreDepth = 0d, ZenithAngle = 0d, AzimuthGeo = 0d }, + new TrajectoryGeoPlanDto() { WellboreDepth = 0d, ZenithAngle = 0d, AzimuthGeo = 10d }, + new TrajectoryGeoPlanDto() { WellboreDepth = 0d, ZenithAngle = 30d, AzimuthGeo = 20d }, + new TrajectoryGeoPlanDto() { WellboreDepth = 30d, ZenithAngle = 0d, AzimuthGeo = 30d }, + new TrajectoryGeoPlanDto() { WellboreDepth = 30d, ZenithAngle = 90d, AzimuthGeo = 40d }, + new TrajectoryGeoPlanDto() { WellboreDepth = 0d, ZenithAngle = 0d, AzimuthGeo = 50d }, }; var actualTrajectory = new TrajectoryGeoFactDto[] { - new(0, 0, 0), - new(30,30,10), - new(0, 0, 20), + new TrajectoryGeoFactDto() { WellboreDepth = 0, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoFactDto() { WellboreDepth = 30, ZenithAngle = 30, AzimuthGeo = 10 }, + new TrajectoryGeoFactDto() { WellboreDepth = 0, ZenithAngle = 0, AzimuthGeo = 20 }, }; - var mockPlan = MakeTrajectoryRepositoryMock(plannedTrajectory); - var mockFact = MakeTrajectoryRepositoryMock(actualTrajectory); + var mockPlan = MakeTrajectoryRepositoryMock(plannedTrajectory); + var mockFact = MakeTrajectoryRepositoryMock(actualTrajectory); var service = new TrajectoryService(mockPlan.Object, mockFact.Object); var result = await service.GetTrajectoryCartesianAsync(1, CancellationToken.None); Assert.Equal(plannedTrajectory.Length, result.Plan?.Count()); @@ -55,18 +56,28 @@ namespace AsbCloudWebApi.Tests.ServicesTests [Fact] public async Task GetTrajectoryAsync_StraigthBore() { - var trajectory = new TrajectoryGeoFactDto[] + var plannedTrajectory = new TrajectoryGeoPlanDto[] { - new(0, 0, 0), - new(0, 0, 0), - new(20, 0, 0), - new(20, 0, 0), - new(30, 0, 0), - new(50, 0, 0), + new TrajectoryGeoPlanDto() { WellboreDepth = 0, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoPlanDto() { WellboreDepth = 0, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoPlanDto() { WellboreDepth = 20, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoPlanDto() { WellboreDepth = 20, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoPlanDto() { WellboreDepth = 30, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoPlanDto() { WellboreDepth = 50, ZenithAngle = 0, AzimuthGeo = 0 }, }; - var mockPlan = MakeTrajectoryRepositoryMock(trajectory); - var mockFact = MakeTrajectoryRepositoryMock(trajectory); + var actualTrajectory = new TrajectoryGeoFactDto[] + { + new TrajectoryGeoFactDto() { WellboreDepth = 0, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoFactDto() { WellboreDepth = 0, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoFactDto() { WellboreDepth = 20, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoFactDto() { WellboreDepth = 20, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoFactDto() { WellboreDepth = 30, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoFactDto() { WellboreDepth = 50, ZenithAngle = 0, AzimuthGeo = 0 }, + }; + + var mockPlan = MakeTrajectoryRepositoryMock(plannedTrajectory); + var mockFact = MakeTrajectoryRepositoryMock(actualTrajectory); var service = new TrajectoryService(mockPlan.Object, mockFact.Object); var result = await service.GetTrajectoryCartesianAsync(1, CancellationToken.None); var lastPointPlan = result.Plan!.Last(); @@ -84,15 +95,22 @@ namespace AsbCloudWebApi.Tests.ServicesTests [Fact] public async Task GetTrajectoryAsync_Match() { - var trajectory = new TrajectoryGeoFactDto[] + var plannedTrajectory = new TrajectoryGeoPlanDto[] { - new(0, 0, 0), - new(10, 30, 30), - new(20, 0, 0), + new TrajectoryGeoPlanDto() { WellboreDepth = 0, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoPlanDto() { WellboreDepth = 10, ZenithAngle = 30, AzimuthGeo = 30 }, + new TrajectoryGeoPlanDto() { WellboreDepth = 20, ZenithAngle = 0, AzimuthGeo = 0 }, }; - var mockPlanned = MakeTrajectoryRepositoryMock(trajectory); - var mockFactual = MakeTrajectoryRepositoryMock(trajectory); + var actualTrajectory = new TrajectoryGeoFactDto[] + { + new TrajectoryGeoFactDto() { WellboreDepth = 0, ZenithAngle = 0, AzimuthGeo = 0 }, + new TrajectoryGeoFactDto() { WellboreDepth = 10, ZenithAngle = 30, AzimuthGeo = 30 }, + new TrajectoryGeoFactDto() { WellboreDepth = 20, ZenithAngle = 0, AzimuthGeo = 0 }, + }; + + var mockPlanned = MakeTrajectoryRepositoryMock(plannedTrajectory); + var mockFactual = MakeTrajectoryRepositoryMock(actualTrajectory); var service = new TrajectoryService(mockPlanned.Object, mockFactual.Object); var result = await service.GetTrajectoryCartesianAsync(1, CancellationToken.None); var lastPointPlan = result.Plan!.Last();