Skip to content

Commit

Permalink
Use natural units for durations.
Browse files Browse the repository at this point in the history
PiperOrigin-RevId: 641920074
  • Loading branch information
cpovirk authored and Google Java Core Libraries committed Jun 10, 2024
1 parent 635571e commit 9ea6816
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
13 changes: 6 additions & 7 deletions guava-tests/test/com/google/common/cache/CacheBuilderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -275,10 +275,9 @@ public void testTimeToLive_setTwice() {
@GwtIncompatible // java.time.Duration
public void testTimeToLive_setTwice_duration() {
CacheBuilder<Object, Object> builder =
CacheBuilder.newBuilder().expireAfterWrite(java.time.Duration.ofSeconds(3600));
CacheBuilder.newBuilder().expireAfterWrite(java.time.Duration.ofHours(1));
assertThrows(
IllegalStateException.class,
() -> builder.expireAfterWrite(java.time.Duration.ofSeconds(3600)));
IllegalStateException.class, () -> builder.expireAfterWrite(java.time.Duration.ofHours(1)));
}

public void testTimeToIdle_negative() {
Expand Down Expand Up @@ -318,10 +317,10 @@ public void testTimeToIdle_setTwice() {
@GwtIncompatible // java.time.Duration
public void testTimeToIdle_setTwice_duration() {
CacheBuilder<Object, Object> builder =
CacheBuilder.newBuilder().expireAfterAccess(java.time.Duration.ofSeconds(3600));
CacheBuilder.newBuilder().expireAfterAccess(java.time.Duration.ofHours(1));
assertThrows(
IllegalStateException.class,
() -> builder.expireAfterAccess(java.time.Duration.ofSeconds(3600)));
() -> builder.expireAfterAccess(java.time.Duration.ofHours(1)));
}

@SuppressWarnings("ReturnValueIgnored")
Expand Down Expand Up @@ -356,10 +355,10 @@ public void testRefresh_setTwice() {
@GwtIncompatible // java.time.Duration
public void testRefresh_setTwice_duration() {
CacheBuilder<Object, Object> builder =
CacheBuilder.newBuilder().refreshAfterWrite(java.time.Duration.ofSeconds(3600));
CacheBuilder.newBuilder().refreshAfterWrite(java.time.Duration.ofHours(1));
assertThrows(
IllegalStateException.class,
() -> builder.refreshAfterWrite(java.time.Duration.ofSeconds(3600)));
() -> builder.refreshAfterWrite(java.time.Duration.ofHours(1)));
}

public void testTicker_setTwice() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ public void testTryAwaitTerminationUninterruptiblyDuration_failure() {
requestInterruptIn(500);
executor.execute(new SleepTask(10000));
executor.shutdown();
assertFalse(awaitTerminationUninterruptibly(executor, Duration.ofMillis(1000)));
assertFalse(awaitTerminationUninterruptibly(executor, Duration.ofSeconds(1)));
assertFalse(executor.isTerminated());
assertInterrupted();
}
Expand Down

0 comments on commit 9ea6816

Please sign in to comment.