@@ -39,13 +39,13 @@ public class GiantModelTest {
39
39
*/
40
40
@ Test
41
41
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 );
43
43
assertEquals (Health .HEALTHY , model .getHealth ());
44
+ var messageFormat = "The giant looks %s, alert and saturated." ;
44
45
for (final var health : Health .values ()) {
45
46
model .setHealth (health );
46
47
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 ());
49
49
}
50
50
}
51
51
@@ -54,13 +54,13 @@ public void testSetHealth() {
54
54
*/
55
55
@ Test
56
56
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 );
58
58
assertEquals (Fatigue .ALERT , model .getFatigue ());
59
+ var messageFormat = "The giant looks healthy, %s and saturated." ;
59
60
for (final var fatigue : Fatigue .values ()) {
60
61
model .setFatigue (fatigue );
61
62
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 ());
64
64
}
65
65
}
66
66
@@ -69,13 +69,13 @@ public void testSetFatigue() {
69
69
*/
70
70
@ Test
71
71
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 );
73
73
assertEquals (Nourishment .SATURATED , model .getNourishment ());
74
+ var messageFormat = "The giant looks healthy, alert and %s." ;
74
75
for (final var nourishment : Nourishment .values ()) {
75
76
model .setNourishment (nourishment );
76
77
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 ());
79
79
}
80
80
}
81
81
0 commit comments