Skip to content

Use helper function to extract epochMillis #135

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
merged 1 commit into from
Sep 19, 2017
Merged

Use helper function to extract epochMillis #135

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions quickfixj-core/src/test/java/quickfix/FieldMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,26 @@ public void testSetUtcTimeStampField() throws Exception {
FieldMap map = new Message();
LocalDateTime aDate = LocalDateTime.now();
map.setField(new UtcTimeStampField(EffectiveTime.FIELD, aDate, false));
assertEquals("milliseconds should not be preserved", aDate.toInstant(ZoneOffset.UTC).toEpochMilli() - (aDate.toInstant(ZoneOffset.UTC).toEpochMilli() % 1000),
map.getField(new EffectiveTime()).getValue().toInstant(ZoneOffset.UTC).toEpochMilli());
assertEquals("milliseconds should not be preserved", epochMilliOfLocalDate(aDate) - (epochMilliOfLocalDate(aDate) % 1000),
epochMilliOfLocalDate(map.getField(new EffectiveTime()).getValue()));

// now set it with preserving millis
map.setField(new UtcTimeStampField(EffectiveTime.FIELD, aDate, true));
assertEquals("milliseconds should be preserved", aDate.toInstant(ZoneOffset.UTC).toEpochMilli(),
map.getField(new EffectiveTime()).getValue().toInstant(ZoneOffset.UTC).toEpochMilli());
assertEquals("milliseconds should be preserved", epochMilliOfLocalDate(aDate),
epochMilliOfLocalDate(map.getField(new EffectiveTime()).getValue()));
}

public void testSetUtcTimeOnlyField() throws Exception {
FieldMap map = new Message();
LocalTime aDate = LocalTime.now();
map.setField(new UtcTimeOnlyField(MDEntryTime.FIELD, aDate, false));
assertEquals("milliseconds should not be preserved", UtcTimeOnlyConverter.convert(aDate, UtcTimestampPrecision.SECONDS),
UtcTimeOnlyConverter.convert(map.getField(new MDEntryTime()).getValue(), UtcTimestampPrecision.SECONDS));
UtcTimeOnlyConverter.convert(map.getField(new MDEntryTime()).getValue(), UtcTimestampPrecision.SECONDS));

// now set it with preserving millis
map.setField(new UtcTimeOnlyField(MDEntryTime.FIELD, aDate, true));
assertEquals("milliseconds should be preserved", UtcTimeOnlyConverter.convert(aDate, UtcTimestampPrecision.MILLIS),
UtcTimeOnlyConverter.convert(map.getField(new MDEntryTime()).getValue(), UtcTimestampPrecision.MILLIS));
UtcTimeOnlyConverter.convert(map.getField(new MDEntryTime()).getValue(), UtcTimestampPrecision.MILLIS));
}

/**
Expand All @@ -61,12 +61,12 @@ public void testSpecificFields() throws Exception {
FieldMap map = new Message();
LocalDateTime aDate = LocalDateTime.now();
map.setField(new EffectiveTime(aDate));
assertEquals("milliseconds should be preserved", aDate.toInstant(ZoneOffset.UTC).toEpochMilli(),
map.getField(new EffectiveTime()).getValue().toInstant(ZoneOffset.UTC).toEpochMilli());
assertEquals("milliseconds should be preserved", epochMilliOfLocalDate(aDate),
epochMilliOfLocalDate(map.getField(new EffectiveTime()).getValue()));
LocalTime aTime = LocalTime.now();
map.setField(new MDEntryTime(aTime));
assertEquals("milliseconds should be preserved", UtcTimeOnlyConverter.convert(aTime, UtcTimestampPrecision.MILLIS),
UtcTimeOnlyConverter.convert(map.getField(new MDEntryTime()).getValue(), UtcTimestampPrecision.MILLIS));
UtcTimeOnlyConverter.convert(map.getField(new MDEntryTime()).getValue(), UtcTimestampPrecision.MILLIS));
}

private void testOrdering(int[] vals, int[] order, int[] expected) {
Expand All @@ -90,4 +90,8 @@ public void testOrdering() {
testOrdering(new int[] { 1, 2, 3 }, new int[] { 3, 1 }, new int[] { 3, 1, 2 });
testOrdering(new int[] { 3, 2, 1 }, new int[] { 3, 1 }, new int[] { 3, 1, 2 });
}

private long epochMilliOfLocalDate(LocalDateTime localDateTime) {
return localDateTime.toInstant(ZoneOffset.UTC).toEpochMilli();
}
}