Skip to content

Commit 5319d36

Browse files
keszoczeOliver Keszöcze
keszocze
and
Oliver Keszöcze
authored
Use AssertJ for the remaining exercises (#2515)
* Use AssertJ in Zipper exercise * Use AssertJ in Grade School exercise * Use AssertJ in Tree Building exercise * Fix School test --------- Co-authored-by: Oliver Keszöcze <[email protected]>
1 parent 2493e11 commit 5319d36

File tree

3 files changed

+51
-52
lines changed

3 files changed

+51
-52
lines changed

‎exercises/practice/grade-school/src/test/java/SchoolTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import static org.junit.Assert.assertEquals;
1+
import static org.assertj.core.api.Assertions.assertThat;
22

33
import java.util.Arrays;
44
import java.util.List;
@@ -21,7 +21,7 @@ public void addingAStudentAddsThemToTheSortedRoster() {
2121
school = new School();
2222
school.add("Aimee", 2);
2323
List<String> expected = Arrays.asList("Aimee");
24-
assertEquals(expected, school.roster());
24+
assertThat(school.roster()).isEqualTo(expected);
2525
}
2626

2727
@Ignore("Remove to run test")
@@ -33,7 +33,7 @@ public void addingMoreStudentsAddsThemToTheSameSortedRoster() {
3333
school.add("James", grade);
3434
school.add("Paul", grade);
3535
List<String> expected = Arrays.asList("Blair", "James", "Paul");
36-
assertEquals(expected, school.roster());
36+
assertThat(school.roster()).isEqualTo(expected);
3737
}
3838

3939
@Ignore("Remove to run test")
@@ -43,15 +43,15 @@ public void addingStudentsToDifferentGradesAddsThemToTheSameSortedRoster() {
4343
school.add("Chelsea", 3);
4444
school.add("Logan", 7);
4545
List<String> expected = Arrays.asList("Chelsea", "Logan");
46-
assertEquals(expected, school.roster());
46+
assertThat(school.roster()).isEqualTo(expected);
4747
}
4848

4949
@Ignore("Remove to run test")
5050
@Test
5151
public void rosterReturnsAnEmptyListIfThereAreNoStudentsEnrolled() {
5252
school = new School();
5353
List<String> expected = Arrays.asList();
54-
assertEquals(expected, school.roster());
54+
assertThat(school.roster()).isEqualTo(expected);
5555
}
5656

5757
@Ignore("Remove to run test")
@@ -66,7 +66,7 @@ public void studentNamesWithGradesAreDisplayedInTheSameSortedRoster() {
6666
school.add("Jim", 3);
6767
school.add("Charlie", 1);
6868
List<String> expected = Arrays.asList("Anna", "Barb", "Charlie", "Alex", "Peter", "Zoe", "Jim");
69-
assertEquals(expected, school.roster());
69+
assertThat(school.roster()).isEqualTo(expected);
7070
}
7171

7272
@Ignore("Remove to run test")
@@ -77,14 +77,14 @@ public void gradeReturnsTheStudentsInThatGradeInAlphabeticalOrder() {
7777
school.add("Bradley", 5);
7878
school.add("Jeff", 1);
7979
List<String> expected = Arrays.asList("Bradley", "Franklin");
80-
assertEquals(expected, school.grade(5));
80+
assertThat(school.grade(5)).isEqualTo(expected);
8181
}
8282

8383
@Ignore("Remove to run test")
8484
@Test
8585
public void gradeReturnsAnEmptyListIfThereAreNoStudentsInThatGrade() {
8686
school = new School();
8787
List<String> expected = Arrays.asList();
88-
assertEquals(expected, school.grade(1));
88+
assertThat(school.grade(1)).isEqualTo(expected);
8989
}
9090
}

‎exercises/practice/tree-building/src/test/java/BuildTreeTest.java

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1+
import static org.assertj.core.api.Assertions.assertThat;
12
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
2-
import static org.junit.Assert.assertEquals;
3-
import static org.junit.Assert.assertNull;
43

