Use applyExpectingError pattern

Author: labkey-jeckels

test/src/org/labkey/test/components/targetedms/PeptideSummaryWebPart.java

@@ -72,18 +72,17 @@ public String getEndDate()
         return elementCache().endDate.get();
     }
 
-    public PeptideSummaryWebPart apply(boolean wait)
+    public PeptideSummaryWebPart apply()
     {
-        if (wait)
-        {
-            doAndWaitForElementToRefresh(() -> elementCache().applyButton.findElement(this).click(),
-                    elementCache().heatmapLoc, getWrapper().defaultWaitForPage);
-        }
-        else
-        {
-            elementCache().applyButton.findElement(this).click();
-        }
+        doAndWaitForElementToRefresh(() -> elementCache().applyButton.findElement(this).click(),
+                elementCache().heatmapLoc, getWrapper().defaultWaitForPage);
+        return this;
+    }
 
+    public PeptideSummaryWebPart applyExpectingError(String error)
+    {
+        elementCache().applyButton.findElement(this).click();
+        getWrapper().assertTextPresent(error);
         return this;
     }
 

test/src/org/labkey/test/tests/targetedms/TargetedMSPeptideSummaryHeatmapTest.java

@@ -87,15 +87,13 @@ public void testHeatMapColorAndValues()
 
         log("Verify invalid date combos produce helpful errors");
         peptideSummaryHeatMap.setCustomDateRange("2013-08-15", "2013-08-01");
-        peptideSummaryHeatMap.apply(false);
-        assertTextPresent("Please choose a start date that is before the end date.");
+        peptideSummaryHeatMap.applyExpectingError("Please choose a start date that is before the end date.");
         peptideSummaryHeatMap.setCustomDateRange(null, "2013-08-01");
-        peptideSummaryHeatMap.apply(false);
-        assertTextPresent("Please select both start and end dates.");
+        peptideSummaryHeatMap.applyExpectingError("Please select both start and end dates.");
 
         log("Verify Custom date range");
         peptideSummaryHeatMap.setCustomDateRange("2013-08-01", "2013-08-15");
-        peptideSummaryHeatMap.apply(true);
+        peptideSummaryHeatMap.apply();
         verifyDataCustomRange(peptideSummaryHeatMap);
 
         log("Verify Custom -> standard -> custom toggling");