Test fixes for change from quoted values to bold in error messages

Author: cnathe

src/org/labkey/test/LabKeySiteWrapper.java

@@ -1721,23 +1721,28 @@ protected void deletePipelineJob(@LoggedParam String jobDescription, @LoggedPara
 
     public String getConversionErrorMessage(Object value, String fieldName, Class<?> targetClass)
     {
-        return getConversionErrorMessage(value, fieldName, targetClass, true);
+        return getConversionErrorMessage(value, fieldName, targetClass, true, false);
     }
 
     // Note: Keep in sync with ConvertHelper.getStandardConversionErrorMessage()
     // Example: "Could not convert value '2.34' (Double) for Boolean field 'Medical History.Dep Diagnosed in Last 18 Months'"
-    public String getConversionErrorMessage(Object value, String fieldName, Class<?> targetClass, boolean useUSDateParsing)
+    public String getConversionErrorMessage(Object value, String fieldName, Class<?> targetClass, boolean useUSDateParsing, boolean removeSingleQuotes)
     {
+        String errorMessage;
         String fieldType = targetClass.getSimpleName();
 
         // Issue 50768: Need a better error message if date value is not in the expected format.
         if (fieldType.equalsIgnoreCase("date") || fieldType.equalsIgnoreCase("datetime") || fieldType.equalsIgnoreCase("timestamp"))
         {
             String parsingMode = useUSDateParsing ? "U.S. date parsing (MDY)" : "Non-U.S. date parsing (DMY)";
-            return value + " is not a valid " + fieldType + " for " + fieldName + " using " + parsingMode;
+            errorMessage = "'" + value + "' is not a valid " + fieldType + " for " + fieldName + " using " + parsingMode;
+        }
+        else
+        {
+            errorMessage = "Could not convert value '" + value + "' (" + value.getClass().getSimpleName() + ") for " + fieldType + " field '" + fieldName + "'";
         }
 
-        return "Could not convert value " + value + " (" + value.getClass().getSimpleName() + ") for " + fieldType + " field " + fieldName;
+        return removeSingleQuotes ? errorMessage.replace("'", "") : errorMessage;
     }
 
     private ProductKey getProductConfiguration() throws IOException, CommandException