Handle double spaces in ListLookupTest

Author: labkey-tchad

src/org/labkey/test/params/FieldInfo.java

@@ -37,7 +37,7 @@ private FieldInfo(FieldKey fieldKey, String label, ColumnType columnType, Consum
 
     public FieldInfo(String name, String label, ColumnType columnType)
     {
-        this(FieldKey.fromParts(name.trim()), label, columnType, null, null);
+        this(FieldKey.fromParts(name.trim()), label, columnType, null, name);
     }
 
     public FieldInfo(String name, String label)
@@ -60,8 +60,7 @@ public FieldInfo(String name)
      */
     public static FieldInfo random(String namePart, ColumnType columnType)
     {
-        FieldInfo field = new FieldInfo(FieldKey.fromParts(TestDataGenerator.randomFieldName(namePart)), null, columnType, null, namePart);
-        return field;
+        return new FieldInfo(FieldKey.fromParts(TestDataGenerator.randomFieldName(namePart)), null, columnType, null, namePart);
     }
 
     /**

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

@@ -26,6 +26,8 @@
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.labkey.test.params.FieldDefinition.labelFromName;
+import static org.labkey.test.util.TextUtils.normalizeSpace;
 
 // Issue 52098, Issue 49422
 @Category({Daily.class, Data.class, Hosting.class})
@@ -122,7 +124,8 @@ public void testWithoutValidatorOrAlternateKeys() throws IOException, CommandExc
         String error = importDataPage
                 .setText(bulkData)
                 .submitExpectingError();
-        checker().withScreenshot().verifyEquals("Error message for invalid primary key not as expected", "Could not convert value 'noneSuch' (String) for Integer field '" + lookFromLookupFieldName + "'", error);
+        checker().withScreenshot().verifyEquals("Error message for invalid primary key not as expected",
+                "Could not convert value 'noneSuch' (String) for Integer field '" + normalizeSpace(lookFromLookupFieldName) + "'", error);
     }
 
     @Test
@@ -168,7 +171,8 @@ public void testWithoutValidatorWithAlternateKeys() throws IOException, CommandE
                 .setText(bulkData)
                 .setImportLookupByAlternateKey(true)
                 .submitExpectingError();
-        checker().withScreenshot().verifyEquals("Error message after supplying invalid alternate key not as expected", "Value 'NotAValue' not found for field " + lookFromLookupFieldName + " in the current context.", error);
+        checker().withScreenshot().verifyEquals("Error message after supplying invalid alternate key not as expected",
+                "Value 'NotAValue' not found for field " + normalizeSpace(lookFromLookupFieldName) + " in the current context.", error);
     }
 
     @Test
@@ -196,13 +200,16 @@ public void testWithLookupValidatorWithoutAlternateKeys() throws IOException, Co
         String error = importDataPage
                 .setText(tsvFromColumn(List.of(lookFromLookupFieldName, "1000")))
                 .submitExpectingError();
-        checker().withScreenshot().verifyEquals("Error message for invalid primary key value not as expected", "Value '1000' was not present in lookup target 'lists." + lookToListName + "' for field '" + FieldDefinition.labelFromName(lookFromLookupFieldName) + "'", error);
+        checker().withScreenshot().verifyEquals("Error message for invalid primary key value not as expected",
+                "Value '1000' was not present in lookup target 'lists." + normalizeSpace(lookToListName)
+                        + "' for field '" + normalizeSpace(labelFromName(lookFromLookupFieldName)) + "'", error);
 
         log("With lookup validation on, import data and provide an invalid primary key of type string.");
         error = importDataPage
                 .setText(tsvFromColumn(List.of(lookFromLookupFieldName, "Look")))
                 .submitExpectingError();
-        checker().withScreenshot().verifyEquals("Error message for invalid primary key type not as expected", "Could not convert value 'Look' (String) for Integer field '" + lookFromLookupFieldName + "'", error);
+        checker().withScreenshot().verifyEquals("Error message for invalid primary key type not as expected",
+                "Could not convert value 'Look' (String) for Integer field '" + normalizeSpace(lookFromLookupFieldName) + "'", error);
     }
 
     @Test
@@ -246,14 +253,17 @@ public void testWithLookupValidatorAndAlternateKeys() throws IOException, Comman
                 .setText(bulkData)
                 .setImportLookupByAlternateKey(true)
                 .submitExpectingError();
-        checker().withScreenshot().verifyEquals("Error message for invalid string alternate key not as expected", "Value 'Invalid' not found for field " + lookFromLookupFieldName + " in the current context.", error);
+        checker().withScreenshot().verifyEquals("Error message for invalid string alternate key not as expected",
+                "Value 'Invalid' not found for field " + normalizeSpace(lookFromLookupFieldName) + " in the current context.", error);
 
         bulkData = tsvFromColumn(List.of(lookFromLookupFieldName, "1234"));
         error = importDataPage
                 .setText(bulkData)
                 .setImportLookupByAlternateKey(true)
                 .submitExpectingError();
-        checker().withScreenshot().verifyEquals("Error message for invalid number-like alternate key not as expected", "Value '1234' was not present in lookup target 'lists." + lookToListName + "' for field '" + FieldDefinition.labelFromName(lookFromLookupFieldName) + "'", error);
+        checker().withScreenshot().verifyEquals("Error message for invalid number-like alternate key not as expected",
+                "Value '1234' was not present in lookup target 'lists." + normalizeSpace(lookToListName)
+                        + "' for field '" + normalizeSpace(labelFromName(lookFromLookupFieldName)) + "'", error);
 
     }