Skip to content

Issues 53961 and 53975: Update label of MetricUnit to Display Units and update error messaging for missing amount or units #2705

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-susanh merged 5 commits into from
Sep 26, 2025
Merged

Issues 53961 and 53975: Update label of MetricUnit to Display Units and update error messaging for missing amount or units #2705

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b92ee90
Issue 53961: Update label of MetricUnit to Display Units
labkey-susanh Sep 24, 2025
58f5c67
Issue 53975: Update error messaging for missing amounts and units
labkey-susanh Sep 25, 2025
fe1db78
Merge remote-tracking branch 'origin/develop' into fb_miscAmountsAndU…
labkey-susanh Sep 25, 2025
d532b6a
Add sample type name to incompatible units messaging
labkey-susanh Sep 25, 2025
7210482
Merge remote-tracking branch 'origin/develop' into fb_miscAmountsAndU…
labkey-susanh Sep 26, 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
14 changes: 7 additions & 7 deletions src/org/labkey/test/tests/SampleTypeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1885,10 +1885,10 @@ public void testAmountsAndUnitsWithDisplayUnit()

log("verify error when inserting a row with incompatible units");
sampleHelper.insertRow(Map.of("Name", "AU-ERR-1", "StoredAmount", "5.0", "Units", "mg"));
assertTextPresent("Units value (mg) is not compatible with the display units (mL).");
assertTextPresent("Units value (mg) is not compatible with the " + sampleTypeName + " display units (mL).");
clickButton("Cancel");
sampleHelper.insertRow(Map.of("Name", "AU-ERR-1", "StoredAmount", "5.0", "Units", "unit"));
assertTextPresent("Units value (unit) is not compatible with the display units (mL).");
assertTextPresent("Units value (unit) is not compatible with the " + sampleTypeName + " display units (mL).");
clickButton("Cancel");

log("verify inserting a row with compatible units succeeds and are converted");
Expand All @@ -1901,7 +1901,7 @@ public void testAmountsAndUnitsWithDisplayUnit()

log("verify updating a row with incompatible units fails");
sampleHelper.updateRow(0, Map.of("Units", "mg"));
assertTextPresent("Units value (mg) is not compatible with the display units (mL).");
assertTextPresent("Units value (mg) is not compatible with the " + sampleTypeName + " display units (mL).");
clickButton("Cancel");

log("verify updating a row with compatible units succeeds and are converted");
Expand All @@ -1914,7 +1914,7 @@ public void testAmountsAndUnitsWithDisplayUnit()

log("verify bulk import with incompatible units fails");
sampleHelper.bulkImportExpectingError(List.of(Map.of("Name", "AU-BULK-ERR-1", "StoredAmount", "0", "Units", "kg")), SampleTypeHelper.IMPORT_OPTION);
assertTextPresent("Units value (kg) is not compatible with the display units (mL).");
assertTextPresent("Units value (kg) is not compatible with the " + sampleTypeName + " display units (mL).");
clickButton("Cancel");

log("verify bulk import with compatible units succeeds and are converted");
Expand Down Expand Up @@ -1948,7 +1948,7 @@ public void testAmountsAndUnitsWithoutDisplayUnit()
CreateSampleTypePage createPage = sampleHelper
.goToCreateNewSampleType()
.setName(sampleTypeName);
assertTextNotPresent("Amount Display Units");
assertTextNotPresent("Display Units");
createPage.clickSave();
sampleHelper.goToSampleType(sampleTypeName);

Expand Down Expand Up @@ -1981,11 +1981,11 @@ public void testAmountsAndUnitsWithoutDisplayUnit()
log("verify that bulk import with an amount or unit requires both fields to be filled in");
// bulk import with amount but not unit (error expected)
sampleHelper.bulkImportExpectingError(List.of(Map.of("Name", "AU-BULK-ERR-1", "StoredAmount", "0")), SampleTypeHelper.IMPORT_OPTION);
assertTextPresent("When adding or updating samples, a Units value must be provided when there is a value for Amount.");
assertTextPresent("A Units value must be provided when Amounts are provided");
clickButton("Cancel");
// bulk import with unit but not amount (error expected)
sampleHelper.bulkImportExpectingError(List.of(Map.of("Name", "AU-BULK-ERR-2", "Units", "mL")), SampleTypeHelper.IMPORT_OPTION);
assertTextPresent("When adding or updating samples, a Amount value must be provided when there is a value for Units.");
assertTextPresent("An Amount value must be provided Units are provided.");
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")));
Expand Down