From 8c0322651c0a72aead7ceb5c6c1b384ddab6923f Mon Sep 17 00:00:00 2001
From: bw-mutley <bw-mutley@users.noreply.github.com>
Date: Wed, 30 Mar 2022 01:11:22 -0300
Subject: [PATCH] Added tests for dice and equpment parser

---
 tests/test_character.py | 21 +++++++++++++++++++++
 tests/test_dice.py      | 20 +++++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/tests/test_character.py b/tests/test_character.py
index 77e4a15..e321659 100644
--- a/tests/test_character.py
+++ b/tests/test_character.py
@@ -233,6 +233,27 @@ class TestCharacter(TestCase):
         # Try passing an Armor object directly
         char.wield_shield(Shield)
         self.assertEqual(char.armor_class, 15)
+        
+    def test_carrying_weight(self):
+        char = Character(race="lightfoot halfling", strength=12)
+        # Check carrying capacity
+        self.assertEqual(char.carrying_capacity, 180)
+        # Check the armor weight is included
+        char.wear_armor(LeatherArmor())
+        self.assertEqual(char.carrying_weight, 10)
+        # Check the shield weight is included
+        char = Character()
+        char.wield_shield("shield")
+        self.assertEqual(char.carrying_weight, 6)
+        # Check the weight weapons at hand are included
+        char = Character()
+        char.wield_weapon("shortsword")
+        char.wield_weapon("dagger")
+        self.assertEqual(char.carrying_weight, 3)
+        # Check the listed equipment is included
+        char = Character()
+        char.equipment = "blanket, crowbar"
+        self.assertEqual(char.carrying_weight, 8)
 
     def test_speed(self):
         # Check that the speed pulls from the character's race
diff --git a/tests/test_dice.py b/tests/test_dice.py
index 10910a8..0af8fb6 100644
--- a/tests/test_dice.py
+++ b/tests/test_dice.py
@@ -15,6 +15,11 @@ class TestDice(TestCase):
         out = dice.read_dice_str("15d10")
         self.assertEqual(out.faces, 10)
         self.assertEqual(out.num, 15)
+        # Modifier
+        out = dice.read_dice_str("2d20 + 5")
+        self.assertEqual(out.faces, 20)
+        self.assertEqual(out.num, 2)
+        self.assertEqual(out.modifier, 5)
         # Check a bad value
         with self.assertRaises(DiceError):
             dice.read_dice_str("Ed15")
@@ -23,7 +28,20 @@ class TestDice(TestCase):
         self.assertEqual(dice.combine_dice("1d8 + 6 + 2d8 + 12"), "3d8 + 18")
         self.assertEqual(dice.combine_dice("1d8 + 1d5 + 2d8 + 1d5"), "2d5 + 3d8")
         
-
+    def test_dice_mean(self):
+        dd = dice.read_dice_str("1d10")
+        dd_mean = dice._dice_mean(dd)
+        self.assertEqual(dd_mean, 5.5)
+        dd = dice.read_dice_str("2d20+4")
+        dd_mean = dice._dice_mean(dd)
+        self.assertEqual(dd_mean, 25)
+        
+    def test_dice_roll_mean(self):
+        dd_mean = dice.dice_roll_mean("1d6")
+        self.assertEqual(dd_mean, 4)
+        dd_mean = dice.dice_roll_mean("2d20+2")
+        self.assertEqual(dd_mean, 23)
+        
     def test_simple_rolling(self):
         num_tests = 100
         for _ in range(num_tests):