54
import org.junit.Ignore;
65
import org.junit.Test;
@@ -14,7 +13,7 @@ public void testEmptyList() throws InvalidRecordsException {
1413
ArrayList<Record> records = new ArrayList<>();
1514

1615
TreeNode root = new BuildTree().buildTree(records);
17-
assertNull(root);
16+
assertThat(root).isNull();
1817
}
1918

2019
@Ignore("Remove to run test")
@@ -25,7 +24,7 @@ public void testOneRecord() throws InvalidRecordsException {
2524
records.add(record);
2625

2726
TreeNode root = new BuildTree().buildTree(records);
28-
assertEquals(root.getNodeId(), 0);
27+
assertThat(root.getNodeId()).isEqualTo(0);
2928
assertNodeIsLeaf(root);
3029
}
3130

@@ -42,9 +41,9 @@ public void testThreeRecordsInOrder() throws InvalidRecordsException {
4241
assertNodeIsLeaf(root.getChildren().get(0));
4342
assertNodeIsLeaf(root.getChildren().get(1));
4443

45-
assertEquals(root.getNodeId(), 0);
46-
assertEquals(root.getChildren().get(0).getNodeId(), 1);
47-
assertEquals(root.getChildren().get(1).getNodeId(), 2);
44+
assertThat(root.getNodeId()).isEqualTo(0);
45+
assertThat(root.getChildren().get(0).getNodeId()).isEqualTo(1);
46+
assertThat(root.getChildren().get(1).getNodeId()).isEqualTo(2);
4847
}
4948

5049
@Ignore("Remove to run test")
@@ -60,9 +59,9 @@ public void testThreeRecordsInReverseOrder() throws InvalidRecordsException {
6059
assertNodeIsLeaf(root.getChildren().get(0));
6160
assertNodeIsLeaf(root.getChildren().get(1));
6261

63-
assertEquals(root.getNodeId(), 0);
64-
assertEquals(root.getChildren().get(0).getNodeId(), 1);
65-
assertEquals(root.getChildren().get(1).getNodeId(), 2);
62+
assertThat(root.getNodeId()).isEqualTo(0);
63+
assertThat(root.getChildren().get(0).getNodeId()).isEqualTo(1);
64+
assertThat(root.getChildren().get(1).getNodeId()).isEqualTo(2);
6665
}
6766

6867
@Ignore("Remove to run test")
@@ -80,10 +79,10 @@ public void testRecordsWithMoreThanTwoChildren() throws InvalidRecordsException
8079
assertNodeIsLeaf(root.getChildren().get(1));
8180
assertNodeIsLeaf(root.getChildren().get(2));
8281

83-
assertEquals(root.getNodeId(), 0);
84-
assertEquals(root.getChildren().get(0).getNodeId(), 1);
85-
assertEquals(root.getChildren().get(1).getNodeId(), 2);
86-
assertEquals(root.getChildren().get(2).getNodeId(), 3);
82+
assertThat(root.getNodeId()).isEqualTo(0);
83+
assertThat(root.getChildren().get(0).getNodeId()).isEqualTo(1);
84+
assertThat(root.getChildren().get(1).getNodeId()).isEqualTo(2);
85+
assertThat(root.getChildren().get(2).getNodeId()).isEqualTo(3);
8786

8887
}
8988

