Merge branch 'develop' into fb_filePathIssues

Author: XingY

data/api/rlabkey-api-experiment.xml

@@ -285,7 +285,7 @@
             <![CDATA[
                 Rows via createAndLoad = 3
                 Rows via insert = 2
-                already exists
+                duplicate key
                 Rows via merge = 10
                 Has audit transaction id = TRUE
              ]]>

src/org/labkey/test/tests/FileAttachmentColumnTest.java

@@ -93,7 +93,9 @@ public class FileAttachmentColumnTest extends BaseWebDriverTest
     private final String RESULT_FILE_COL = "resultFile";
     private final String OTHER_RESULT_FILE_COL = "otherResultFile";
     private final String STUDY_DATASET_NAME = "ogreSpiteLevels";
-    private static final FieldInfo LIST_ATTACHMENT_FIELD = new FieldInfo(TestDataGenerator.randomFieldName("File / Attachment"), ColumnType.Attachment);
+    // Issue 53505: enable use of randomFieldName when issue is fixed
+    //private static final FieldInfo LIST_ATTACHMENT_FIELD = new FieldInfo(TestDataGenerator.randomFieldName("File / Attachment"), ColumnType.Attachment);
+    private static final FieldInfo LIST_ATTACHMENT_FIELD = new FieldInfo("File / Attachment", ColumnType.Attachment);
 
     @Override
     protected void doCleanup(boolean afterTest) throws TestTimeoutException

src/org/labkey/test/tests/InlineImagesListTest.java

@@ -33,6 +33,7 @@
 import org.labkey.test.params.FieldDefinition.ColumnType;
 import org.labkey.test.util.DataRegionExportHelper;
 import org.labkey.test.util.DataRegionTable;
+import org.labkey.test.util.DomainUtils;
 import org.labkey.test.util.ExcelHelper;
 import org.labkey.test.util.TestDataGenerator;
 import org.openqa.selenium.By;
@@ -47,21 +48,24 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.labkey.test.util.TestDataGenerator.ALL_CHARS_PLACEHOLDER;
+import static org.labkey.test.util.TestDataGenerator.REPEAT_PLACEHOLDER;
 
 @Category(Daily.class)
 @BaseWebDriverTest.ClassTimeout(minutes = 5)
 public class InlineImagesListTest extends BaseWebDriverTest
 {
-    protected final static String LIST_NAME = TestDataGenerator.randomDomainName("InlineImagesList");
-    protected final static String LIST_KEY_NAME = TestDataGenerator.randomFieldName("Key");
+    protected final static String LIST_NAME = TestDataGenerator.randomDomainName("InlineImagesList", DomainUtils.DomainKind.IntList);
+    // list key name has a smaller max length than other field names, so we use a constant numEndChars and exclude the repeat and all chars placeholders
+    protected final static String LIST_KEY_NAME = TestDataGenerator.randomFieldName("Key" + ALL_CHARS_PLACEHOLDER, 0, 5, "" + ALL_CHARS_PLACEHOLDER + REPEAT_PLACEHOLDER, DomainUtils.DomainKind.IntList);
     protected final static ColumnType LIST_KEY_TYPE = ColumnType.Integer;
 
-    protected final static String LIST_ATTACHMENT01_NAME = TestDataGenerator.randomFieldName("Attachment01");
-    protected final static String LIST_ATTACHMENT01_LABEL = TestDataGenerator.randomFieldName("Attachment Column 01");
+    protected final static String LIST_ATTACHMENT01_NAME = TestDataGenerator.randomFieldName("Attachment01", null, DomainUtils.DomainKind.IntList);
+    protected final static String LIST_ATTACHMENT01_LABEL = "Attachment Column 01";
     protected final static String LIST_ATTACHMENT01_DESC = "An 1st attachment column.";
 
-    protected final static String LIST_ATTACHMENT02_NAME = TestDataGenerator.randomFieldName("Attachment02");
-    protected final static String LIST_ATTACHMENT02_LABEL = TestDataGenerator.randomFieldName("Attachment Column 02");
+    protected final static String LIST_ATTACHMENT02_NAME = TestDataGenerator.randomFieldName("Attachment02", null, DomainUtils.DomainKind.IntList);
+    protected final static String LIST_ATTACHMENT02_LABEL = "Attachment Column 02";
     protected final static String LIST_ATTACHMENT02_DESC = "An 2nd attachment column.";
 
     protected final static ColumnType LIST_ATTACHMENT_TYPE = ColumnType.Attachment;

src/org/labkey/test/tests/SampleTypeTest.java

@@ -459,7 +459,7 @@ public void testImportTypeOptions()
         String overlap =  "Name1\tToBee\n";
         String newData = "Name2\tSee\n";
         setFormElement(Locator.name("text"), header + overlap + newData);
-        clickButton("Submit", "already exists");
+        clickButton("Submit", "duplicate key");
 
         log("Switch to 'Insert and Replace'");
         importDataPage.setCopyPasteMerge(true);
@@ -484,7 +484,7 @@ public void testImportTypeOptions()
         importDataPage = drt.clickImportBulkData();
         importDataPage.setFile(sampleData);
         final String errorText = importDataPage.submitExpectingError();
-        Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.contains("already exists"));
+        Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.contains("duplicate key"));
         // TODO: Regression check for Issue 44202: Ugly error when data import fails due to duplicate key
         // Assert.assertTrue("Wrong error when importing duplicate samples. " + errorText, errorText.length() < 100);
 

src/org/labkey/test/tests/TextChoiceSampleTypeTest.java

@@ -110,7 +110,7 @@ public void testTextChoiceInSampleTypeDesigner()
         expectedValues.add("A");
         expectedValues.add("\u00DC");
         expectedValues.add("|X|Y|Z|withPipeChars");
-        expectedValues.add("A string with spaces and backslash at end.\\");
+        expectedValues.add("A string with \"spaces\" and backslash at end.\\");
         expectedValues.add("B");
 
         // Identify a couple of TextChoice values that will be used in samples.
@@ -173,8 +173,8 @@ public void testTextChoiceInSampleTypeDesigner()
 
         samples.add(Map.of(textChoiceFieldName, valuesUsed.get(0), textField, ""));
         samples.add(Map.of(textChoiceFieldName, "", textField, expectedConvertedValues.get(0)));
-        samples.add(Map.of(textChoiceFieldName, "\"" + valuesUsed.get(1)+ "\"", textField, ""));
-        samples.add(Map.of(textChoiceFieldName, "\"" + valuesUsed.get(1) + "\"", textField, ""));
+        samples.add(Map.of(textChoiceFieldName, valuesUsed.get(1), textField, ""));
+        samples.add(Map.of(textChoiceFieldName, valuesUsed.get(1), textField, ""));
         samples.add(Map.of(textChoiceFieldName, "", textField, expectedConvertedValues.get(1)));
 
         sampleTypeHelper.bulkImport(samples);