Skip to content

Commit

Permalink
Remove test helpers for read or new objects
Browse files Browse the repository at this point in the history 
These were added due to difficulties with shared databased across the tests
which have since been resolved.
  • Loading branch information
@aeshub
aeshub committed Jan 15, 2025
1 parent 47c077a commit 3d0ab6c
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 91 deletions.
14 changes: 7 additions & 7 deletions backend/api.test/Client/AreaTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand Down Expand Up @@ -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
Expand All @@ -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
);
Expand Down
50 changes: 25 additions & 25 deletions backend/api.test/Client/MissionTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
);
Expand Down Expand Up @@ -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
);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
);
Expand Down Expand Up @@ -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";
Expand Down
10 changes: 4 additions & 6 deletions backend/api.test/Client/RobotTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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
);
Expand Down
47 changes: 0 additions & 47 deletions backend/api.test/Database/DatabaseUtilities.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,6 @@ public async Task<MissionRun> NewMissionRun(
return missionRun;
}

public async Task<Installation> ReadOrNewInstallation()
{
if (
await _installationService.ReadByInstallationCode(_testInstallationCode)
is Installation installation
)
return installation;
return await NewInstallation();
}

public async Task<Installation> NewInstallation(string installationCode = "")
{
if (string.IsNullOrEmpty(installationCode))
Expand All @@ -148,13 +138,6 @@ public async Task<Installation> NewInstallation(string installationCode = "")
return await _installationService.Create(createInstallationQuery);
}

public async Task<Plant> ReadOrNewPlant(string installationCode)
{
if (await _plantService.ReadByPlantCode(_testPlantCode) is Plant plant)
return plant;
return await NewPlant(installationCode);
}

public async Task<Plant> NewPlant(string installationCode)
{
var createPlantQuery = new CreatePlantQuery
Expand All @@ -167,22 +150,6 @@ public async Task<Plant> NewPlant(string installationCode)
return await _plantService.Create(createPlantQuery);
}

public async Task<InspectionArea> ReadOrNewInspectionArea(
string installationCode,
string plantCode
)
{
if (
await _inspectionAreaService.ReadByInstallationAndName(
installationCode,
_testInspectionAreaName
)
is InspectionArea inspectionArea
)
return inspectionArea;
return await NewInspectionArea(installationCode, plantCode);
}

public async Task<InspectionArea> NewInspectionArea(
string installationCode,
string plantCode,
Expand All @@ -202,20 +169,6 @@ public async Task<InspectionArea> NewInspectionArea(
return await _inspectionAreaService.Create(createInspectionAreaQuery);
}

public async Task<Area> 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<Area> NewArea(
string installationCode,
string plantCode,
Expand Down
6 changes: 3 additions & 3 deletions backend/api.test/EventHandlers/TestMissionEventHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand Down
6 changes: 3 additions & 3 deletions backend/api.test/Services/MissionService.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
Expand Down

0 comments on commit 3d0ab6c

Please sign in to comment.