Skip to content
Merged
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/org/labkey/test/tests/SampleTypeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1963,7 +1963,7 @@ public void testAmountsAndUnitsWithoutDisplayUnit()
clickButton("Cancel");
// insert row with both amount and unit (success)
sampleHelper.insertRow(Map.of("Name", "AU-SUCCESS-1", "StoredAmount", "5.0", "Units", "mg"));
verifySampleAmountUnitValues("AU-SUCCESS-1", "5", "mg");
verifySampleAmountUnitValues("AU-SUCCESS-1", "5.0", "mg");

log("verify that updating a row with an amount or unit requires both fields to be filled in");
// update row with amount but not unit (error expected)
Expand All @@ -1989,7 +1989,7 @@ public void testAmountsAndUnitsWithoutDisplayUnit()
clickButton("Cancel");
// bulk import with both amount and unit (success expected)
sampleHelper.bulkImport(List.of(Map.of("Name", "AU-BULK-SUCCESS-1", "StoredAmount", "0", "Units", "L")));
verifySampleAmountUnitValues("AU-BULK-SUCCESS-1", "0", "L");
verifySampleAmountUnitValues("AU-BULK-SUCCESS-1", "0.0", "L");

log("verify the bulk import with RawAmount and RawUnits are ignored");
sampleHelper.bulkImport(List.of(Map.of("Name", "AU-BULK-SUCCESS-2", "RawAmount", "1000", "RawUnits", "kg")));
Expand Down