@@ -109,13 +108,13 @@ public void testBinaryTree() throws InvalidRecordsException {
109108
assertNodeIsLeaf(root.getChildren().get(1).getChildren().get(0));
110109
assertNodeIsLeaf(root.getChildren().get(1).getChildren().get(1));
111110

112-
assertEquals(root.getNodeId(), 0);
113-
assertEquals(root.getChildren().get(0).getNodeId(), 1);
114-
assertEquals(root.getChildren().get(1).getNodeId(), 2);
115-
assertEquals(root.getChildren().get(0).getChildren().get(0).getNodeId(), 3);
116-
assertEquals(root.getChildren().get(0).getChildren().get(1).getNodeId(), 4);
117-
assertEquals(root.getChildren().get(1).getChildren().get(0).getNodeId(), 5);
118-
assertEquals(root.getChildren().get(1).getChildren().get(1).getNodeId(), 6);
111+
assertThat(root.getNodeId()).isEqualTo(0);
112+
assertThat(root.getChildren().get(0).getNodeId()).isEqualTo(1);
113+
assertThat(root.getChildren().get(1).getNodeId()).isEqualTo(2);
114+
assertThat(root.getChildren().get(0).getChildren().get(0).getNodeId()).isEqualTo(3);
115+
assertThat(root.getChildren().get(0).getChildren().get(1).getNodeId()).isEqualTo(4);
116+
assertThat(root.getChildren().get(1).getChildren().get(0).getNodeId()).isEqualTo(5);
117+
assertThat(root.getChildren().get(1).getChildren().get(1).getNodeId()).isEqualTo(6);
119118
}
120119

121120
@Ignore("Remove to run test")
@@ -139,13 +138,13 @@ public void testUnbalancedTree() throws InvalidRecordsException {
139138
assertNodeIsLeaf(root.getChildren().get(0).getChildren().get(2));
140139
assertNodeIsLeaf(root.getChildren().get(1).getChildren().get(0));
141140

142-
assertEquals(root.getNodeId(), 0);
143-
assertEquals(root.getChildren().get(0).getNodeId(), 1);
144-
assertEquals(root.getChildren().get(1).getNodeId(), 2);
145-
assertEquals(root.getChildren().get(0).getChildren().get(0).getNodeId(), 3);
146-
assertEquals(root.getChildren().get(0).getChildren().get(1).getNodeId(), 4);
147-
assertEquals(root.getChildren().get(0).getChildren().get(2).getNodeId(), 5);
148-
assertEquals(root.getChildren().get(1).getChildren().get(0).getNodeId(), 6);
141+
assertThat(root.getNodeId()).isEqualTo(0);
142+
assertThat(root.getChildren().get(0).getNodeId()).isEqualTo(1);
143+
assertThat(root.getChildren().get(1).getNodeId()).isEqualTo(2);
144+
assertThat(root.getChildren().get(0).getChildren().get(0).getNodeId()).isEqualTo(3);
145+
assertThat(root.getChildren().get(0).getChildren().get(1).getNodeId()).isEqualTo(4);
146+
assertThat(root.getChildren().get(0).getChildren().get(2).getNodeId()).isEqualTo(5);
147+
assertThat(root.getChildren().get(1).getChildren().get(0).getNodeId()).isEqualTo(6);
149148
}
150149

151150
@Ignore("Remove to run test")
@@ -212,10 +211,10 @@ public void testCycleIndirectly() {
212211
}
213212

214213
private void assertNodeIsLeaf(TreeNode node) {
215-
assertEquals(node.getChildren().size(), 0);
214+
assertThat(node.getChildren().size()).isEqualTo(0);
216215
}
217216

218217
private void assertNodeIsBranchWithNNumberOfChildren(TreeNode node, int childrenCount) {
219-
assertEquals(node.getChildren().size(), childrenCount);
218+
assertThat(node.getChildren().size()).isEqualTo(childrenCount);
220219
}
221220
}

‎exercises/practice/zipper/src/test/java/ZipperTest.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import org.junit.Test;
33
import org.junit.Before;
44

5-
import static org.junit.Assert.assertEquals;
5+
import static org.assertj.core.api.Assertions.assertThat;
66

