Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4cb0c18

Browse files
Replace Hamcrest matchers with AssertJ matchers. Fix #24 
1 parent bf5edc3 commit 4cb0c18

File tree

66 files changed

+1034
-1005
lines changed

Some content is hidden

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

66 files changed

+1034
-1005
lines changed

‎build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ dependencies {
2323
testImplementation 'junit:junit:4.13.2'
2424
testImplementation 'net.bytebuddy:byte-buddy:1.14.12'
2525
testImplementation 'org.assertj:assertj-core:3.27.3'
26-
testImplementation 'org.hamcrest:hamcrest:3.0'
2726
testImplementation 'org.mockito:mockito-core:5.17.0'
2827
testImplementation 'org.awaitility:awaitility:4.3.0'
2928
testImplementation 'nl.jqno.equalsverifier:equalsverifier:3.19.3'

‎src/main/java/by/andd3dfx/numeric/Fibonacci.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ public class Fibonacci {
1919
/**
2020
* Top-down approach (recursive, better)
2121
*/
22-
public static int calculate(int n) {
22+
public static int calculateTopDown(int n) {
2323
if (n < 0) throw new IllegalArgumentException("Number should be not less than 0!");
2424

2525
if (!map.containsKey(n)) {
26-
map.put(n, calculate(n - 1) + calculate(n - 2));
26+
map.put(n, calculateTopDown(n - 1) + calculateTopDown(n - 2));
2727
}
2828

2929
return map.get(n);
@@ -32,7 +32,7 @@ public static int calculate(int n) {
3232
/**
3333
* Down-top approach (loop, just as example)
3434
*/
35-
public static int calculate2(int n) {
35+
public static int calculateDownTop(int n) {
3636
if (n < 0) throw new IllegalArgumentException("Number should be not less than 0!");
3737

3838
for (int i = 2; i <= n; i++) {

‎src/test/java/by/andd3dfx/cache/LFUCacheUsingLinkedHashSetTest.java‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,36 @@
22

33
import org.junit.Test;
44

5-
import static org.hamcrest.CoreMatchers.is;
6-
import static org.hamcrest.CoreMatchers.nullValue;
7-
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.assertj.core.api.Assertions.assertThat;
86

97
public class LFUCacheUsingLinkedHashSetTest {
108

119
@Test
1210
public void testCacheWithZeroCapacity() {
1311
LFUCacheUsingLinkedHashSet<Integer, Integer> cache = new LFUCacheUsingLinkedHashSet<>(0);
1412

15-
assertThat(cache.get(2), nullValue());
13+
assertThat(cache.get(2)).isNull();
1614
cache.put(2, 67);
17-
assertThat(cache.get(2), nullValue());
15+
assertThat(cache.get(2)).isNull();
1816
}
1917

2018
@Test
2119
public void testCache() {
2220
LFUCacheUsingLinkedHashSet<Integer, Integer> cache = new LFUCacheUsingLinkedHashSet<>(2);
2321
cache.put(1, 10);
2422
cache.put(2, 20);
25-
assertThat(cache.get(1), is(10));
23+
assertThat(cache.get(1)).isEqualTo(10);
2624

2725
cache.put(3, 30); //evicts key 2
2826

29-
assertThat(cache.get(2), nullValue());
30-
assertThat(cache.get(3), is(30));
27+
assertThat(cache.get(2)).isNull();
28+
assertThat(cache.get(3)).isEqualTo(30);
3129

3230
cache.put(4, 40); //evicts key 1
3331

34-
assertThat(cache.get(1), nullValue());
35-
assertThat(cache.get(3), is(30));
36-
assertThat(cache.get(4), is(40));
32+
assertThat(cache.get(1)).isNull();
33+
assertThat(cache.get(3)).isEqualTo(30);
34+
assertThat(cache.get(4)).isEqualTo(40);
3735
}
3836

3937
@Test
@@ -42,29 +40,29 @@ public void testCacheComplex() {
4240
cache.put(1, 10);
4341
cache.put(2, 20);
4442
cache.put(3, 30);
45-
assertThat(cache.get(1), is(10));
46-
assertThat(cache.get(3), is(30));
47-
assertThat(cache.get(1), is(10));
48-
assertThat(cache.get(1), is(10)); // 1 -> 3 times used
49-
assertThat(cache.get(3), is(30)); // 3 -> 2 times used
50-
assertThat(cache.get(2), is(20)); // 2 -> 1 times used
43+
assertThat(cache.get(1)).isEqualTo(10);
44+
assertThat(cache.get(3)).isEqualTo(30);
45+
assertThat(cache.get(1)).isEqualTo(10);
46+
assertThat(cache.get(1)).isEqualTo(10); // 1 -> 3 times used
47+
assertThat(cache.get(3)).isEqualTo(30); // 3 -> 2 times used
48+
assertThat(cache.get(2)).isEqualTo(20); // 2 -> 1 times used
5149

5250
cache.put(4, 40); // evicts key 2 (less used)
5351

54-
assertThat(cache.get(1), is(10)); // 1 -> 4 times used
55-
assertThat(cache.get(2), nullValue());
56-
assertThat(cache.get(4), is(40));
57-
assertThat(cache.get(4), is(40));
58-
assertThat(cache.get(4), is(40)); // 4 -> 3 times used
59-
assertThat(cache.get(3), is(30)); // 3 -> 3 times used
52+
assertThat(cache.get(1)).isEqualTo(10); // 1 -> 4 times used
53+
assertThat(cache.get(2)).isNull();
54+
assertThat(cache.get(4)).isEqualTo(40);
55+
assertThat(cache.get(4)).isEqualTo(40);
56+
assertThat(cache.get(4)).isEqualTo(40); // 4 -> 3 times used
57+
assertThat(cache.get(3)).isEqualTo(30); // 3 -> 3 times used
6058

6159
cache.put(5, 50); // evicts key 4 (same used as 3, but 3 is last used)
6260

63-
assertThat(cache.get(1), is(10));
64-
assertThat(cache.get(2), nullValue());
65-
assertThat(cache.get(3), is(30));
66-
assertThat(cache.get(4), nullValue());
67-
assertThat(cache.get(5), is(50));
61+
assertThat(cache.get(1)).isEqualTo(10);
62+
assertThat(cache.get(2)).isNull();
63+
assertThat(cache.get(3)).isEqualTo(30);
64+
assertThat(cache.get(4)).isNull();
65+
assertThat(cache.get(5)).isEqualTo(50);
6866
}
6967

7068
@Test
@@ -74,23 +72,23 @@ public void testCacheLeetCode_updateValue() {
7472
cache.put(2, 1);
7573
cache.put(2, 2); // overwrites value for key 2
7674
cache.put(4, 4); // evicts key 3
77-
assertThat(cache.get(2), is(2));
75+
assertThat(cache.get(2)).isEqualTo(2);
7876
}
7977

8078
@Test
8179
public void determineKeyToDelete() {
8280
var cache = new LFUCacheUsingLinkedHashSet<Integer, Integer>(2);
8381
cache.put(2, 100);
8482
cache.put(3, 200);
85-
assertThat(cache.determineKeyToDelete(), is(2));
83+
assertThat(cache.determineKeyToDelete()).isEqualTo(2);
8684

8785
cache.get(2);
88-
assertThat(cache.determineKeyToDelete(), is(3));
86+
assertThat(cache.determineKeyToDelete()).isEqualTo(3);
8987
cache.get(3);
90-
assertThat(cache.determineKeyToDelete(), is(2));
88+
assertThat(cache.determineKeyToDelete()).isEqualTo(2);
9189
cache.put(4, 500);
92-
assertThat(cache.determineKeyToDelete(), is(4));
90+
assertThat(cache.determineKeyToDelete()).isEqualTo(4);
9391
cache.get(4);
94-
assertThat(cache.determineKeyToDelete(), is(3));
92+
assertThat(cache.determineKeyToDelete()).isEqualTo(3);
9593
}
9694
}

‎src/test/java/by/andd3dfx/cache/LFUCacheUsingTimeTest.java‎

Lines changed: 32 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,36 @@
22

33
import org.junit.Test;
44

5-
import static org.hamcrest.CoreMatchers.is;
6-
import static org.hamcrest.CoreMatchers.nullValue;
7-
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.assertj.core.api.Assertions.assertThat;
86

97
public class LFUCacheUsingTimeTest {
108

119
@Test
1210
public void testCacheWithZeroCapacity() {
1311
LFUCacheUsingTime<Integer, Integer> cache = new LFUCacheUsingTime<>(0);
1412

15-
assertThat(cache.get(2), nullValue());
13+
assertThat(cache.get(2)).isNull();
1614
cache.put(2, 67);
17-
assertThat(cache.get(2), nullValue());
15+
assertThat(cache.get(2)).isNull();
1816
}
1917

2018
@Test
2119
public void testCache() {
2220
LFUCacheUsingTime<Integer, Integer> cache = new LFUCacheUsingTime<>(2);
2321
cache.put(1, 10);
2422
cache.put(2, 20);
25-
assertThat(cache.get(1), is(10));
23+
assertThat(cache.get(1)).isEqualTo(10);
2624

2725
cache.put(3, 30); //evicts key 2
2826

29-
assertThat(cache.get(2), nullValue());
30-
assertThat(cache.get(3), is(30));
27+
assertThat(cache.get(2)).isNull();
28+
assertThat(cache.get(3)).isEqualTo(30);
3129

3230
cache.put(4, 40); //evicts key 1
3331

34-
assertThat(cache.get(1), nullValue());
35-
assertThat(cache.get(3), is(30));
36-
assertThat(cache.get(4), is(40));
32+
assertThat(cache.get(1)).isNull();
33+
assertThat(cache.get(3)).isEqualTo(30);
34+
assertThat(cache.get(4)).isEqualTo(40);
3735
}
3836

3937
@Test
@@ -42,29 +40,29 @@ public void testCacheComplex() {
4240
cache.put(1, 10);
4341
cache.put(2, 20);
4442
cache.put(3, 30);
45-
assertThat(cache.get(1), is(10));
46-
assertThat(cache.get(3), is(30));
47-
assertThat(cache.get(1), is(10));
48-
assertThat(cache.get(1), is(10)); // 1 -> 3 times used
49-
assertThat(cache.get(3), is(30)); // 3 -> 2 times used
50-
assertThat(cache.get(2), is(20)); // 2 -> 1 times used
43+
assertThat(cache.get(1)).isEqualTo(10);
44+
assertThat(cache.get(3)).isEqualTo(30);
45+
assertThat(cache.get(1)).isEqualTo(10);
46+
assertThat(cache.get(1)).isEqualTo(10); // 1 -> 3 times used
47+
assertThat(cache.get(3)).isEqualTo(30); // 3 -> 2 times used
48+
assertThat(cache.get(2)).isEqualTo(20); // 2 -> 1 times used
5149

5250
cache.put(4, 40); // evicts key 2 (less used)
5351

54-
assertThat(cache.get(1), is(10)); // 1 -> 4 times used
55-
assertThat(cache.get(2), nullValue());
56-
assertThat(cache.get(4), is(40));
57-
assertThat(cache.get(4), is(40));
58-
assertThat(cache.get(4), is(40)); // 4 -> 3 times used
59-
assertThat(cache.get(3), is(30)); // 3 -> 3 times used
52+
assertThat(cache.get(1)).isEqualTo(10); // 1 -> 4 times used
53+
assertThat(cache.get(2)).isNull();
54+
assertThat(cache.get(4)).isEqualTo(40);
55+
assertThat(cache.get(4)).isEqualTo(40);
56+
assertThat(cache.get(4)).isEqualTo(40); // 4 -> 3 times used
57+
assertThat(cache.get(3)).isEqualTo(30); // 3 -> 3 times used
6058

6159
cache.put(5, 50); // evicts key 4 (same used as 3, but 3 is last used)
6260

63-
assertThat(cache.get(1), is(10));
64-
assertThat(cache.get(2), nullValue());
65-
assertThat(cache.get(3), is(30));
66-
assertThat(cache.get(4), nullValue());
67-
assertThat(cache.get(5), is(50));
61+
assertThat(cache.get(1)).isEqualTo(10);
62+
assertThat(cache.get(2)).isNull();
63+
assertThat(cache.get(3)).isEqualTo(30);
64+
assertThat(cache.get(4)).isNull();
65+
assertThat(cache.get(5)).isEqualTo(50);
6866
}
6967

7068
@Test
@@ -74,23 +72,23 @@ public void testCacheLeetcode_updateValue() {
7472
cache.put(2, 1);
7573
cache.put(2, 2); // overwrites value for key 2
7674
cache.put(4, 4); // evicts key 3
77-
assertThat(cache.get(2), is(2));
75+
assertThat(cache.get(2)).isEqualTo(2);
7876
}
7977

8078
@Test
8179
public void determineKeyToDelete() {
8280
var cache = new LFUCacheUsingTime<Integer, Integer>(2);
8381
cache.put(2, 100);
8482
cache.put(3, 200);
85-
assertThat(cache.determineKeyToDelete(), is(2));
83+
assertThat(cache.determineKeyToDelete()).isEqualTo(2);
8684

8785
cache.get(2);
88-
assertThat(cache.determineKeyToDelete(), is(3));
86+
assertThat(cache.determineKeyToDelete()).isEqualTo(3);
8987
cache.get(3);
90-
assertThat(cache.determineKeyToDelete(), is(2));
88+
assertThat(cache.determineKeyToDelete()).isEqualTo(2);
9189
cache.put(4, 500);
92-
assertThat(cache.determineKeyToDelete(), is(4));
90+
assertThat(cache.determineKeyToDelete()).isEqualTo(4);
9391
cache.get(4);
94-
assertThat(cache.determineKeyToDelete(), is(3));
92+
assertThat(cache.determineKeyToDelete()).isEqualTo(3);
9593
}
9694
}

‎src/test/java/by/andd3dfx/cache/LRUCacheTest.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import org.junit.Test;
44

5-
import static org.hamcrest.CoreMatchers.is;
6-
import static org.hamcrest.CoreMatchers.nullValue;
7-
import static org.hamcrest.MatcherAssert.assertThat;
5+
import static org.assertj.core.api.Assertions.assertThat;
86

97
public class LRUCacheTest {
108

@@ -13,20 +11,20 @@ public void testCache() {
1311
LRUCache<Integer, Integer> cache = new LRUCache<>(2);
1412
cache.put(1, 1);
1513
cache.put(2, 4);
16-
assertThat(cache.get(1), is(1));
14+
assertThat(cache.get(1)).isEqualTo(1);
1715
cache.put(3, 9); // evicts key 2
18-
assertThat(cache.get(2), nullValue());
16+
assertThat(cache.get(2)).isNull();
1917
cache.put(4, 16); // evicts key 1
20-
assertThat(cache.get(1), nullValue());
21-
assertThat(cache.get(3), is(9));
22-
assertThat(cache.get(4), is(16));
18+
assertThat(cache.get(1)).isNull();
19+
assertThat(cache.get(3)).isEqualTo(9);
20+
assertThat(cache.get(4)).isEqualTo(16);
2321
}
2422

2523
@Test
2624
public void testCacheForZeroCapacity() {
2725
LRUCache<Integer, Integer> cache = new LRUCache<>(0);
2826
cache.put(2, 4);
29-
assertThat(cache.get(2), nullValue());
30-
assertThat(cache.get(1), nullValue());
27+
assertThat(cache.get(2)).isNull();
28+
assertThat(cache.get(1)).isNull();
3129
}
3230
}

‎src/test/java/by/andd3dfx/collections/ReverseLinkedListTest.java‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
import static by.andd3dfx.collections.ReverseLinkedList.reverseUsingLoop;
77
import static by.andd3dfx.collections.ReverseLinkedList.reverseUsingRecursion;
88
import static by.andd3dfx.collections.ReverseLinkedList.reverseUsingStack;
9-
import static org.hamcrest.CoreMatchers.is;
10-
import static org.hamcrest.MatcherAssert.assertThat;
9+
import static org.assertj.core.api.Assertions.assertThat;
1110
import static org.junit.Assert.assertNull;
1211

1312
public class ReverseLinkedListTest {
@@ -51,15 +50,20 @@ public void testReverseUsingRecursionForNull() {
5150
assertNull(reverseUsingRecursion(null));
5251
}
5352

54-
private Node buildLinkedList() {
55-
return new Node(3, new Node(7, new Node(12, new Node(10, null))));
53+
private Node<Integer> buildLinkedList() {
54+
return new Node<>(3, new Node<>(7, new Node<>(12, new Node<>(10, null))));
5655
}
5756

5857
private void checkReversedList(Node head) {
59-
assertThat("Wrong 0 item of reversed list", head.getValue(), is(10));
60-
assertThat("Wrong 1 item of reversed list", head.getNext().getValue(), is(12));
61-
assertThat("Wrong 2 item of reversed list", head.getNext().getNext().getValue(), is(7));
62-
assertThat("Wrong 3 item of reversed list", head.getNext().getNext().getNext().getValue(), is(3));
63-
assertNull("Wrong next of 3 item of reversed list", head.getNext().getNext().getNext().getNext());
58+
assertThat(head.getValue())
59+
.as("Wrong 0 item of reversed list").isEqualTo(10);
60+
assertThat(head.getNext().getValue())
61+
.as("Wrong 1 item of reversed list").isEqualTo(12);
62+
assertThat(head.getNext().getNext().getValue())
63+
.as("Wrong 2 item of reversed list").isEqualTo(7);
64+
assertThat(head.getNext().getNext().getNext().getValue())
65+
.as("Wrong 3 item of reversed list").isEqualTo(3);
66+
assertThat(head.getNext().getNext().getNext().getNext())
67+
.as("Wrong next of 3 item of reversed list").isNull();
6468
}
6569
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /