Skip to content

Commit 054b1ea

Browse files
Resolves test failures
1 parent 44a654a commit 054b1ea

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

model-view-controller/src/main/java/com/iluwatar/model/view/controller/Fatigue.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
* Fatigue enumeration.
2828
*/
2929
public enum Fatigue {
30-
31-
ALERT("alert"), TIRED("tired"), SLEEPING("sleeping");
30+
ALERT("alert"),
31+
TIRED("tired"),
32+
SLEEPING("sleeping");
3233

3334
private final String title;
3435

model-view-controller/src/main/java/com/iluwatar/model/view/controller/Health.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
* Health enumeration.
2828
*/
2929
public enum Health {
30-
31-
HEALTHY("healthy"), WOUNDED("wounded"), DEAD("dead");
30+
HEALTHY("healthy"),
31+
WOUNDED("wounded"),
32+
DEAD("dead");
3233

3334
private final String title;
3435

model-view-controller/src/main/java/com/iluwatar/model/view/controller/Nourishment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,9 @@
2727
* Nourishment enumeration.
2828
*/
2929
public enum Nourishment {
30-
31-
SATURATED("saturated"), HUNGRY("hungry"), STARVING("starving");
30+
SATURATED("saturated"),
31+
HUNGRY("hungry"),
32+
STARVING("starving");
3233

3334
private final String title;
3435

model-view-controller/src/test/java/com/iluwatar/model/view/controller/GiantModelTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ public class GiantModelTest {
3939
*/
4040
@Test
4141
public void testSetHealth() {
42-
final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.HUNGRY);
42+
final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED);
4343
assertEquals(Health.HEALTHY, model.getHealth());
44+
var messageFormat = "The giant looks %s, alert and saturated.";
4445
for (final var health : Health.values()) {
4546
model.setHealth(health);
4647
assertEquals(health, model.getHealth());
47-
assertEquals("The giant looks " + health.toString() + ", alert and saturated.", model
48-
.toString());
48+
assertEquals(String.format(messageFormat, health), model.toString());
4949
}
5050
}
5151

@@ -54,13 +54,13 @@ public void testSetHealth() {
5454
*/
5555
@Test
5656
public void testSetFatigue() {
57-
final var model = new GiantModel(Health.WOUNDED, Fatigue.ALERT, Nourishment.SATURATED);
57+
final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED);
5858
assertEquals(Fatigue.ALERT, model.getFatigue());
59+
var messageFormat = "The giant looks healthy, %s and saturated.";
5960
for (final var fatigue : Fatigue.values()) {
6061
model.setFatigue(fatigue);
6162
assertEquals(fatigue, model.getFatigue());
62-
assertEquals("The giant looks healthy, " + fatigue.toString() + " and saturated.", model
63-
.toString());
63+
assertEquals(String.format(messageFormat, fatigue), model.toString());
6464
}
6565
}
6666

@@ -69,13 +69,13 @@ public void testSetFatigue() {
6969
*/
7070
@Test
7171
public void testSetNourishment() {
72-
final var model = new GiantModel(Health.HEALTHY, Fatigue.TIRED, Nourishment.SATURATED);
72+
final var model = new GiantModel(Health.HEALTHY, Fatigue.ALERT, Nourishment.SATURATED);
7373
assertEquals(Nourishment.SATURATED, model.getNourishment());
74+
var messageFormat = "The giant looks healthy, alert and %s.";
7475
for (final var nourishment : Nourishment.values()) {
7576
model.setNourishment(nourishment);
7677
assertEquals(nourishment, model.getNourishment());
77-
assertEquals("The giant looks healthy, alert and " + nourishment.toString() + ".", model
78-
.toString());
78+
assertEquals(String.format(messageFormat, nourishment), model.toString());
7979
}
8080
}
8181

0 commit comments

Comments
 (0)