Skip to content

Commit 1679633

Browse files
authored
Remove unused test and methods (#6497)
1 parent 8013806 commit 1679633

File tree

3 files changed

+24
-106
lines changed

3 files changed

+24
-106
lines changed

core/http-auth-aws/src/test/java/software/amazon/awssdk/http/auth/aws/internal/signer/util/FifoCacheTest.java

Lines changed: 0 additions & 77 deletions
This file was deleted.

utils/src/main/java/software/amazon/awssdk/utils/cache/FifoCache.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock;
2020
import java.util.concurrent.locks.ReentrantReadWriteLock.WriteLock;
2121
import software.amazon.awssdk.annotations.SdkProtectedApi;
22+
import software.amazon.awssdk.annotations.SdkTestInternalApi;
2223
import software.amazon.awssdk.annotations.ThreadSafe;
2324
import software.amazon.awssdk.utils.internal.BoundedLinkedHashMap;
2425

@@ -75,7 +76,8 @@ public T get(String key) {
7576
/**
7677
* Returns the current size of the cache.
7778
*/
78-
public int size() {
79+
@SdkTestInternalApi
80+
int size() {
7981
rlock.lock();
8082
try {
8183
return map.size();
@@ -84,18 +86,11 @@ public int size() {
8486
}
8587
}
8688

87-
/**
88-
* Returns the maximum size of the cache.
89-
*/
90-
public int getMaxSize() {
91-
return map.getMaxSize();
92-
}
93-
9489
@Override
9590
public String toString() {
9691
rlock.lock();
9792
try {
98-
return map.toString();
93+
return map.keySet().toString();
9994
} finally {
10095
rlock.unlock();
10196
}

utils/src/test/java/software/amazon/awssdk/utils/cache/FifoCacheTest.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,61 +15,61 @@
1515

1616
package software.amazon.awssdk.utils.cache;
1717

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;
2121

22-
import org.junit.Test;
22+
import org.junit.jupiter.api.Test;
2323

2424
public class FifoCacheTest {
2525

2626
@Test
2727
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());
3030
cache.add("k1", "v1");
31-
assertTrue(cache.size() == 1);
31+
assertEquals(1, cache.size());
3232
cache.add("k1", "v11");
33-
assertTrue(cache.size() == 1);
33+
assertEquals(1, cache.size());
3434
cache.add("k2", "v2");
35-
assertTrue(cache.size() == 2);
35+
assertEquals(2, cache.size());
3636
cache.add("k3", "v3");
37-
assertTrue(cache.size() == 3);
37+
assertEquals(3, cache.size());
3838
assertEquals("v11", cache.get("k1"));
3939
assertEquals("v2", cache.get("k2"));
4040
assertEquals("v3", cache.get("k3"));
4141
cache.add("k4", "v4");
42-
assertTrue(cache.size() == 3);
42+
assertEquals(3, cache.size());
4343
assertNull(cache.get("k1"));
4444
}
4545

46-
@Test(expected = IllegalArgumentException.class)
46+
@Test
4747
public void testZeroSize() {
48-
new FifoCache<Object>(0);
48+
assertThrows(IllegalArgumentException.class, () -> new FifoCache<>(0));
4949
}
5050

51-
@Test(expected = IllegalArgumentException.class)
51+
@Test
5252
public void testIllegalArgument() {
53-
new FifoCache<Object>(-1);
53+
assertThrows(IllegalArgumentException.class, () -> new FifoCache<>(0));
5454
}
5555

5656
@Test
5757
public void testSingleEntry() {
5858
FifoCache<String> cache = new FifoCache<String>(1);
59-
assertTrue(cache.size() == 0);
59+
assertEquals(0, cache.size());
6060
cache.add("k1", "v1");
61-
assertTrue(cache.size() == 1);
61+
assertEquals(1, cache.size());
6262
cache.add("k1", "v11");
63-
assertTrue(cache.size() == 1);
63+
assertEquals(1, cache.size());
6464
assertEquals("v11", cache.get("k1"));
6565

6666
cache.add("k2", "v2");
67-
assertTrue(cache.size() == 1);
67+
assertEquals(1, cache.size());
6868
assertEquals("v2", cache.get("k2"));
6969
assertNull(cache.get("k1"));
7070

7171
cache.add("k3", "v3");
72-
assertTrue(cache.size() == 1);
72+
assertEquals(1, cache.size());
7373
assertEquals("v3", cache.get("k3"));
7474
assertNull(cache.get("k2"));
7575
}

0 commit comments

Comments
 (0)