Skip to content

Update expected event counts for event that spans a weekend #1143

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-tchad merged 3 commits into from
Dec 5, 2025
Merged

Update expected event counts for event that spans a weekend #1143

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c75259
Update expected event count for event that spans a weekend
labkey-tchad Dec 4, 2025
3d7d1b0
Update other checks
labkey-tchad Dec 4, 2025
0a98e6d
Fix spacing
labkey-tchad Dec 4, 2025
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
16 changes: 13 additions & 3 deletions test/src/org/labkey/test/tests/targetedms/InstrumentSchedulingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@
import org.openqa.selenium.WebElement;

import java.io.IOException;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Expand Down Expand Up @@ -217,12 +220,19 @@ public void testSchedule() throws IOException, CommandException
assertTextPresent("When multiple payment methods are used, the percentages must add up to 100% (current total: 110%).");
setFormElement(percentInputs.get(0), "40");

AtomicBoolean twoDayReservationOverWeekend = new AtomicBoolean(false);
scheduleInstrument(yearMonth + "-06", false, () -> {
// Make it a two-day reservation
String originalEnd = getFormElement(END_DATE_TIME_FIELD.findElement(getDriver()));
try {
Calendar c = Calendar.getInstance();
c.setTime(new SimpleDateFormat(getCurrentDateFormatString()).parse(originalEnd));
twoDayReservationOverWeekend.set(c.get(Calendar.DAY_OF_WEEK) == Calendar.SATURDAY);
} catch (ParseException ignore) {}
setFormElement(END_DATE_TIME_FIELD.findElement(getDriver()), originalEnd.replace("-06T", "-07T"));
});
assertProjectEventCounts(1, 0);
// If an event spans a weekend, it will be represented by two separate event elements
assertProjectEventCounts(twoDayReservationOverWeekend.get() ? 2 : 1, 0);

impersonate(LAB_MEMBER_USER);
assertEquals("Wrong number of projects for " + LAB_MEMBER_USER,
Expand Down Expand Up @@ -282,10 +292,10 @@ public void testSchedule() throws IOException, CommandException
waitAndClickAndWait(Locator.linkWithText("All instrument calendar view"));
waitForText(INSTRUMENT_1, INSTRUMENT_2, INACTIVE_INSTRUMENT);

assertProjectEventCounts(5, 0);
assertProjectEventCounts(twoDayReservationOverWeekend.get() ? 6 : 5, 0);

selectOptionByText(Locator.id("projectFilter"), PROJECT_2);
assertProjectEventCounts(3, 2);
assertProjectEventCounts(twoDayReservationOverWeekend.get() ? 4 : 3, 2);

goToDashboard();
waitAndClickAndWait(Locator.linkWithText("Instrument billing report"));
Expand Down