feat: modified tests more in BoxerTest.java and modified code in Boxer.java. lesson_16 -JosephCaballero

Author: Josephcabs

lesson_16/objects/objects_app/src/main/java/com/codedifferently/lesson16/boxer/Boxer.java

@@ -61,10 +61,6 @@ public int getPower() {
     return power;
   }
 
-  public HashMap<String, Character> getFightHistory() {
-    return fights;
-  }
-
   public int getHealth() {
     return health;
   }
@@ -133,15 +129,6 @@ public void bout(Boxer boxer) throws BoxerIsRetiredException {
   public void setName(String name) {
     this.name = name;
   }
-
-  public void setFights(HashMap<String, Character> fights) {
-    this.fights = fights;
-  }
-
-  public void setPower(int power) {
-    this.power = power;
-  }
-
   public void setHealth(int health) {
     this.health = health;
   }
@@ -150,27 +137,7 @@ public BoxerStyle getSkillSet() {
     return skillSet;
   }
 
-  public void setSkillSet(BoxerStyle skillSet) {
-    this.skillSet = skillSet;
-  }
-
   public void setAbleToFight(boolean ableToFight) {
     this.ableToFight = ableToFight;
   }
-
-  public BoxerStyle[] getStyle() {
-    return style;
-  }
-
-  public void setStyle(BoxerStyle[] style) {
-    this.style = style;
-  }
-
-  public static Random getRand() {
-    return rand;
-  }
-
-  public static void setRand(Random rand) {
-    Boxer.rand = rand;
-  }
 }

lesson_16/objects/objects_app/src/test/java/com/codedifferently/lesson16/boxer/BoxerTest.java

@@ -1,42 +1,38 @@
 package com.codedifferently.lesson16.boxer;
 
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.codedifferently.lesson16.boxer.Boxer.BoxerHasNoFightsException;
 import com.codedifferently.lesson16.boxer.Boxer.BoxerIsRetiredException;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
 
 public class BoxerTest {
 
   Boxer boxer;
 
   @BeforeEach
   void setUp() {
-    boxer = new Boxer("Joseph", 100, 100);
+    boxer = new Boxer("Joseph", 99, 99);
   }
 
   @Test
-  void testWorkout() {
+  void testWorkout_addingTenPointsOfPower() {
     boxer.workout(10);
-    assertEquals(110, boxer.getPower());
+    assertEquals(109, boxer.getPower());
   }
 
   @Test
-  void testRest() {
+  void testRest_restingToIncreaseHealth() {
     int previousHealth = boxer.getHealth();
     boxer.rest();
     assertNotEquals(boxer.getHealth(), previousHealth);
   }
-
   @Test
-  void testGetHealth() {
-    assertEquals(100, boxer.getHealth());
-  }
-
-  @Test
-  void testGetFightHistory() throws BoxerHasNoFightsException, BoxerIsRetiredException {
+  void testGetFightHistory_makingAFighterToHaveABout() throws BoxerHasNoFightsException, BoxerIsRetiredException {
     Boxer mike = new Boxer("mike", 1000, 1000);
     boxer.bout(mike);
     assertEquals("You fought " + mike.getName() + " L", boxer.getFights());
@@ -54,20 +50,102 @@ void testIsAbleToFight_boxerIsNotAbleToFight() throws BoxerIsRetiredException {
   }
 
   @Test
-  void testBout_makingNewBoxerToFightAnother() throws BoxerIsRetiredException {
+  void testBout_makingNewBoxerToFightAnotherAndSeeTheResults() throws BoxerIsRetiredException {
     Boxer mike = new Boxer("Mike", 1000, 1000);
     boxer.bout(mike);
     assertEquals(false, boxer.getAbleToFight());
   }
 
   @Test
-  void testGetFightHistory_noFights() {
-    assertEquals(boxer.getHealth(), 100);
+  void testBout_makingNewBoxerToFightAndDraw() throws BoxerIsRetiredException, BoxerHasNoFightsException {
+    Boxer ryan = new Boxer("Ryan Garcia", 99, 99);
+    boxer.bout(ryan);
+    assertEquals(boxer.getFights(), "You fought Ryan Garcia D");
+  }
+
+  @Test
+  void testBout_makingNewBoxerToWinAgainstWithBoxer() throws BoxerIsRetiredException, BoxerHasNoFightsException {
+    Boxer hitman = new Boxer("Thomas Hearns", 98, 98);
+    boxer.bout(hitman);
+    assertEquals(boxer.getFights(), "You fought " + hitman.getName() + " W");
+  }
+
+  @Test
+  void testGetHealth() {
+    assertEquals(boxer.getHealth(), 99);
   }
 
   @Test
-  void testRollSkillSet() {
+  void testRollSkillSet_testingBasicIsNotWhatIsRolled() {
     boxer.rollSkillSet();
-    assertNotEquals(boxer.getStyle(), "BASIC");
+    assertNotEquals(boxer.getSkillSet(), "BASIC");
+  }
+
+  @Test
+  void testAddFights() throws BoxerIsRetiredException, BoxerHasNoFightsException {
+    boxer.addFights("Marvin Hagler", 'L');
+    assertEquals(boxer.getFights(), "You fought Marvin Hagler L");
+  }
+
+  @Test
+  void testAddFights_whenRetired() throws BoxerIsRetiredException {
+    boxer.retire();
+    assertThatThrownBy(
+            () -> {
+              boxer.addFights("lomachenko", 'W');
+            })
+        .isInstanceOf(BoxerIsRetiredException.class)
+        .hasMessage("Boxer is retired");
+  }
+
+  @Test
+  void testRetire_whenRetired() throws BoxerIsRetiredException {
+    boxer.retire();
+    assertThatThrownBy(
+            () -> {
+              boxer.retire();
+            })
+        .isInstanceOf(BoxerIsRetiredException.class)
+        .hasMessage("Boxer is already retired");
+  }
+
+  @Test
+  void testSetName() {
+    boxer.setName("Pablo");
+    assertEquals(boxer.getName(), "Pablo");
+  }
+
+  @Test
+  void testSetAbleToFight() {
+    boxer.setAbleToFight(false);
+    assertFalse(boxer.getAbleToFight());
+  }
+
+  @Test
+  void testSetHealth() {
+    boxer.setHealth(2);
+    assertEquals(boxer.getHealth(), 2);
+  }
+
+  @Test
+  void testBoxerIsRetiredException_retiringBoxerThenThrowingException() throws BoxerIsRetiredException {
+    Boxer leaonard = new Boxer("Sugar ray", 200, 200);
+    boxer.retire();
+    assertThatThrownBy(
+            () -> {
+              boxer.bout(leaonard);
+            })
+        .isInstanceOf(BoxerIsRetiredException.class)
+        .hasMessageContaining("Boxer is retired");
+  }
+
+  @Test
+  void testBoxerHasNoFightsException_gettingFightsWhenNoFightsHaveBeenHad() {
+    assertThatThrownBy(
+            () -> {
+              boxer.getFights();
+            })
+        .isInstanceOf(BoxerHasNoFightsException.class)
+        .hasMessageContaining("Boxer hasnt fought anyone");
   }
 }