Skip to content

Make the StopWatch more reliable for tracking nanos, adjust suspend test #1677

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
garydgregory merged 1 commit into from
May 25, 2026
+4 −4
Merged

Make the StopWatch more reliable for tracking nanos, adjust suspend test #1677

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
8 changes: 4 additions & 4 deletions src/test/java/org/apache/commons/lang3/time/StopWatchTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ private StopWatch createMockStopWatch(final long nanos) {
return set(watch, nanos);
}

private StopWatch set(final StopWatch watch, final long nanos) {
private StopWatch set(final StopWatch watch, final long elapsed) {
try {
final long currentNanos = System.nanoTime();
final List<StopWatch.Split> splits = new ArrayList<>();
splits.add(new StopWatch.Split(String.valueOf(0), Duration.ofNanos(nanos)));
FieldUtils.writeField(watch, "startTimeNanos", currentNanos - nanos, true);
splits.add(new StopWatch.Split(String.valueOf(0), Duration.ofNanos(elapsed)));
FieldUtils.writeField(watch, "startTimeNanos", currentNanos - elapsed, true);
FieldUtils.writeField(watch, "stopTimeNanos", currentNanos, true);
FieldUtils.writeField(watch, "splits", splits, true);
} catch (final IllegalAccessException e) {
Expand Down Expand Up @@ -488,9 +488,9 @@ void testSuspend() throws InterruptedException {
final Duration sleepDuration = MIN_DURATION;
final long sleepMillis = sleepDuration.toMillis();
sleepPlus1(sleepDuration);
watch.suspend();
final long testSuspendMillis = System.currentTimeMillis();
final long testSuspendNanos = System.nanoTime();
watch.suspend();
final long testSuspendTimeNanos = testSuspendNanos - testStartNanos;
// See sleepPlus1
final Duration testSuspendDuration = Duration.ofNanos(testSuspendTimeNanos).plusMillis(1);
Expand Down
Loading