Merge branch 'develop' into fb_chris_misc_issues

Author: labkey-chrisj

src/org/labkey/test/BaseWebDriverTest.java

@@ -226,7 +226,6 @@ public abstract class BaseWebDriverTest extends LabKeySiteWrapper implements Cle
     public static final String TRICKY_CHARACTERS = "><&/%\\' \"1\u00E4\u00F6\u00FC\u00C5";
     public static final String TRICKY_CHARACTERS_NO_QUOTES = "></% 1\u00E4\u00F6\u00FC\u00C5";
     public static final String TRICKY_CHARACTERS_FOR_PROJECT_NAMES = "\u2603~!@$&()_+{}-=[],.#\u00E4\u00F6\u00FC\u00C5"; // No slash or space
-    // TODO using </script> breaks CustomizeViewTest because of the '/'
     public static final String INJECT_CHARS_1 = Crawler.injectScriptBlock;
     public static final String INJECT_CHARS_2 = Crawler.injectAttributeScript;
 

src/org/labkey/test/tests/list/ListTest.java

@@ -801,13 +801,13 @@ public void testCustomViews()
     /* Issue 23487: add regression coverage for batch insert into list with multiple errors
     */
     @Test
-    public void testBatchInsertErrors() throws IOException, CommandException
+    public void testBatchInsertErrors()
     {
         // create the list for this case
         String multiErrorListName = "multiErrorBatchList";
         String[] expectedErrors = new String[]{
             getConversionErrorMessage("green", "ShouldInsertCorrectly", Boolean.class),
-            getConversionErrorMessage("five", "Id", Integer.class) + "; Missing value for required property: Id"
+            getConversionErrorMessage("five", "Id", Integer.class)
         };
 
         createList(multiErrorListName, BatchListColumns, BatchListData);

src/org/labkey/test/util/AuditLogHelper.java

@@ -249,7 +249,7 @@ public boolean validateDetailAuditLog(DetailedAuditEventRow expectedAuditDetail,
                 if (StringUtils.isEmpty(expectedValue) && actualValue == null)
                     continue;
 
-                if (!expectedValue.equals(actualValue))
+                if (!expectedValue.equalsIgnoreCase(actualValue))
                 {
                     pass = false;
                     TestLogger.log(prop + " is not as expected. Expected: " + expectedValue + ", Actual: " + actualValue);

src/org/labkey/test/util/TestDataGenerator.java

@@ -72,9 +72,9 @@
  */
 public class TestDataGenerator
 {
-    private static final String WIDE_CHAR = "👾";
-    private static final char WIDE_PLACEHOLDER = 'Π'; // Wide character can't be picked from the string with 'charAt'
-    private static final String NON_LATIN_STRING = "и안は";
+    private static final String WIDE_CHAR = "\uD83D\uDC7E"; // 👾
+    private static final char WIDE_PLACEHOLDER = '\u03A0'; // 'Π' - Wide character can't be picked from the string with 'charAt'
+    private static final String NON_LATIN_STRING = "\u0438\uC548\u306F"; // "и안は"
     // chose a Character random from this String
     public static final String CHARSET_STRING = "ABCDEFG01234abcdefvxyz~!@#$%^&*()-+=_{}[]|:;\"',.<>" + NON_LATIN_STRING + WIDE_PLACEHOLDER;
     public static final String ALPHANUMERIC_STRING = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvxyz";