Skip to content

Scope NIRC EHR report assertions to the animal under test #766

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-martyp merged 2 commits into from
Sep 20, 2026
Merged

Scope NIRC EHR report assertions to the animal under test #766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4db9406
Scope NIRC report assertions to the animal under test
labkey-martyp Sep 17, 2026
8beb5ea
Scope the clinical observation case check to its animal
labkey-martyp Sep 17, 2026
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
9 changes: 9 additions & 0 deletions nirc_ehr/test/src/org.labkey.test/tests.nirc_ehr/NIRC_EHRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,8 @@ public void testClinicalObservation()
goToEHRFolder();
waitAndClickAndWait(Locator.linkWithText("Active Clinical Cases"));
DataRegionTable activeClinicalCases = new AnimalHistoryPage<>(getDriver()).getActiveReportDataRegion();
// Other tests leave their cases open, so row 0 is this animal's case only once the report is scoped to it
activeClinicalCases.setFilter("Id", "Equals", animalId);
activeClinicalCases.link(0, "caseCheck").click();
switchToWindow(2);

Expand Down Expand Up @@ -1619,6 +1621,8 @@ public void testClinicalCasesWorkflow()
waitAndClickAndWait(Locator.linkWithText("Today's Medication/Treatment Schedule"));
AnimalHistoryPage<?> animalHistoryPage = new AnimalHistoryPage<>(getDriver());
DataRegionTable scheduleTable = animalHistoryPage.getActiveReportDataRegion();
// The schedule covers every living animal in the folder, so any other test's active order lands here too
scheduleTable.setFilter("Id", "Equals", animalId);
Assert.assertEquals("Incorrect number of rows", 4, scheduleTable.getDataRowCount());
scheduleTable.link(0, "treatmentRecord").click();
switchToWindow(1);
Expand All @@ -1640,6 +1644,8 @@ public void testClinicalCasesWorkflow()
//Click on 'Case Update' link
AnimalHistoryPage<?> historyPage = new AnimalHistoryPage<>(getDriver());
DataRegionTable activeClinicalCases = historyPage.getActiveReportDataRegion();
// Other tests leave their cases open, so row 0 is this animal's case only once the report is scoped to it
activeClinicalCases.setFilter("Id", "Equals", animalId);
activeClinicalCases.link(0, "caseCheck").click();
switchToWindow(2);

Expand Down Expand Up @@ -1670,6 +1676,7 @@ public void testClinicalCasesWorkflow()
//Verify that the case is no longer present/is closed
historyPage = new AnimalHistoryPage<>(getDriver());
activeClinicalCases = historyPage.getActiveReportDataRegion();
activeClinicalCases.setFilter("Id", "Equals", animalId);
Assert.assertEquals("No active cases", 0, activeClinicalCases.getDataRowCount());
stopImpersonating();
}
Expand Down Expand Up @@ -1783,6 +1790,8 @@ public void testBehavioralCases()
waitAndClickAndWait(Locator.linkWithText("Active Behavior Medication Orders"));
animalHistoryPage = new AnimalHistoryPage<>(getDriver());
DataRegionTable medicationOrderTable = animalHistoryPage.getActiveReportDataRegion();
// The report lists every active Behavior order in the folder, not just this case's
medicationOrderTable.setFilter("Id", "Equals", animalId1);
Assert.assertEquals("Medication order was not created for the behavioral case", 1, medicationOrderTable.getDataRowCount());
Assert.assertEquals("Incorrect medication order", Arrays.asList(animalId1, drug1, "QID", "IV", NIRC_VET_NAME),
medicationOrderTable.getRowDataAsText(0, "Id", "code", "frequency", "route", "orderedby"));
Expand Down
Loading