Skip to content

Restore custom suppliers in TestDataGenerator #1976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-chrisj merged 3 commits into from
Jul 11, 2024
Merged

Restore custom suppliers in TestDataGenerator #1976

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b473ef
restore custom suppliers in TestDataGenerator
labkey-chrisj Jul 10, 2024
81981a1
Update src/org/labkey/test/util/TestDataGenerator.java
labkey-chrisj Jul 10, 2024
a68a5fa
refactor supplier list, cr feedback
labkey-chrisj Jul 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 19 additions & 20 deletions src/org/labkey/test/util/TestDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public class TestDataGenerator
private static final String ALPHANUMERIC_STRING = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvxyz";

private final Map<String, PropertyDescriptor> _columns = new CaseInsensitiveLinkedHashMap<>();
private final Map<String, Function<List<Map<String, Object>>, Object>> _dataSuppliers = new CaseInsensitiveHashMap<>();
private final Map<String, Supplier<Object>> _dataSuppliers = new CaseInsensitiveHashMap<>();
private final Set<String> _autoGeneratedFields = Collections.newSetFromMap(new CaseInsensitiveHashMap<>());
// Rows generated for next insert or TSV dump
private final List<Map<String, Object>> _rows = new ArrayList<>();
Expand Down Expand Up @@ -147,27 +147,21 @@ public TestDataGenerator withGeneratedRows(int desiredRowCount)
return this;
}

public TestDataGenerator addDataSupplier(String columnName, Function<List<Map<String, Object>>, Object> supplier)
{
_dataSuppliers.put(columnName, supplier);
return this;
}

public TestDataGenerator addDataSupplier(String columnName, Supplier<Object> supplier)
{
_dataSuppliers.put(columnName, ignored -> supplier.get());
_dataSuppliers.put(columnName, ()-> supplier.get());
return this;
}

public TestDataGenerator addIntSupplier(String columnName, int min, int max)
{
_dataSuppliers.put(columnName, ignored -> randomInt(min, max));
_dataSuppliers.put(columnName, ()-> randomInt(min, max));
return this;
}

public TestDataGenerator addStringSupplier(String columnName, int length)
{
_dataSuppliers.put(columnName, ignored -> randomString(length));
_dataSuppliers.put(columnName, ()-> randomString(length));
return this;
}

Expand Down Expand Up @@ -257,34 +251,39 @@ private Map<String, Object> generateRow()
final Map<String, Object> newRow = new CaseInsensitiveHashMap<>();
for (String columnName : _columns.keySet())
{
if (_autoGeneratedFields.contains(columnName) || _dataSuppliers.containsKey(columnName))
if (!_dataSuppliers.containsKey(columnName))
{
_dataSuppliers.put(columnName, getDefaultDataSupplier(_columns.get(columnName).getRangeURI()));
}
Comment on lines +254 to +257
Copy link
Copy Markdown
Member

@labkey-tchad labkey-tchad Jul 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sick Map trick 🛹

Suggested change
if (!_dataSuppliers.containsKey(columnName))
{
_dataSuppliers.put(columnName, getDefaultDataSupplier(_columns.get(columnName).getRangeURI()));
}
_dataSuppliers.computeIfAbsent(columnName, k -> getDefaultDataSupplier(_columns.get(columnName).getRangeURI()));

Copy link
Copy Markdown
Contributor Author

@labkey-chrisj labkey-chrisj Jul 10, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was excited to try this sick map trick, but unfortunately it didn't update the suppliers map; this meant that below the call to

_dataSuppliers.get(columnName).get();

...would fail because _dataSuppliers.get(columnName) would be null ☹️


if (_autoGeneratedFields.contains(columnName))
{
continue;
}
// Generate default values
Object columnValue = getDefaultDataSupplier(_columns.get(columnName).getRangeURI()).apply(_rows);
// Generate values
Object columnValue = _dataSuppliers.get(columnName).get();
newRow.put(columnName, columnValue);
}
return newRow;
}

private Function<List<Map<String, Object>>, Object> getDefaultDataSupplier(String columnType)
private Supplier<Object> getDefaultDataSupplier(String columnType)
{
switch (columnType.substring(columnType.indexOf('#') + 1).toLowerCase())
{
case "string":
return __ -> randomString(20);
return ()-> randomString(20);
case "int":
return __ -> randomInt(0, 20);
return ()-> randomInt(0, 20);
case "float":
return __ -> randomFloat(0, 20);
return ()-> randomFloat(0, 20);
case "double":
return __ -> randomDouble(0, 20);
return ()-> randomDouble(0, 20);
case "boolean":
return __ -> randomBoolean();
return ()-> randomBoolean();
case "date":
case "datetime":
return __ -> randomDateString(DateUtils.addWeeks(new Date(), -39), new Date());
return ()-> randomDateString(DateUtils.addWeeks(new Date(), -39), new Date());
default:
throw new IllegalArgumentException("ColumnType " + columnType + " isn't implemented yet");
}
Expand Down