Skip to content

Remove joda time from test deps #218

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
MrCreosote merged 1 commit into from
Mar 3, 2026
Merged

Remove joda time from test deps #218

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,6 @@ dependencies {
exclude group: 'com.fasterxml.jackson.core' // don't upgrade yet, breaks tests
exclude group: 'net.java.dev.jna' // don't include in runtime path
}
testImplementation('joda-time:joda-time:2.2')
// needed for syslog4j. Used in java test modules and JsonServerServlet subclasses in tests
// but not in SDK code proper.
testImplementation('net.java.dev.jna:jna:3.4.0')
Expand Down
29 changes: 16 additions & 13 deletions src/test/java/us/kbase/test/sdk/callback/CallbackServerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
Expand All @@ -25,12 +24,14 @@
import java.util.Map;
import java.util.UUID;

import java.time.Instant;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder;

import org.apache.commons.io.FileUtils;
import org.ini4j.InvalidFileFormatException;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
import org.joda.time.format.DateTimeFormatterBuilder;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

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

private final static DateTimeFormatter DATE_PARSER =
new DateTimeFormatterBuilder()
.append(DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ss"))
.appendOptional(DateTimeFormat.forPattern(".SSS").getParser())
.append(DateTimeFormat.forPattern("Z"))
.appendPattern("yyyy-MM-dd'T'HH:mm:ss")
.optionalStart()
.appendPattern(".SSS")
.optionalEnd()
.appendPattern("XXX")
.toFormatter();

private final static DateTimeFormatter DATE_FORMATTER =
DateTimeFormat.forPattern("yyyy-MM-dd'T'HH:mm:ssZ").withZoneUTC();
DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX").withZone(ZoneOffset.UTC);

@BeforeAll
public static void beforeClass() throws Exception {
Expand Down Expand Up @@ -573,7 +576,7 @@ public void setProvenance() throws Exception {
.withMethod("amethod")
.withService("aservice")
.withServiceVer("0.0.2-dev")
.withTime(DATE_FORMATTER.print(new DateTime()))
.withTime(DATE_FORMATTER.format(Instant.now()))
.withMethodParams(Arrays.asList(new UObject(param1), new UObject(param2)))
.withInputWsObjects(wsobjs);

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