Skip to content

Commit bd66425

Browse files
committed
fixed the UTC encoding of the TimeEncoding.MAX_INSTANT
1 parent 6e83e5e commit bd66425

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

yamcs-core/src/main/java/org/yamcs/utils/TaiUtcConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private void caldateFromMjd(DateTimeComponents cd, long day) {
180180
private long caldateToMjd(DateTimeComponents dtc) {
181181
int y;
182182
int m;
183-
int d;
183+
long d;
184184

185185
d = dtc.day - 678882;
186186
m = dtc.month - 1;

yamcs-core/src/test/java/org/yamcs/utils/TimeEncodingTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,10 +240,11 @@ public void checkMaxInstantValue() {
240240
// Assert that TimeEncoding can encode/decode with MAX_INSTANT
241241
String sMax = TimeEncoding.toString(TimeEncoding.MAX_INSTANT);
242242
long decodedMax = TimeEncoding.parse(sMax);
243+
assertEquals(TimeEncoding.MAX_INSTANT, decodedMax);
244+
243245
String sRMax = TimeEncoding.toString(decodedMax);
244-
assertTrue(sMax.equals(sRMax));
246+
assertEquals(sMax, sRMax);
245247

246-
// Assert that TimeEncoding fails to encode/decode with MAX_INSTANT + 1
247248
assertEquals("+inf", TimeEncoding.toString(TimeEncoding.MAX_INSTANT + 1));
248249
}
249250
}

0 commit comments

Comments
 (0)