77
public class ZipperTest {
88

@@ -22,42 +22,42 @@ public void setup() {
2222

2323
@Test
2424
public void testToTree() {
25-
assertEquals(binaryTree, zipper.toTree());
25+
assertThat(zipper.toTree()).isEqualTo(binaryTree);
2626
}
2727

2828
@Ignore("Remove to run test")
2929
@Test
3030
public void testLeftRightAndValue() {
3131
zipper = binaryTree.getRoot();
32-
assertEquals(3, zipper.left.right.getValue());
32+
assertThat(zipper.left.right.getValue()).isEqualTo(3);
3333
}
3434

3535
@Ignore("Remove to run test")
3636
@Test
3737
public void testDeadEnd() {
3838
zipper = binaryTree.getRoot();
39-
assertEquals(null, zipper.left.left);
39+
assertThat(zipper.left.left).isNull();
4040
}
4141

4242
@Ignore("Remove to run test")
4343
@Test
4444
public void testToTreeFromDeepFocus() {
4545
zipper = binaryTree.getRoot();
46-
assertEquals(binaryTree, zipper.left.right.toTree());
46+
assertThat(zipper.left.right.toTree()).isEqualTo(binaryTree);
4747
}
4848

4949
@Ignore("Remove to run test")
5050
@Test
5151
public void testTraversingUpFromTop() {
5252
zipper = binaryTree.getRoot();
53-
assertEquals(null, zipper.up);
53+
assertThat(zipper.up).isNull();
5454
}
5555

5656
@Ignore("Remove to run test")
5757
@Test
5858
public void testLeftRightAndUp() {
5959
zipper = binaryTree.getRoot();
60-
assertEquals(3, zipper.left.up.right.up.left.right.getValue());
60+
assertThat(zipper.left.up.right.up.left.right.getValue()).isEqualTo(3);
6161
}
6262

6363
@Ignore("Remove to run test")
@@ -79,7 +79,7 @@ public void testSetValue() {
7979
"value: 4, " +
8080
"left: null, " +
8181
"right: null }";
82-
assertEquals(expected, zipper.toTree().printTree());
82+
assertThat(zipper.toTree().printTree()).isEqualTo(expected);
8383
}
8484

8585
@Ignore("Remove to run test")
@@ -101,7 +101,7 @@ public void testSetValueAfterTraversingUp() {
101101
"value: 4, " +
102102
"left: null, " +
103103
"right: null }";
104-
assertEquals(expected, zipper.toTree().printTree());
104+
assertThat(zipper.toTree().printTree()).isEqualTo(expected);
105105
}
106106

107107
@Ignore("Remove to run test")
@@ -126,7 +126,7 @@ public void testSetLeftWithLeaf() {
126126
"value: 4, " +
127127
"left: null, " +
128128
"right: null }";
129-
assertEquals(expected, zipper.toTree().printTree());
129+
assertThat(zipper.toTree().printTree()).isEqualTo(expected);
130130
}
131131

132132
@Ignore("Remove to run test")
@@ -139,7 +139,7 @@ public void testSetRightWithNull() {
139139
"value: 1, " +
140140
"left: { value: 2, left: null, right: null }, " +
141141
"right: { value: 4, left: null, right: null }";
142-
assertEquals(expected, zipper.toTree().printTree());
142+
assertThat(zipper.toTree().printTree()).isEqualTo(expected);
143143
}
144144

145145
@Ignore("Remove to run test")
@@ -169,7 +169,7 @@ public void testSetRightWithSubtree() {
169169
"value: 8, " +
170170
"left: null, " +
171171
"right: null } }";
172-
assertEquals(expected, zipper.toTree().printTree());
172+
assertThat(zipper.toTree().printTree()).isEqualTo(expected);
173173
}
174174

175175
@Ignore("Remove to run test")
@@ -191,14 +191,14 @@ public void testSetValueOnDeepFocus() {
191191
"value: 4, " +
192192
"left: null, " +
193193
"right: null }";
194-
assertEquals(expected, zipper.toTree().printTree());
194+
assertThat(zipper.toTree().printTree()).isEqualTo(expected);
195195
}
196196

197197
@Ignore("Remove to run test")
198198
@Test
199199
public void differentPathToSameZipper() {
200200
Zipper zipper1 = binaryTree.getRoot().left.up.right;
201201
Zipper zipper2 = binaryTree.getRoot().right;
202-
assertEquals(zipper2, zipper1);
202+
assertThat(zipper1).isEqualTo(zipper2);
203203
}
204204
}

0 commit comments

Comments
 (0)