Skip to content

Commit f5108a3

Browse files
cpovirkGoogle Java Core Libraries
authored andcommitted
Use some static imports.
RELNOTES=n/a PiperOrigin-RevId: 687381111
1 parent b045bf3 commit f5108a3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+554
-572
lines changed

android/guava-tests/test/com/google/common/cache/CacheBuilderGwtTest.java

Lines changed: 37 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717
package com.google.common.cache;
1818

19+
import static java.util.concurrent.TimeUnit.MILLISECONDS;
20+
1921
import com.google.common.annotations.GwtCompatible;
2022
import com.google.common.collect.ImmutableList;
2123
import com.google.common.collect.ImmutableMap;
@@ -29,7 +31,6 @@
2931
import java.util.concurrent.Callable;
3032
import java.util.concurrent.ConcurrentMap;
3133
import java.util.concurrent.ExecutionException;
32-
import java.util.concurrent.TimeUnit;
3334
import junit.framework.TestCase;
3435

3536
/**
@@ -130,79 +131,73 @@ public Integer load(Integer key) throws Exception {
130131

131132
public void testExpireAfterAccess() {
132133
final Cache<Integer, Integer> cache =
133-
CacheBuilder.newBuilder()
134-
.expireAfterAccess(1000, TimeUnit.MILLISECONDS)
135-
.ticker(fakeTicker)
136-
.build();
134+
CacheBuilder.newBuilder().expireAfterAccess(1000, MILLISECONDS).ticker(fakeTicker).build();
137135

138136
cache.put(0, 10);
139137
cache.put(2, 30);
140138

141-
fakeTicker.advance(999, TimeUnit.MILLISECONDS);
139+
fakeTicker.advance(999, MILLISECONDS);
142140
assertEquals(Integer.valueOf(30), cache.getIfPresent(2));
143-
fakeTicker.advance(1, TimeUnit.MILLISECONDS);
141+
fakeTicker.advance(1, MILLISECONDS);
144142
assertEquals(Integer.valueOf(30), cache.getIfPresent(2));
145-
fakeTicker.advance(1000, TimeUnit.MILLISECONDS);
143+
fakeTicker.advance(1000, MILLISECONDS);
146144
assertEquals(null, cache.getIfPresent(0));
147145
}
148146

149147
public void testExpireAfterWrite() {
150148
final Cache<Integer, Integer> cache =
151-
CacheBuilder.newBuilder()
152-
.expireAfterWrite(1000, TimeUnit.MILLISECONDS)
153-
.ticker(fakeTicker)
154-
.build();
149+
CacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).ticker(fakeTicker).build();
155150

156151
cache.put(10, 100);
157152
cache.put(20, 200);
158153
cache.put(4, 2);
159154

160-
fakeTicker.advance(999, TimeUnit.MILLISECONDS);
155+
fakeTicker.advance(999, MILLISECONDS);
161156
assertEquals(Integer.valueOf(100), cache.getIfPresent(10));
162157
assertEquals(Integer.valueOf(200), cache.getIfPresent(20));
163158
assertEquals(Integer.valueOf(2), cache.getIfPresent(4));
164159

165-
fakeTicker.advance(2, TimeUnit.MILLISECONDS);
160+
fakeTicker.advance(2, MILLISECONDS);
166161
assertEquals(null, cache.getIfPresent(10));
167162
assertEquals(null, cache.getIfPresent(20));
168163
assertEquals(null, cache.getIfPresent(4));
169164

170165
cache.put(10, 20);
171166
assertEquals(Integer.valueOf(20), cache.getIfPresent(10));
172167

173-
fakeTicker.advance(1000, TimeUnit.MILLISECONDS);
168+
fakeTicker.advance(1000, MILLISECONDS);
174169
assertEquals(null, cache.getIfPresent(10));
175170
}
176171

177172
public void testExpireAfterWriteAndAccess() {
178173
final Cache<Integer, Integer> cache =
179174
CacheBuilder.newBuilder()
180-
.expireAfterWrite(1000, TimeUnit.MILLISECONDS)
181-
.expireAfterAccess(500, TimeUnit.MILLISECONDS)
175+
.expireAfterWrite(1000, MILLISECONDS)
176+
.expireAfterAccess(500, MILLISECONDS)
182177
.ticker(fakeTicker)
183178
.build();
184179

185180
cache.put(10, 100);
186181
cache.put(20, 200);
187182
cache.put(4, 2);
188183

189-
fakeTicker.advance(499, TimeUnit.MILLISECONDS);
184+
fakeTicker.advance(499, MILLISECONDS);
190185
assertEquals(Integer.valueOf(100), cache.getIfPresent(10));
191186
assertEquals(Integer.valueOf(200), cache.getIfPresent(20));
192187

193-
fakeTicker.advance(2, TimeUnit.MILLISECONDS);
188+
fakeTicker.advance(2, MILLISECONDS);
194189
assertEquals(Integer.valueOf(100), cache.getIfPresent(10));
195190
assertEquals(Integer.valueOf(200), cache.getIfPresent(20));
196191
assertEquals(null, cache.getIfPresent(4));
197192

198-
fakeTicker.advance(499, TimeUnit.MILLISECONDS);
193+
fakeTicker.advance(499, MILLISECONDS);
199194
assertEquals(null, cache.getIfPresent(10));
200195
assertEquals(null, cache.getIfPresent(20));
201196

202197
cache.put(10, 20);
203198
assertEquals(Integer.valueOf(20), cache.getIfPresent(10));
204199

205-
fakeTicker.advance(500, TimeUnit.MILLISECONDS);
200+
fakeTicker.advance(500, MILLISECONDS);
206201
assertEquals(null, cache.getIfPresent(10));
207202
}
208203

@@ -276,7 +271,7 @@ public void onRemoval(RemovalNotification<Integer, Integer> notification) {
276271

277272
Cache<Integer, Integer> cache =
278273
CacheBuilder.newBuilder()
279-
.expireAfterWrite(1000, TimeUnit.MILLISECONDS)
274+
.expireAfterWrite(1000, MILLISECONDS)
280275
.removalListener(countingListener)
281276
.ticker(fakeTicker)
282277
.maximumSize(2)
@@ -296,7 +291,7 @@ public void onRemoval(RemovalNotification<Integer, Integer> notification) {
296291
cache.put(56, 4);
297292

298293
// Expire the two present elements.
299-
fakeTicker.advance(1001, TimeUnit.MILLISECONDS);
294+
fakeTicker.advance(1001, MILLISECONDS);
300295

301296
cache.getIfPresent(23);
302297
cache.getIfPresent(56);
@@ -371,17 +366,14 @@ public void testInvalidateAll() {
371366

372367
public void testAsMap_containsValue() {
373368
Cache<Integer, Integer> cache =
374-
CacheBuilder.newBuilder()
375-
.expireAfterWrite(20000, TimeUnit.MILLISECONDS)
376-
.ticker(fakeTicker)
377-
.build();
369+
CacheBuilder.newBuilder().expireAfterWrite(20000, MILLISECONDS).ticker(fakeTicker).build();
378370

379371
cache.put(654, 2675);
380-
fakeTicker.advance(10000, TimeUnit.MILLISECONDS);
372+
fakeTicker.advance(10000, MILLISECONDS);
381373
cache.put(2456, 56);
382374
cache.put(2, 15);
383375

384-
fakeTicker.advance(10001, TimeUnit.MILLISECONDS);
376+
fakeTicker.advance(10001, MILLISECONDS);
385377

386378
assertTrue(cache.asMap().containsValue(15));
387379
assertTrue(cache.asMap().containsValue(56));
@@ -390,17 +382,14 @@ public void testAsMap_containsValue() {
390382

391383
public void testAsMap_containsKey() {
392384
Cache<Integer, Integer> cache =
393-
CacheBuilder.newBuilder()
394-
.expireAfterWrite(20000, TimeUnit.MILLISECONDS)
395-
.ticker(fakeTicker)
396-
.build();
385+
CacheBuilder.newBuilder().expireAfterWrite(20000, MILLISECONDS).ticker(fakeTicker).build();
397386

398387
cache.put(654, 2675);
399-
fakeTicker.advance(10000, TimeUnit.MILLISECONDS);
388+
fakeTicker.advance(10000, MILLISECONDS);
400389
cache.put(2456, 56);
401390
cache.put(2, 15);
402391

403-
fakeTicker.advance(10001, TimeUnit.MILLISECONDS);
392+
fakeTicker.advance(10001, MILLISECONDS);
404393

405394
assertTrue(cache.asMap().containsKey(2));
406395
assertTrue(cache.asMap().containsKey(2456));
@@ -409,17 +398,14 @@ public void testAsMap_containsKey() {
409398

410399
public void testAsMapValues_contains() {
411400
Cache<Integer, Integer> cache =
412-
CacheBuilder.newBuilder()
413-
.expireAfterWrite(1000, TimeUnit.MILLISECONDS)
414-
.ticker(fakeTicker)
415-
.build();
401+
CacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).ticker(fakeTicker).build();
416402

417403
cache.put(10, 20);
418-
fakeTicker.advance(500, TimeUnit.MILLISECONDS);
404+
fakeTicker.advance(500, MILLISECONDS);
419405
cache.put(20, 22);
420406
cache.put(5, 10);
421407

422-
fakeTicker.advance(501, TimeUnit.MILLISECONDS);
408+
fakeTicker.advance(501, MILLISECONDS);
423409

424410
assertTrue(cache.asMap().values().contains(22));
425411
assertTrue(cache.asMap().values().contains(10));
@@ -428,17 +414,14 @@ public void testAsMapValues_contains() {
428414

429415
public void testAsMapKeySet() {
430416
Cache<Integer, Integer> cache =
431-
CacheBuilder.newBuilder()
432-
.expireAfterWrite(1000, TimeUnit.MILLISECONDS)
433-
.ticker(fakeTicker)
434-
.build();
417+
CacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).ticker(fakeTicker).build();
435418

436419
cache.put(10, 20);
437-
fakeTicker.advance(500, TimeUnit.MILLISECONDS);
420+
fakeTicker.advance(500, MILLISECONDS);
438421
cache.put(20, 22);
439422
cache.put(5, 10);
440423

441-
fakeTicker.advance(501, TimeUnit.MILLISECONDS);
424+
fakeTicker.advance(501, MILLISECONDS);
442425

443426
Set<Integer> foundKeys = new HashSet<>(cache.asMap().keySet());
444427

@@ -447,17 +430,14 @@ public void testAsMapKeySet() {
447430

448431
public void testAsMapKeySet_contains() {
449432
Cache<Integer, Integer> cache =
450-
CacheBuilder.newBuilder()
451-
.expireAfterWrite(1000, TimeUnit.MILLISECONDS)
452-
.ticker(fakeTicker)
453-
.build();
433+
CacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).ticker(fakeTicker).build();
454434

455435
cache.put(10, 20);
456-
fakeTicker.advance(500, TimeUnit.MILLISECONDS);
436+
fakeTicker.advance(500, MILLISECONDS);
457437
cache.put(20, 22);
458438
cache.put(5, 10);
459439

460-
fakeTicker.advance(501, TimeUnit.MILLISECONDS);
440+
fakeTicker.advance(501, MILLISECONDS);
461441

462442
assertTrue(cache.asMap().keySet().contains(20));
463443
assertTrue(cache.asMap().keySet().contains(5));
@@ -466,17 +446,14 @@ public void testAsMapKeySet_contains() {
466446

467447
public void testAsMapEntrySet() {
468448
Cache<Integer, Integer> cache =
469-
CacheBuilder.newBuilder()
470-
.expireAfterWrite(1000, TimeUnit.MILLISECONDS)
471-
.ticker(fakeTicker)
472-
.build();
449+
CacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).ticker(fakeTicker).build();
473450

474451
cache.put(10, 20);
475-
fakeTicker.advance(500, TimeUnit.MILLISECONDS);
452+
fakeTicker.advance(500, MILLISECONDS);
476453
cache.put(20, 22);
477454
cache.put(5, 10);
478455

479-
fakeTicker.advance(501, TimeUnit.MILLISECONDS);
456+
fakeTicker.advance(501, MILLISECONDS);
480457

481458
int sum = 0;
482459
for (Entry<Integer, Integer> current : cache.asMap().entrySet()) {
@@ -487,10 +464,7 @@ public void testAsMapEntrySet() {
487464

488465
public void testAsMapValues_iteratorRemove() {
489466
Cache<Integer, Integer> cache =
490-
CacheBuilder.newBuilder()
491-
.expireAfterWrite(1000, TimeUnit.MILLISECONDS)
492-
.ticker(fakeTicker)
493-
.build();
467+
CacheBuilder.newBuilder().expireAfterWrite(1000, MILLISECONDS).ticker(fakeTicker).build();
494468

495469
cache.put(10, 20);
496470
Iterator<Integer> iterator = cache.asMap().values().iterator();

0 commit comments

Comments
 (0)