Skip to content

Commit fca2cd8

Browse files
committed
ListTest update for quoting the random field name in the tsv import string generation (use TestDataUtils.tsvStringFromRowMaps)
1 parent 76cca93 commit fca2cd8

1 file changed

Lines changed: 18 additions & 13 deletions

File tree

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

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
import org.labkey.test.util.PortalHelper;
6767
import org.labkey.test.util.TestDataGenerator;
6868
import org.labkey.test.util.TextSearcher;
69+
import org.labkey.test.util.data.TestDataUtils;
6970
import org.labkey.test.util.search.SearchAdminAPIHelper;
7071
import org.openqa.selenium.By;
7172
import org.openqa.selenium.WebElement;
@@ -2049,12 +2050,17 @@ String toTSV(List<FieldDefinition> cols, String[][] data)
20492050
}
20502051

20512052
void createList(String name, List<FieldDefinition> cols, String[][] data)
2053+
{
2054+
createList(name, cols, toTSV(cols,data));
2055+
}
2056+
2057+
void createList(String name, List<FieldDefinition> cols, String tsvData)
20522058
{
20532059
log("Add List -- " + name);
20542060
_listHelper.createList(PROJECT_VERIFY, name, cols.get(0), cols.subList(1, cols.size()).toArray(new FieldDefinition[cols.size() - 1]));
20552061
_listHelper.goToList(name);
20562062
_listHelper.clickImportData();
2057-
setListImportAsTestDataField(toTSV(cols,data));
2063+
setListImportAsTestDataField(tsvData);
20582064
}
20592065

20602066
private void setListImportAsTestDataField(String data, String... expectedErrors)
@@ -2164,21 +2170,20 @@ public void testDecimalFieldFiniteValues()
21642170
{
21652171
String listName = "DecimalFieldList";
21662172
FieldInfo decField = FieldInfo.random("decimalField", ColumnType.Decimal);
2167-
String[][] data = new String[][]
2168-
{
2169-
{"1", "1.1"},
2170-
{"2", "1.7976931348623157e+308"},
2171-
{"3", "-1.7976931348623157e+308"},
2172-
{"4", "Infinity"},
2173-
{"5", "-Infinity"},
2174-
{"6", "Inf"},
2175-
{"7", "-Inf"},
2176-
{"8", "NaN"}
2177-
};
2173+
List<Map<String, Object>> rowMaps = new ArrayList<>();
2174+
rowMaps.add(Map.of("key", 1, decField.getName(), "1.1"));
2175+
rowMaps.add(Map.of("key", 2, decField.getName(), "1.7976931348623157e+308"));
2176+
rowMaps.add(Map.of("key", 3, decField.getName(), "-1.7976931348623157e+308"));
2177+
rowMaps.add(Map.of("key", 4, decField.getName(), "Infinity"));
2178+
rowMaps.add(Map.of("key", 5, decField.getName(), "-Infinity"));
2179+
rowMaps.add(Map.of("key", 6, decField.getName(), "Inf"));
2180+
rowMaps.add(Map.of("key", 7, decField.getName(), "-Inf"));
2181+
rowMaps.add(Map.of("key", 8, decField.getName(), "NaN"));
2182+
21782183
createList(listName, List.of(
21792184
new FieldDefinition("key", ColumnType.Integer),
21802185
decField.getFieldDefinition()
2181-
), data);
2186+
), TestDataUtils.tsvStringFromRowMaps(rowMaps, List.of("key", decField.getName()), true));
21822187

21832188
DataRegionTable table = new DataRegionTable("query", getDriver());
21842189
checker().verifyEquals("Decimal field values not as expected",

0 commit comments

Comments
 (0)