Skip to content

Commit 705ded7

Browse files
mirkoperillomirkoperillo
committed
aligned all exercises to use assertj
* move booleans exercise to assertj * move inheritance exercise to assertj
1 parent e753a18 commit 705ded7

2 files changed

Lines changed: 57 additions & 50 deletions

File tree

‎exercises/concept/booleans/src/test/java/QuestLogicTest.java‎

Lines changed: 48 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
1-
import org.junit.Test;
21
import org.junit.Ignore;
3-
4-
import static org.junit.Assert.assertTrue;
5-
import static org.junit.Assert.assertFalse;
2+
import org.junit.Test;
3+
import static org.assertj.core.api.Assertions.assertThat;
64

75
public class QuestLogicTest {
86
@Test
97
public void cannot_execute_fast_attack_if_knight_is_awake() {
108
boolean knightIsAwake = true;
11-
assertFalse(QuestLogic.canFastAttack(knightIsAwake));
9+
assertThat(QuestLogic.canFastAttack(knightIsAwake)).isFalse();
1210
}
1311

1412
@Test
1513
@Ignore
1614
public void can_execute_fast_attack_if_knight_is_sleeping() {
1715
boolean knightIsAwake = false;
18-
assertTrue(QuestLogic.canFastAttack(knightIsAwake));
16+
assertThat(QuestLogic.canFastAttack(knightIsAwake)).isTrue();
1917
}
2018

2119
@Test
@@ -24,7 +22,7 @@ public void cannot_spy_if_everyone_is_sleeping() {
2422
boolean knightIsAwake = false;
2523
boolean archerIsAwake = false;
2624
boolean prisonerIsAwake = false;
27-
assertFalse(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake));
25+
assertThat(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake)).isFalse();
2826
}
2927

3028
@Test
@@ -33,7 +31,7 @@ public void can_spy_if_everyone_but_knight_is_sleeping() {
3331
boolean knightIsAwake = true;
3432
boolean archerIsAwake = false;
3533
boolean prisonerIsAwake = false;
36-
assertTrue(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake));
34+
assertThat(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake)).isTrue();
3735
}
3836

3937
@Test
@@ -42,18 +40,16 @@ public void can_spy_if_everyone_but_archer_is_sleeping() {
4240
boolean knightIsAwake = false;
4341
boolean archerIsAwake = true;
4442
boolean prisonerIsAwake = false;
45-
assertTrue(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake));
43+
assertThat(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake)).isTrue();
4644
}
4745

4846
@Test
4947
@Ignore
5048
public void can_spy_if_everyone_but_prisoner_is_sleeping() {
5149
boolean knightIsAwake = false;
5250
boolean archerIsAwake = false;
53-
54-
5551
boolean prisonerIsAwake = true;
56-
assertTrue(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake));
52+
assertThat(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake)).isTrue();
5753
}
5854

5955
@Test
@@ -62,7 +58,7 @@ public void can_spy_if_only_knight_is_sleeping() {
6258
boolean knightIsAwake = false;
6359
boolean archerIsAwake = true;
6460
boolean prisonerIsAwake = true;
65-
assertTrue(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake));
61+
assertThat(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake)).isTrue();
6662
}
6763

6864
@Test
@@ -71,7 +67,7 @@ public void can_spy_if_only_archer_is_sleeping() {
7167
boolean knightIsAwake = true;
7268
boolean archerIsAwake = false;
7369
boolean prisonerIsAwake = true;
74-
assertTrue(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake));
70+
assertThat(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake)).isTrue();
7571
}
7672

7773
@Test
@@ -80,7 +76,7 @@ public void can_spy_if_only_prisoner_is_sleeping() {
8076
boolean knightIsAwake = true;
8177
boolean archerIsAwake = true;
8278
boolean prisonerIsAwake = false;
83-
assertTrue(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake));
79+
assertThat(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake)).isTrue();
8480
}
8581

8682
@Test
@@ -89,39 +85,39 @@ public void can_spy_if_everyone_is_awake() {
8985
boolean knightIsAwake = true;
9086
boolean archerIsAwake = true;
9187
boolean prisonerIsAwake = true;
92-
assertTrue(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake));
88+
assertThat(QuestLogic.canSpy(knightIsAwake, archerIsAwake, prisonerIsAwake)).isTrue();
9389
}
9490

9591
@Test
9692
@Ignore
9793
public void can_signal_prisoner_ifarcher_is_sleeping_and_prisoner_is_awake() {
9894
boolean archerIsAwake = false;
9995
boolean prisonerIsAwake = true;
100-
assertTrue(QuestLogic.canSignalPrisoner(archerIsAwake, prisonerIsAwake));
96+
assertThat(QuestLogic.canSignalPrisoner(archerIsAwake, prisonerIsAwake)).isTrue();
10197
}
10298

10399
@Test
104100
@Ignore
105101
public void cannot_signal_prisoner_ifarcher_is_awake_and_prisoner_is_sleeping() {
106102
boolean archerIsAwake = true;
107103
boolean prisonerIsAwake = false;
108-
assertFalse(QuestLogic.canSignalPrisoner(archerIsAwake, prisonerIsAwake));
104+
assertThat(QuestLogic.canSignalPrisoner(archerIsAwake, prisonerIsAwake)).isFalse();
109105
}
110106

111107
@Test
112108
@Ignore
113109
public void cannot_signal_prisoner_ifarcher_and_prisoner_are_both_sleeping() {
114110
boolean archerIsAwake = false;
115111
boolean prisonerIsAwake = false;
116-
assertFalse(QuestLogic.canSignalPrisoner(archerIsAwake, prisonerIsAwake));
112+
assertThat(QuestLogic.canSignalPrisoner(archerIsAwake, prisonerIsAwake)).isFalse();
117113
}
118114

119115
@Test
120116
@Ignore
121117
public void cannot_signal_prisoner_ifarcher_and_prisoner_are_both_awake() {
122118
boolean archerIsAwake = true;
123119
boolean prisonerIsAwake = true;
124-
assertFalse(QuestLogic.canSignalPrisoner(archerIsAwake, prisonerIsAwake));
120+
assertThat(QuestLogic.canSignalPrisoner(archerIsAwake, prisonerIsAwake)).isFalse();
125121
}
126122

127123
@Test
@@ -131,7 +127,8 @@ public void cannot_release_prisoner_if_everyone_is_awake_and_pet_dog_is_present(
131127
boolean archerIsAwake = true;
132128
boolean prisonerIsAwake = true;
133129
boolean petDogIsPresent = true;
134-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
130+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
131+
prisonerIsAwake, petDogIsPresent)).isFalse();
135132
}
136133

137134
@Test
@@ -141,7 +138,8 @@ public void cannot_release_prisoner_if_everyone_is_awake_and_pet_dog_is_absent()
141138
boolean archerIsAwake = true;
142139
boolean prisonerIsAwake = true;
143140
boolean petDogIsPresent = false;
144-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
141+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
142+
prisonerIsAwake, petDogIsPresent)).isFalse();
145143
}
146144

147145
@Test
@@ -151,7 +149,8 @@ public void can_release_prisoner_if_everyone_is_asleep_and_pet_dog_is_present()
151149
boolean archerIsAwake = false;
152150
boolean prisonerIsAwake = false;
153151
boolean petDogIsPresent = true;
154-
assertTrue(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
152+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
153+
prisonerIsAwake, petDogIsPresent)).isTrue();
155154
}
156155

157156
@Test
@@ -161,7 +160,8 @@ public void cannot_release_prisoner_if_everyone_is_asleep_and_pet_dog_is_absent(
161160
boolean archerIsAwake = false;
162161
boolean prisonerIsAwake = false;
163162
boolean petDogIsPresent = false;
164-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
163+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
164+
prisonerIsAwake, petDogIsPresent)).isFalse();
165165
}
166166

167167
@Test
@@ -171,7 +171,8 @@ public void can_release_prisoner_if_only_prisoner_is_awake_and_pet_dog_is_presen
171171
boolean archerIsAwake = false;
172172
boolean prisonerIsAwake = true;
173173
boolean petDogIsPresent = true;
174-
assertTrue(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
174+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
175+
prisonerIsAwake, petDogIsPresent)).isTrue();
175176
}
176177

177178
@Test
@@ -181,7 +182,8 @@ public void can_release_prisoner_if_only_prisoner_is_awake_and_pet_dog_is_absent
181182
boolean archerIsAwake = false;
182183
boolean prisonerIsAwake = true;
183184
boolean petDogIsPresent = false;
184-
assertTrue(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
185+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
186+
prisonerIsAwake, petDogIsPresent)).isTrue();
185187
}
186188

187189
@Test
@@ -191,7 +193,8 @@ public void cannot_release_prisoner_if_only_archer_is_awake_and_pet_dog_is_prese
191193
boolean archerIsAwake = true;
192194
boolean prisonerIsAwake = false;
193195
boolean petDogIsPresent = true;
194-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
196+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
197+
prisonerIsAwake, petDogIsPresent)).isFalse();
195198
}
196199

197200
@Test
@@ -201,7 +204,8 @@ public void cannot_release_prisoner_if_only_archer_is_awake_and_pet_dog_is_absen
201204
boolean archerIsAwake = true;
202205
boolean prisonerIsAwake = false;
203206
boolean petDogIsPresent = false;
204-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
207+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
208+
prisonerIsAwake, petDogIsPresent)).isFalse();
205209
}
206210

207211
@Test
@@ -211,7 +215,8 @@ public void can_release_prisoner_if_only_knight_is_awake_and_pet_dog_is_present(
211215
boolean archerIsAwake = false;
212216
boolean prisonerIsAwake = false;
213217
boolean petDogIsPresent = true;
214-
assertTrue(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
218+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
219+
prisonerIsAwake, petDogIsPresent)).isTrue();
215220
}
216221

217222
@Test
@@ -221,7 +226,8 @@ public void cannot_release_prisoner_if_only_knight_is_awake_and_pet_dog_is_absen
221226
boolean archerIsAwake = false;
222227
boolean prisonerIsAwake = false;
223228
boolean petDogIsPresent = false;
224-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
229+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
230+
prisonerIsAwake, petDogIsPresent)).isFalse();
225231
}
226232

227233
@Test
@@ -231,7 +237,8 @@ public void cannot_release_prisoner_if_only_knight_is_asleep_and_pet_dog_is_pres
231237
boolean archerIsAwake = true;
232238
boolean prisonerIsAwake = true;
233239
boolean petDogIsPresent = true;
234-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
240+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
241+
prisonerIsAwake, petDogIsPresent)).isFalse();
235242
}
236243

237244
@Test
@@ -241,7 +248,8 @@ public void cannot_release_prisoner_if_only_knight_is_asleep_and_pet_dog_is_abse
241248
boolean archerIsAwake = true;
242249
boolean prisonerIsAwake = true;
243250
boolean petDogIsPresent = false;
244-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
251+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
252+
prisonerIsAwake, petDogIsPresent)).isFalse();
245253
}
246254

247255
@Test
@@ -251,7 +259,8 @@ public void can_release_prisoner_if_only_archer_is_asleep_and_pet_dog_is_present
251259
boolean archerIsAwake = false;
252260
boolean prisonerIsAwake = true;
253261
boolean petDogIsPresent = true;
254-
assertTrue(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
262+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
263+
prisonerIsAwake, petDogIsPresent)).isTrue();
255264
}
256265

