Skip to content

Commit a59e451

Browse files
committed
Fix build after merge
1 parent ec5a887 commit a59e451

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class FieldKey implements CharSequence
2222
private final String _name;
2323
private final String _fieldKey;
2424

25-
protected FieldKey(String name)
25+
private FieldKey(String name)
2626
{
2727
_parent = null;
2828
_name = name;

src/org/labkey/test/util/TestDataGenerator.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,12 @@ private Supplier<Object> getDefaultDataSupplier(String columnType)
447447
case "date":
448448
case "datetime":
449449
return ()-> randomDateString(DateUtils.addWeeks(new Date(), -39), new Date());
450+
case "time":
451+
return ()->
452+
randomInt(0, 23) + ":" + // hour
453+
StringUtils.leftPad(String.valueOf(randomInt(0, 59)), 2, "0") + ":" + // minute
454+
StringUtils.leftPad(String.valueOf(randomInt(0, 59)), 2, "0") + "." + // second
455+
StringUtils.leftPad(String.valueOf(randomInt(0, 999)), 3, "0"); // millisecond
450456
default:
451457
throw new IllegalArgumentException("ColumnType " + columnType + " isn't implemented yet");
452458
}
@@ -663,11 +669,6 @@ public String getDataAsTsv()
663669
return TestDataUtils.stringFromRowMaps(_rows, getFieldsForFile(), true, CSVFormat.TDF);
664670
}
665671

666-
public String writeTsvContents(boolean includeHeaders)
667-
{
668-
return TestDataUtils.stringFromRowMaps(_rows, getFieldsForFile(), false, CSVFormat.TDF);
669-
}
670-
671672
public File writeGeneratedDataToExcel(String sheetName, String fileName) throws IOException
672673
{
673674
File file = new File(TestFileUtils.getTestTempDir(), fileName);

0 commit comments

Comments
 (0)