|
15 | 15 |
|
16 | 16 | package software.amazon.awssdk.utils.cache; |
17 | 17 |
|
18 | | -import static org.junit.Assert.assertEquals; |
19 | | -import static org.junit.Assert.assertNull; |
20 | | -import static org.junit.Assert.assertTrue; |
| 18 | +import static org.junit.jupiter.api.Assertions.assertEquals; |
| 19 | +import static org.junit.jupiter.api.Assertions.assertNull; |
| 20 | +import static org.junit.jupiter.api.Assertions.assertThrows; |
21 | 21 |
|
22 | | -import org.junit.Test; |
| 22 | +import org.junit.jupiter.api.Test; |
23 | 23 |
|
24 | 24 | public class FifoCacheTest { |
25 | 25 |
|
26 | 26 | @Test |
27 | 27 | public void test() { |
28 | | - FifoCache<String> cache = new FifoCache<String>(3); |
29 | | - assertTrue(cache.size() == 0); |
| 28 | + FifoCache<String> cache = new FifoCache<>(3); |
| 29 | + assertEquals(0, cache.size()); |
30 | 30 | cache.add("k1", "v1"); |
31 | | - assertTrue(cache.size() == 1); |
| 31 | + assertEquals(1, cache.size()); |
32 | 32 | cache.add("k1", "v11"); |
33 | | - assertTrue(cache.size() == 1); |
| 33 | + assertEquals(1, cache.size()); |
34 | 34 | cache.add("k2", "v2"); |
35 | | - assertTrue(cache.size() == 2); |
| 35 | + assertEquals(2, cache.size()); |
36 | 36 | cache.add("k3", "v3"); |
37 | | - assertTrue(cache.size() == 3); |
| 37 | + assertEquals(3, cache.size()); |
38 | 38 | assertEquals("v11", cache.get("k1")); |
39 | 39 | assertEquals("v2", cache.get("k2")); |
40 | 40 | assertEquals("v3", cache.get("k3")); |
41 | 41 | cache.add("k4", "v4"); |
42 | | - assertTrue(cache.size() == 3); |
| 42 | + assertEquals(3, cache.size()); |
43 | 43 | assertNull(cache.get("k1")); |
44 | 44 | } |
45 | 45 |
|
46 | | - @Test(expected = IllegalArgumentException.class) |
| 46 | + @Test |
47 | 47 | public void testZeroSize() { |
48 | | - new FifoCache<Object>(0); |
| 48 | + assertThrows(IllegalArgumentException.class, () -> new FifoCache<>(0)); |
49 | 49 | } |
50 | 50 |
|
51 | | - @Test(expected = IllegalArgumentException.class) |
| 51 | + @Test |
52 | 52 | public void testIllegalArgument() { |
53 | | - new FifoCache<Object>(-1); |
| 53 | + assertThrows(IllegalArgumentException.class, () -> new FifoCache<>(0)); |
54 | 54 | } |
55 | 55 |
|
56 | 56 | @Test |
57 | 57 | public void testSingleEntry() { |
58 | 58 | FifoCache<String> cache = new FifoCache<String>(1); |
59 | | - assertTrue(cache.size() == 0); |
| 59 | + assertEquals(0, cache.size()); |
60 | 60 | cache.add("k1", "v1"); |
61 | | - assertTrue(cache.size() == 1); |
| 61 | + assertEquals(1, cache.size()); |
62 | 62 | cache.add("k1", "v11"); |
63 | | - assertTrue(cache.size() == 1); |
| 63 | + assertEquals(1, cache.size()); |
64 | 64 | assertEquals("v11", cache.get("k1")); |
65 | 65 |
|
66 | 66 | cache.add("k2", "v2"); |
67 | | - assertTrue(cache.size() == 1); |
| 67 | + assertEquals(1, cache.size()); |
68 | 68 | assertEquals("v2", cache.get("k2")); |
69 | 69 | assertNull(cache.get("k1")); |
70 | 70 |
|
71 | 71 | cache.add("k3", "v3"); |
72 | | - assertTrue(cache.size() == 1); |
| 72 | + assertEquals(1, cache.size()); |
73 | 73 | assertEquals("v3", cache.get("k3")); |
74 | 74 | assertNull(cache.get("k2")); |
75 | 75 | } |
|
0 commit comments