257266
@Test
@@ -261,7 +270,8 @@ public void cannot_release_prisoner_if_only_archer_is_asleep_and_pet_dog_is_abse
261270
boolean archerIsAwake = false;
262271
boolean prisonerIsAwake = true;
263272
boolean petDogIsPresent = false;
264-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
273+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
274+
prisonerIsAwake, petDogIsPresent)).isFalse();
265275
}
266276

267277
@Test
@@ -271,7 +281,8 @@ public void cannot_release_prisoner_if_only_prisoner_is_asleep_and_pet_dog_is_pr
271281
boolean archerIsAwake = true;
272282
boolean prisonerIsAwake = false;
273283
boolean petDogIsPresent = true;
274-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
284+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
285+
prisonerIsAwake, petDogIsPresent)).isFalse();
275286
}
276287

277288
@Test
@@ -281,6 +292,7 @@ public void cannot_release_prisoner_if_only_prisoner_is_asleep_and_pet_dog_is_ab
281292
boolean archerIsAwake = true;
282293
boolean prisonerIsAwake = false;
283294
boolean petDogIsPresent = false;
284-
assertFalse(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake, prisonerIsAwake, petDogIsPresent));
295+
assertThat(QuestLogic.canFreePrisoner(knightIsAwake, archerIsAwake,
296+
prisonerIsAwake, petDogIsPresent)).isFalse();
285297
}
286298
}

‎exercises/concept/inheritance/src/test/java/FighterTest.java‎

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,49 @@
11
import org.junit.Ignore;
22
import org.junit.Test;
33

4-
import static org.junit.Assert.*;
4+
import static org.assertj.core.api.Assertions.assertThat;
55

66
public class FighterTest {
77

88
@Test
99
public void testToString() {
1010
Fighter warrior = new Warrior();
11-
assertEquals("Fighter is a Warrior", warrior.toString());
11+
assertThat(warrior.toString()).isEqualTo("Fighter is a Warrior");
1212
}
1313

1414
@Ignore("Remove to run the test")
1515
@Test
1616
public void testFighterVulnerableByDefault() {
1717
Fighter warrior = new Warrior();
18-
assertFalse("The fighter shouldn't be vulnerable by default", warrior.isVulnerable());
18+
assertThat(warrior.isVulnerable()).isFalse();
1919
}
2020

2121
@Ignore("Remove to run the test")
2222
@Test
2323
public void testWizardVulnerable() {
2424
Wizard wizard = new Wizard();
25-
assertTrue("", wizard.isVulnerable());
26-
25+
assertThat(wizard.isVulnerable()).isTrue();
2726
wizard.prepareSpell();
28-
assertFalse("The wizard shouldn't be vulnerable after preparing the spell", wizard.isVulnerable());
27+
assertThat(wizard.isVulnerable()).isFalse();
2928
}
3029

3130
@Ignore("Remove to run the test")
3231
@Test
3332
public void testWizardsDamagePoints() {
3433
Wizard wizard = new Wizard();
3534
Warrior warrior = new Warrior();
36-
37-
assertEquals(3, wizard.damagePoints(warrior));
38-
35+
assertThat(wizard.damagePoints(warrior)).isEqualTo(3);
3936
wizard.prepareSpell();
40-
assertEquals(12, wizard.damagePoints(warrior));
37+
assertThat(wizard.damagePoints(warrior)).isEqualTo(12);
4138
}
4239

4340
@Ignore("Remove to run the test")
4441
@Test
4542
public void testWarriorsDamagePoints() {
4643
Warrior warrior = new Warrior();
4744
Wizard wizard = new Wizard();
48-
49-
assertEquals(10, warrior.damagePoints(wizard));
50-
45+
assertThat(warrior.damagePoints(wizard)).isEqualTo(10);
5146
wizard.prepareSpell();
52-
assertEquals(6, warrior.damagePoints(wizard));
47+
assertThat(warrior.damagePoints(wizard)).isEqualTo(6);
5348
}
5449
}

0 commit comments

Comments
 (0)