Skip to content

Update test to use "enddate" column name instead of bogus "end" field #177

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-jeckels merged 2 commits into from
May 5, 2021
Merged

Update test to use "enddate" column name instead of bogus "end" field #177

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c42ecd
A recently added trigger script is now validating there is an "enddat…
labkey-jeckels May 4, 2021
35eb8a8
Use corrected column name
labkey-jeckels May 4, 2021
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
30 changes: 22 additions & 8 deletions ehr/test/src/org/labkey/test/tests/onprc_ehr/ONPRC_EHRTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@
import java.util.Set;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;

@Category({CustomModules.class, EHR.class, ONPRC.class})
@BaseWebDriverTest.ClassTimeout(minutes = 60)
Expand Down Expand Up @@ -195,15 +196,28 @@ public void testAssignmentApi() throws Exception
projectSelect.addFilter(new Filter("protocol", protocolId));
final Integer projectId = (Integer)projectSelect.execute(getApiHelper().getConnection(), getContainerPath()).getRows().get(0).get("project");

// Try with a row that doesn't pass validation
Map<String, Object> protocolCountsRow = new HashMap<>();
protocolCountsRow.put("protocol", protocolId);
protocolCountsRow.put("species", "Cynomolgus");
protocolCountsRow.put("allowed", 2);
protocolCountsRow.put("start", prepareDate(new Date(), -10, 0));
try
{
InsertRowsCommand protocolCountsCommand = new InsertRowsCommand("ehr", "protocol_counts");
protocolCountsCommand.addRow(protocolCountsRow);
protocolCountsCommand.execute(getApiHelper().getConnection(), getContainerPath());
fail("Should have gotten an exception due to missing end date");
}
catch (CommandException e)
{
assertEquals("Wrong failure message", "ERROR: Must enter Start and End dates", e.getMessage());
}

// Then try again with the problem corrected
protocolCountsRow.put("enddate", prepareDate(new Date(), 370, 0));
InsertRowsCommand protocolCountsCommand = new InsertRowsCommand("ehr", "protocol_counts");
protocolCountsCommand.addRow(new HashMap<String, Object>(){
{
put("protocol", protocolId);
put("species", "Cynomolgus");
put("allowed", 2);
put("start", prepareDate(new Date(), -10, 0));
put("end", prepareDate(new Date(), 370, 0));
}});
protocolCountsCommand.addRow(protocolCountsRow);
protocolCountsCommand.execute(getApiHelper().getConnection(), getContainerPath());

//create assignment
Expand Down