|
66 | 66 | import org.labkey.test.util.PortalHelper; |
67 | 67 | import org.labkey.test.util.TestDataGenerator; |
68 | 68 | import org.labkey.test.util.TextSearcher; |
| 69 | +import org.labkey.test.util.data.TestDataUtils; |
69 | 70 | import org.labkey.test.util.search.SearchAdminAPIHelper; |
70 | 71 | import org.openqa.selenium.By; |
71 | 72 | import org.openqa.selenium.WebElement; |
@@ -2049,12 +2050,17 @@ String toTSV(List<FieldDefinition> cols, String[][] data) |
2049 | 2050 | } |
2050 | 2051 |
|
2051 | 2052 | 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) |
2052 | 2058 | { |
2053 | 2059 | log("Add List -- " + name); |
2054 | 2060 | _listHelper.createList(PROJECT_VERIFY, name, cols.get(0), cols.subList(1, cols.size()).toArray(new FieldDefinition[cols.size() - 1])); |
2055 | 2061 | _listHelper.goToList(name); |
2056 | 2062 | _listHelper.clickImportData(); |
2057 | | - setListImportAsTestDataField(toTSV(cols,data)); |
| 2063 | + setListImportAsTestDataField(tsvData); |
2058 | 2064 | } |
2059 | 2065 |
|
2060 | 2066 | private void setListImportAsTestDataField(String data, String... expectedErrors) |
@@ -2164,21 +2170,20 @@ public void testDecimalFieldFiniteValues() |
2164 | 2170 | { |
2165 | 2171 | String listName = "DecimalFieldList"; |
2166 | 2172 | 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 | + |
2178 | 2183 | createList(listName, List.of( |
2179 | 2184 | new FieldDefinition("key", ColumnType.Integer), |
2180 | 2185 | decField.getFieldDefinition() |
2181 | | - ), data); |
| 2186 | + ), TestDataUtils.tsvStringFromRowMaps(rowMaps, List.of("key", decField.getName()), true)); |
2182 | 2187 |
|
2183 | 2188 | DataRegionTable table = new DataRegionTable("query", getDriver()); |
2184 | 2189 | checker().verifyEquals("Decimal field values not as expected", |
|
0 commit comments