Skip to content

Commit 7ac0125

Browse files
committed
Remove joda time from test deps
1 parent 180d2c6 commit 7ac0125

2 files changed

Lines changed: 16 additions & 14 deletions

File tree

build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ dependencies {
340340
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
341341
exclude group: 'net.java.dev.jna' // don't include in runtime path
342342
}
343-
testImplementation('joda-time:joda-time:2.2')
344343
// needed for syslog4j. Used in java test modules and JsonServerServlet subclasses in tests
345344
// but not in SDK code proper.
346345
testImplementation('net.java.dev.jna:jna:3.4.0')

src/test/java/us/kbase/test/sdk/callback/CallbackServerTest.java

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import java.nio.file.Paths;
1717
import java.util.ArrayList;
1818
import java.util.Arrays;
19-
import java.util.Date;
2019
import java.util.HashMap;
2120
import java.util.HashSet;
2221
import java.util.Iterator;
@@ -25,12 +24,14 @@
2524
import java.util.Map;
2625
import java.util.UUID;
2726

27+
import java.time.Instant;
28+
import java.time.OffsetDateTime;
29+
import java.time.ZoneOffset;
30+
import java.time.format.DateTimeFormatter;
31+
import java.time.format.DateTimeFormatterBuilder;
32+
2833
import org.apache.commons.io.FileUtils;
2934
import org.ini4j.InvalidFileFormatException;
30-
import org.joda.time.DateTime;
31-
import org.joda.time.format.DateTimeFormat;
32-
import org.joda.time.format.DateTimeFormatter;
33-
import org.joda.time.format.DateTimeFormatterBuilder;
3435
import org.junit.jupiter.api.BeforeAll;
3536
import org.junit.jupiter.api.Test;
3637

@@ -82,13 +83,15 @@ public static ModuleVersionInfo getMVI(ModuleInfo mi, String release) {
8283

8384
private final static DateTimeFormatter DATE_PARSER =
8485
new DateTimeFormatterBuilder()
85-
.append(DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss"))
86-
.appendOptional(DateTimeFormat.forPattern(".SSS").getParser())
87-
.append(DateTimeFormat.forPattern("Z"))
86+
.appendPattern("yyyy-MM-dd'T'HH:mm:ss")
87+
.optionalStart()
88+
.appendPattern(".SSS")
89+
.optionalEnd()
90+
.appendPattern("XXX")
8891
.toFormatter();
89-
92+
9093
private final static DateTimeFormatter DATE_FORMATTER =
91-
DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ssZ").withZoneUTC();
94+
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX").withZone(ZoneOffset.UTC);
9295

9396
@BeforeAll
9497
public static void beforeClass() throws Exception {
@@ -573,7 +576,7 @@ public void setProvenance() throws Exception {
573576
.withMethod("amethod")
574577
.withService("aservice")
575578
.withServiceVer("0.0.2-dev")
576-
.withTime(DATE_FORMATTER.print(new DateTime()))
579+
.withTime(DATE_FORMATTER.format(Instant.now()))
577580
.withMethodParams(Arrays.asList(new UObject(param1), new UObject(param2)))
578581
.withInputWsObjects(wsobjs);
579582

@@ -740,8 +743,8 @@ private void checkProvenance(
740743
assertThat("number of provenance actions",
741744
prov.size(), is(1));
742745
ProvenanceAction pa = prov.get(0);
743-
long got = DATE_PARSER.parseDateTime(pa.getTime()).getMillis();
744-
long now = new Date().getTime();
746+
long got = OffsetDateTime.parse(pa.getTime(), DATE_PARSER).toInstant().toEpochMilli();
747+
long now = Instant.now().toEpochMilli();
745748
assertTrue(got < now, "got prov time < now ");
746749
assertTrue(got > now - (5 * 60 * 1000), "got prov time > now - 5m");
747750
assertThat("correct service", pa.getService(), is(moduleName));

0 commit comments

Comments
 (0)