GitHub Issue 947, 955 & 988

Author: XingY

src/org/labkey/test/components/domain/DomainFieldRow.java

@@ -790,6 +790,18 @@ public DomainFieldRow setTextChoiceValues(List<String> values)
         return addValuesDialog.clickApply();
     }
 
+    public String setTextChoiceValuesExpectingError(List<String> values)
+    {
+        WebElement button = Locator.tagWithClass("span", "container--action-button").withText("Add Values").findElement(this);
+        button.click();
+
+        TextChoiceValueDialog addValuesDialog = new TextChoiceValueDialog(this);
+        addValuesDialog.addValues(values);
+        String error = addValuesDialog.getError();
+        addValuesDialog.clickCancel();
+        return error;
+    }
+
     /**
      * Get the displayed list of allowed values a TextChoice field.
      *

src/org/labkey/test/components/domain/TextChoiceValueDialog.java

@@ -63,6 +63,18 @@ public String getValueCountText()
         return elementCache().valueCount.getText();
     }
 
+    /**
+     * Get the error message displayed in the dialog, if any.
+     *
+     * @return The error text, or null if no error is displayed.
+     */
+    public String getError()
+    {
+        WebElement error = Locator.tagWithClass("div", "domain-text-choices-error")
+                .findElementOrNull(this);
+        return error != null ? error.getText() : null;
+    }
+
     /**
      * Click the apply button.
      *