Skip to content

Commit 224b97b

Browse files
DanielGronauDanielGronau
committed
change unit test style to AssertJ (WIP)
Took 2 minutes
1 parent 09508bb commit 224b97b

File tree

2 files changed

+86
-101
lines changed

2 files changed

+86
-101
lines changed

‎src/test/java/org/highj/data/instance/MapTest.java‎

Lines changed: 74 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,177 +1,161 @@
11
package org.highj.data.instance;
22

3-
import org.derive4j.hkt.__;
4-
import org.derive4j.hkt.__2;
53
import org.highj.data.List;
64
import org.highj.data.Map;
75
import org.highj.data.Maybe;
8-
import org.highj.data.tuple.T2;
96
import org.highj.data.num.Integers;
7+
import org.highj.data.tuple.T2;
108
import org.junit.Test;
119

1210
import java.util.Iterator;
1311
import java.util.NoSuchElementException;
1412
import java.util.function.Function;
1513

16-
import static org.highj.Hkt.asMap;
17-
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.assertTrue;
19-
import static org.junit.Assert.fail;
14+
import static org.assertj.core.api.Assertions.assertThat;
15+
import static org.assertj.core.api.Assertions.assertThatThrownBy;
16+
2017

2118
public class MapTest {
2219

23-
private final static Map<String,Integer> aMap = Map.<String, Integer>empty().plus("x",3).plus("y",5).plus("z",10);
20+
private final static Map<String, Integer> aMap = Map.<String, Integer>empty().plus("x", 3).plus("y", 5).plus("z", 10);
2421

2522
@Test
26-
public void test$() throws Exception {
27-
assertEquals("Just(5)", aMap.apply("y").toString());
28-
assertEquals("Nothing", aMap.apply("a").toString());
23+
public void test$() {
24+
assertThat(aMap.apply("y").toString()).isEqualTo("Just(5)");
25+
assertThat(aMap.apply("a").toString()).isEqualTo("Nothing");
2926
}
3027

3128
@Test
32-
public void testGetOrElse() throws Exception {
33-
assertEquals("5", aMap.getOrElse("y",42).toString());
34-
assertEquals("42", aMap.getOrElse("a", 42).toString());
29+
public void testGetOrElse() {
30+
assertThat(aMap.getOrElse("y", 42).toString()).isEqualTo("5");
31+
assertThat(aMap.getOrElse("a", 42).toString()).isEqualTo("42");
3532
}
3633

3734
@Test
38-
public void testGet() throws Exception {
39-
assertEquals("5", aMap.get("y").toString());
40-
try {
41-
aMap.get("a").toString();
42-
fail();
43-
} catch (NoSuchElementException ex) {
44-
/* expected */
45-
}
35+
public void testGet() {
36+
assertThat(aMap.get("y").toString()).isEqualTo("5");
37+
assertThatThrownBy(() -> aMap.get("a"))
38+
.isInstanceOf(NoSuchElementException.class);
4639
}
4740

4841
@Test
49-
public void testPlusAB() throws Exception {
50-
assertEquals("Map(a->20)", Map.empty().plus("a", 20).toString());
51-
assertEquals("Map(x->13,y->5,z->10)", aMap.plus("x", 13).toString());
52-
assertEquals("Map(a->20,x->3,y->5,z->10)", aMap.plus("a", 20).toString());
42+
public void testPlusAB() {
43+
assertThat(Map.empty().plus("a", 20).toString()).isEqualTo("Map(a->20)");
44+
assertThat(aMap.plus("x", 13).toString()).isEqualTo("Map(x->13,y->5,z->10)");
45+
assertThat(aMap.plus("a", 20).toString()).isEqualTo("Map(a->20,x->3,y->5,z->10)");
5346
}
5447

5548
@Test
56-
public void testPlusT2() throws Exception {
49+
public void testPlusT2() {
5750
T2<String, Integer> t2 = T2.of("a", 20);
58-
assertEquals("Map(a->20)", Map.<String,Integer>empty().plus(t2).toString());
59-
assertEquals("Map(a->20,x->3,y->5,z->10)", aMap.plus(t2).toString());
51+
assertThat(Map.<String, Integer>empty().plus(t2).toString()).isEqualTo("Map(a->20)");
52+
assertThat(aMap.plus(t2).toString()).isEqualTo("Map(a->20,x->3,y->5,z->10)");
6053
}
6154

6255
@Test
63-
public void testMinus1() throws Exception {
64-
assertEquals("Map()", Map.empty().minus("a").toString());
65-
assertEquals("Map(x->3,y->5,z->10)", aMap.minus("a").toString());
66-
assertEquals("Map(x->3,z->10)", aMap.minus("y").toString());
56+
public void testMinus1() {
57+
assertThat(Map.empty().minus("a").toString()).isEqualTo("Map()");
58+
assertThat(aMap.minus("a").toString()).isEqualTo("Map(x->3,y->5,z->10)");
59+
assertThat(aMap.minus("y").toString()).isEqualTo("Map(x->3,z->10)");
6760
}
6861

6962
@Test
70-
public void testIsEmpty() throws Exception {
71-
assertTrue(Map.empty().isEmpty());
72-
assertTrue(! aMap.isEmpty());
73-
assertTrue(aMap.minus("y", "x", "z").isEmpty());
63+
public void testIsEmpty() {
64+
assertThat(Map.empty().isEmpty()).isTrue();
65+
assertThat(aMap.isEmpty()).isFalse();
66+
assertThat(aMap.minus("y", "x", "z").isEmpty()).isTrue();
7467
}
7568

7669

7770
@Test
78-
public void testEmpty() throws Exception {
79-
assertEquals("Map()", Map.empty().toString());
71+
public void testEmpty() {
72+
assertThat(Map.empty().toString()).isEqualTo("Map()");
8073
}
8174

8275
@Test
83-
public void testOf0() throws Exception {
84-
assertEquals("Map()", Map.of().toString());
76+
public void testOf0() {
77+
assertThat(Map.of().toString()).isEqualTo("Map()");
8578
}
8679

8780
@Test
88-
public void testOfT2() throws Exception {
89-
assertEquals("Map(x->3,y->5,z->10)",
90-
Map.of(T2.of("y", 5), T2.of("z", 10), T2.of("x", 3)).toString());
81+
public void testOfT2() {
82+
assertThat(Map.of(T2.of("y", 5), T2.of("z", 10), T2.of("x", 3)).toString())
83+
.isEqualTo("Map(x->3,y->5,z->10)");
9184
}
9285

9386
@Test
94-
public void testOfIterable() throws Exception {
95-
List<T2<String,Integer>> list = List.of(T2.of("y", 5), T2.of("z", 10), T2.of("x", 3));
96-
assertEquals("Map(x->3,y->5,z->10)",
97-
Map.of(list).toString());
87+
public void testOfIterable() {
88+
List<T2<String, Integer>> list = List.of(T2.of("y", 5), T2.of("z", 10), T2.of("x", 3));
89+
assertThat(Map.of(list).toString()).isEqualTo("Map(x->3,y->5,z->10)");
9890
}
9991

10092
@Test
101-
public void testPlusT2s() throws Exception {
102-
assertEquals("Map(a->1,x->13,y->5,z->10)",
103-
aMap.plus(T2.of("a", 1), T2.of("x", 13)).toString());
93+
public void testPlusT2s() {
94+
assertThat(aMap.plus(T2.of("a", 1), T2.of("x", 13)).toString())
95+
.isEqualTo("Map(a->1,x->13,y->5,z->10)");
10496
}
10597

10698
@Test
107-
public void testMinusN() throws Exception {
108-
assertEquals("Map(x->3,z->10)", aMap.minus("a","y","b").toString());
99+
public void testMinusN() {
100+
assertThat(aMap.minus("a", "y", "b").toString()).isEqualTo("Map(x->3,z->10)");
109101
}
110102

111103
@Test
112-
public void testPlusIterable() throws Exception {
113-
List<T2<String,Integer>> list = List.of(T2.of("a", 1), T2.of("x", 13));
114-
assertEquals("Map(a->1,x->13,y->5,z->10)",
115-
aMap.plus(list).toString());
116-
104+
public void testPlusIterable() {
105+
List<T2<String, Integer>> list = List.of(T2.of("a", 1), T2.of("x", 13));
106+
assertThat(aMap.plus(list).toString()).isEqualTo("Map(a->1,x->13,y->5,z->10)");
117107
}
118108

119109
@Test
120-
public void testMinusIterable() throws Exception {
110+
public void testMinusIterable() {
121111
List<String> list = List.of("a", "y");
122-
assertEquals("Map(x->3,z->10)",
123-
aMap.minus(list).toString());
112+
assertThat(aMap.minus(list).toString()).isEqualTo("Map(x->3,z->10)");
124113
}
125114

126-
127115
@Test
128-
public void testSize() throws Exception {
129-
assertEquals(0, Map.empty().size());
130-
assertEquals(3, aMap.size());
116+
public void testSize() {
117+
assertThat(Map.empty().size()).isEqualTo(0);
118+
assertThat(aMap.size()).isEqualTo(3);
131119
}
132120

133-
134121
@Test
135-
public void testF1() throws Exception {
122+
public void testF1() {
136123
Function<String, Maybe<Integer>> f1 = aMap.apply();
137-
assertEquals("Just(5)", f1.apply("y").toString());
138-
assertEquals("Nothing", f1.apply("a").toString());
124+
assertThat(f1.apply("y").toString()).isEqualTo("Just(5)");
125+
assertThat(f1.apply("a").toString()).isEqualTo("Nothing");
139126
}
140127

141-
142128
@Test
143-
public void testIterator() throws Exception {
144-
assertTrue(! Map.empty().iterator().hasNext());
129+
public void testIterator() {
130+
assertThat(Map.empty().iterator().hasNext()).isFalse();
145131

146-
Iterator<T2<String,Integer>> it = aMap.iterator();
147-
assertEquals("(x,3)", it.next().toString());
148-
assertEquals("(y,5)", it.next().toString());
149-
assertEquals("(z,10)", it.next().toString());
150-
assertTrue(! it.hasNext());
132+
Iterator<T2<String, Integer>> it = aMap.iterator();
133+
assertThat(it.next().toString()).isEqualTo("(x,3)");
134+
assertThat(it.next().toString()).isEqualTo("(y,5)");
135+
assertThat(it.next().toString()).isEqualTo("(z,10)");
136+
assertThat(it.hasNext()).isFalse();
151137
}
152138

153139
@Test
154-
public void testToString() throws Exception {
155-
assertEquals("Map()", Map.empty().toString());
156-
assertEquals("Map(x->3,y->5,z->10)", aMap.toString());
140+
public void testToString() {
141+
assertThat(Map.empty().toString()).isEqualTo("Map()");
142+
assertThat(aMap.toString()).isEqualTo("Map(x->3,y->5,z->10)");
157143
}
158144

159145
@Test
160-
public void testKeys() throws Exception {
161-
assertEquals("Set()", Map.empty().keys().toString());
162-
assertEquals("Set(x,y,z)", aMap.keys().toString());
146+
public void testKeys() {
147+
assertThat(Map.empty().keys().toString()).isEqualTo("Set()");
148+
assertThat(aMap.keys().toString()).isEqualTo("Set(x,y,z)");
163149
}
164150

165151
@Test
166-
public void testValues() throws Exception {
167-
assertEquals("Set()", Map.empty().values().toString());
168-
assertEquals("Set(3,5,10)", aMap.values().toString());
152+
public void testValues() {
153+
assertThat(Map.empty().values().toString()).isEqualTo("Set()");
154+
assertThat(aMap.values().toString()).isEqualTo("Set(3,5,10)");
169155
}
170156

171157
@Test
172-
public void testMap() throws Exception {
173-
assertEquals("Map(x->-3,y->-5,z->-10)", aMap.map(Integers.negate).toString());
158+
public void testMap() {
159+
assertThat(aMap.map(Integers.negate).toString()).isEqualTo("Map(x->-3,y->-5,z->-10)");
174160
}
175-
176-
177161
}

‎src/test/java/org/highj/typeclass0/group/SemigroupTest.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,37 @@
33
import org.highj.data.List;
44
import org.junit.Test;
55

6-
import static junit.framework.Assert.assertEquals;
6+
import static org.assertj.core.api.Assertions.assertThat;
7+
78

89
public class SemigroupTest {
910
@Test
1011
public void testFirst() {
11-
Integer result = Semigroup.<Integer>first().fold(1, List.of(2,3,4,5));
12-
assertEquals(Integer.valueOf(1), result);
12+
Integer result = Semigroup.<Integer>first().fold(1, List.of(2, 3, 4, 5));
13+
assertThat(result).isEqualTo(Integer.valueOf(1));
1314
}
1415

1516
@Test
1617
public void testLast() {
17-
Integer result = Semigroup.<Integer>last().fold(1, List.of(2,3,4,5));
18-
assertEquals(Integer.valueOf(5), result);
18+
Integer result = Semigroup.<Integer>last().fold(1, List.of(2, 3, 4, 5));
19+
assertThat(result).isEqualTo(Integer.valueOf(5));
1920
}
2021

2122
@Test
2223
public void testDual() {
23-
Integer result = Semigroup.dual(Semigroup.<Integer>first()).fold(1, List.of(2,3,4,5));
24-
assertEquals(Integer.valueOf(5), result);
24+
Integer result = Semigroup.dual(Semigroup.<Integer>first()).fold(1, List.of(2, 3, 4, 5));
25+
assertThat(result).isEqualTo(Integer.valueOf(5));
2526
}
2627

2728
@Test
2829
public void testMin() {
29-
Integer result = Semigroup.<Integer>min().fold(27, List.of(25,11,64,57));
30-
assertEquals(Integer.valueOf(11), result);
30+
Integer result = Semigroup.<Integer>min().fold(27, List.of(25, 11, 64, 57));
31+
assertThat(result).isEqualTo(Integer.valueOf(11));
3132
}
3233

3334
@Test
3435
public void testMax() {
35-
Integer result = Semigroup.<Integer>max().fold(27, List.of(25,11,64,57));
36-
assertEquals(Integer.valueOf(64), result);
36+
Integer result = Semigroup.<Integer>max().fold(27, List.of(25, 11, 64, 57));
37+
assertThat(result).isEqualTo(Integer.valueOf(64));
3738
}
3839
}

0 commit comments

Comments
 (0)