diff --git a/backend/api.test/Client/AreaTests.cs b/backend/api.test/Client/AreaTests.cs index ab50f5fb..c68fbbbe 100644 --- a/backend/api.test/Client/AreaTests.cs +++ b/backend/api.test/Client/AreaTests.cs @@ -142,9 +142,9 @@ public async Task AreaTest() public async Task MissionIsCreatedInInspectionArea() { // Arrange - Initialise area - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); @@ -217,7 +217,7 @@ public async Task MissionIsCreatedInInspectionArea() public async Task EmergencyDockTest() { // Arrange - var installation = await DatabaseUtilities.ReadOrNewInstallation(); + var installation = await DatabaseUtilities.NewInstallation(); string installationCode = installation.InstallationCode; // Act @@ -237,9 +237,9 @@ public async Task EmergencyDockTest() public async Task UpdateDefaultLocalizationPoseOnInspectionArea() { // Arrange - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); diff --git a/backend/api.test/Client/MissionTests.cs b/backend/api.test/Client/MissionTests.cs index 3ffef5c9..ee4bcb53 100644 --- a/backend/api.test/Client/MissionTests.cs +++ b/backend/api.test/Client/MissionTests.cs @@ -41,7 +41,7 @@ public async Task InitializeAsync() public async Task ScheduleOneMissionTest() { // Arrange - Area - var installation = await DatabaseUtilities.ReadOrNewInstallation(); + var installation = await DatabaseUtilities.NewInstallation(); // Arrange - Robot var robot = await DatabaseUtilities.NewRobot(RobotStatus.Busy, installation); @@ -80,7 +80,7 @@ public async Task ScheduleOneMissionTest() public async Task Schedule3MissionsTest() { // Arrange - Area - var installation = await DatabaseUtilities.ReadOrNewInstallation(); + var installation = await DatabaseUtilities.NewInstallation(); // Arrange - Robot var robot = await DatabaseUtilities.NewRobot(RobotStatus.Busy, installation); @@ -156,13 +156,13 @@ public async Task Schedule3MissionsTest() public async Task AddNonDuplicateAreasToDb() { // Arrange - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); - var _ = await DatabaseUtilities.ReadOrNewArea( + var _ = await DatabaseUtilities.NewArea( installation.InstallationCode, plant.PlantCode, inspectionArea.Name @@ -215,13 +215,13 @@ public async Task AddNonDuplicateAreasToDb() public async Task AddDuplicateAreasToDb_Fails() { // Arrange - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); - var area = await DatabaseUtilities.ReadOrNewArea( + var area = await DatabaseUtilities.NewArea( installation.InstallationCode, plant.PlantCode, inspectionArea.Name @@ -283,9 +283,9 @@ public async Task DeleteMission_ShouldReturnNotFound() public async Task ScheduleDuplicateCustomMissionDefinitions() { // Arrange - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); @@ -368,9 +368,9 @@ public async Task ScheduleDuplicateCustomMissionDefinitions() public async Task GetNextRun() { // Arrange - Initialise area - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); @@ -488,13 +488,13 @@ public async Task GetNextRun() public async Task ScheduleDuplicatMissionDefinitions() { // Arrange - Initialise area - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); - var area = await DatabaseUtilities.ReadOrNewArea( + var area = await DatabaseUtilities.NewArea( installation.InstallationCode, plant.PlantCode, inspectionArea.Name @@ -552,9 +552,9 @@ public async Task ScheduleDuplicatMissionDefinitions() public async Task MissionDoesNotStartIfRobotIsNotInSameInstallationAsMission() { // Arrange - Initialise area - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); @@ -620,8 +620,8 @@ public async Task MissionDoesNotStartIfRobotIsNotInSameInstallationAsMission() public async Task MissionFailsIfRobotIsNotInSameInspectionAreaAsMission() { // Arrange - Initialise area - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); string inspectionAreaName1 = "inspectionAreaMissionFailsIfRobotIsNotInSameInspectionAreaAsMission1"; diff --git a/backend/api.test/Client/RobotTests.cs b/backend/api.test/Client/RobotTests.cs index 1a002935..17878ed2 100644 --- a/backend/api.test/Client/RobotTests.cs +++ b/backend/api.test/Client/RobotTests.cs @@ -61,7 +61,7 @@ public async Task GetRobotById_ShouldReturnNotFound() [Fact] public async Task GetRobotById_ShouldReturnRobot() { - var installation = await DatabaseUtilities.ReadOrNewInstallation(); + var installation = await DatabaseUtilities.NewInstallation(); _ = await DatabaseUtilities.NewRobot(RobotStatus.Available, installation); string url = "/robots"; @@ -90,13 +90,11 @@ public async Task GetRobotById_ShouldReturnRobot() public async Task RobotIsNotCreatedWithAreaNotInInstallation() { // Arrange - Area - var installation = await DatabaseUtilities.ReadOrNewInstallation(); + var installation = await DatabaseUtilities.NewInstallation(); var wrongInstallation = await DatabaseUtilities.NewInstallation("wrongInstallation"); - var wrongPlant = await DatabaseUtilities.ReadOrNewPlant( - wrongInstallation.InstallationCode - ); - var wrongInspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var wrongPlant = await DatabaseUtilities.NewPlant(wrongInstallation.InstallationCode); + var wrongInspectionArea = await DatabaseUtilities.NewInspectionArea( wrongInstallation.InstallationCode, wrongPlant.PlantCode ); diff --git a/backend/api.test/Database/DatabaseUtilities.cs b/backend/api.test/Database/DatabaseUtilities.cs index d13beacf..eef916fd 100644 --- a/backend/api.test/Database/DatabaseUtilities.cs +++ b/backend/api.test/Database/DatabaseUtilities.cs @@ -126,16 +126,6 @@ public async Task NewMissionRun( return missionRun; } - public async Task ReadOrNewInstallation() - { - if ( - await _installationService.ReadByInstallationCode(_testInstallationCode) - is Installation installation - ) - return installation; - return await NewInstallation(); - } - public async Task NewInstallation(string installationCode = "") { if (string.IsNullOrEmpty(installationCode)) @@ -148,13 +138,6 @@ public async Task NewInstallation(string installationCode = "") return await _installationService.Create(createInstallationQuery); } - public async Task ReadOrNewPlant(string installationCode) - { - if (await _plantService.ReadByPlantCode(_testPlantCode) is Plant plant) - return plant; - return await NewPlant(installationCode); - } - public async Task NewPlant(string installationCode) { var createPlantQuery = new CreatePlantQuery @@ -167,22 +150,6 @@ public async Task NewPlant(string installationCode) return await _plantService.Create(createPlantQuery); } - public async Task ReadOrNewInspectionArea( - string installationCode, - string plantCode - ) - { - if ( - await _inspectionAreaService.ReadByInstallationAndName( - installationCode, - _testInspectionAreaName - ) - is InspectionArea inspectionArea - ) - return inspectionArea; - return await NewInspectionArea(installationCode, plantCode); - } - public async Task NewInspectionArea( string installationCode, string plantCode, @@ -202,20 +169,6 @@ public async Task NewInspectionArea( return await _inspectionAreaService.Create(createInspectionAreaQuery); } - public async Task ReadOrNewArea( - string installationCode, - string plantCode, - string inspectionAreaName - ) - { - if ( - await _areaService.ReadByInstallationAndName(_testInstallationCode, _testAreaName) - is Area area - ) - return area; - return await NewArea(installationCode, plantCode, inspectionAreaName); - } - public async Task NewArea( string installationCode, string plantCode, diff --git a/backend/api.test/EventHandlers/TestMissionEventHandler.cs b/backend/api.test/EventHandlers/TestMissionEventHandler.cs index 23876e4b..4dd402ac 100644 --- a/backend/api.test/EventHandlers/TestMissionEventHandler.cs +++ b/backend/api.test/EventHandlers/TestMissionEventHandler.cs @@ -415,9 +415,9 @@ public async Task QueuedMissionsAreNotAbortedWhenRobotAvailableHappensAtTheSameT public async Task QueuedContinuesWhenOnIsarStatusHappensAtTheSameTimeAsOnIsarMissionCompleted() { // Arrange - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode ); diff --git a/backend/api.test/Services/MissionService.cs b/backend/api.test/Services/MissionService.cs index 133d74ad..e5ad3721 100644 --- a/backend/api.test/Services/MissionService.cs +++ b/backend/api.test/Services/MissionService.cs @@ -50,9 +50,9 @@ public async Task Create() ); int nReportsBefore = reportsBefore.Count; - var installation = await DatabaseUtilities.ReadOrNewInstallation(); - var plant = await DatabaseUtilities.ReadOrNewPlant(installation.InstallationCode); - var inspectionArea = await DatabaseUtilities.ReadOrNewInspectionArea( + var installation = await DatabaseUtilities.NewInstallation(); + var plant = await DatabaseUtilities.NewPlant(installation.InstallationCode); + var inspectionArea = await DatabaseUtilities.NewInspectionArea( installation.InstallationCode, plant.PlantCode );