Reorganized tests

Author: Bernardo-MG

tests/parser/dice/__init__.py

@@ -3,7 +3,6 @@
 import sys
 import unittest
 
-from dice_notation.dice import Rollable
 from dice_notation.parser import DiceParser
 
 """
@@ -87,81 +86,3 @@ def test_max(self):
 
         self.assertEqual(sys.maxsize, dice.quantity)
         self.assertEqual(sys.maxsize, dice.sides)
-
-
-class TestDiceBinaryOperation(unittest.TestCase):
-    """
-    Tests that the parser can work with pure numeric operations.
-    """
-
-    def setUp(self):
-        """
-        Here the tests environment would be prepared.
-        """
-        self.parser = DiceParser()
-
-    def test_add(self):
-        """
-        Tests that numeric additions are done correctly.
-        """
-        result = self.parser.parse("1d6+2d20")
-
-        dice_left = result.left
-        dice_right = result.right
-
-        self.assertEqual(1, dice_left.quantity)
-        self.assertEqual(6, dice_left.sides)
-
-        self.assertEqual(2, dice_right.quantity)
-        self.assertEqual(20, dice_right.sides)
-
-    def test_sub(self):
-        """
-        Tests that numeric subtractions are done correctly.
-        """
-        result = self.parser.parse("3d12-1D6")
-
-        dice_left = result.left
-        dice_right = result.right
-
-        self.assertEqual(3, dice_left.quantity)
-        self.assertEqual(12, dice_left.sides)
-
-        self.assertEqual(1, dice_right.quantity)
-        self.assertEqual(6, dice_right.sides)
-
-
-class TestRollable(unittest.TestCase):
-    """
-    Tests that the parser can work with pure numeric operations.
-    """
-
-    def setUp(self):
-        """
-        Here the tests environment would be prepared.
-        """
-        self.parser = DiceParser()
-
-    def test_simpleDice_rollable(self):
-        """
-        Tests that a simple dice notation can be parsed.
-        """
-        dice = self.parser.parse("1d6")
-
-        self.assertTrue(isinstance(dice, Rollable))
-
-    def test_add_rollable(self):
-        """
-        Tests that numeric additions are done correctly.
-        """
-        result = self.parser.parse("1d6+2d20")
-
-        self.assertTrue(isinstance(result, Rollable))
-
-    def test_sub_rollable(self):
-        """
-        Tests that numeric subtractions are done correctly.
-        """
-        result = self.parser.parse("3d12-1D6")
-
-        self.assertTrue(isinstance(result, Rollable))

tests/parser/test_dice_parser_dice.py …sts/parser/dice/test_dice_parser_dice.pytests/parser/test_dice_parser_dice.py renamed to tests/parser/dice/test_dice_parser_dice.py tests/parser/test_dice_parser_dice.py renamed to tests/parser/dice/test_dice_parser_dice.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+
+from dice_notation.parser import DiceParser
+
+"""
+Dice parser tests for expressions only containing dice.
+"""
+
+__author__ = 'Bernardo Martínez Garrido'
+__license__ = 'MIT'
+
+
+class TestDiceBinaryOperation(unittest.TestCase):
+    """
+    Tests that the parser can work with pure numeric operations.
+    """
+
+    def setUp(self):
+        """
+        Here the tests environment would be prepared.
+        """
+        self.parser = DiceParser()
+
+    def test_add(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("1d6+2d20")
+
+        dice_left = result.left
+        dice_right = result.right
+
+        self.assertEqual(1, dice_left.quantity)
+        self.assertEqual(6, dice_left.sides)
+
+        self.assertEqual(2, dice_right.quantity)
+        self.assertEqual(20, dice_right.sides)
+
+    def test_sub(self):
+        """
+        Tests that numeric subtractions are done correctly.
+        """
+        result = self.parser.parse("3d12-1D6")
+
+        dice_left = result.left
+        dice_right = result.right
+
+        self.assertEqual(3, dice_left.quantity)
+        self.assertEqual(12, dice_left.sides)
+
+        self.assertEqual(1, dice_right.quantity)
+        self.assertEqual(6, dice_right.sides)

tests/parser/dice/test_dice_parser_dice_binary_operation.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+
+from dice_notation.dice import Rollable
+from dice_notation.parser import DiceParser
+
+"""
+Dice parser tests for expressions only containing dice.
+"""
+
+__author__ = 'Bernardo Martínez Garrido'
+__license__ = 'MIT'
+
+
+class TestRollable(unittest.TestCase):
+    """
+    Tests that the parser can work with pure numeric operations.
+    """
+
+    def setUp(self):
+        """
+        Here the tests environment would be prepared.
+        """
+        self.parser = DiceParser()
+
+    def test_simpleDice_rollable(self):
+        """
+        Tests that a simple dice notation can be parsed.
+        """
+        dice = self.parser.parse("1d6")
+
+        self.assertTrue(isinstance(dice, Rollable))
+
+    def test_add_rollable(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("1d6+2d20")
+
+        self.assertTrue(isinstance(result, Rollable))
+
+    def test_sub_rollable(self):
+        """
+        Tests that numeric subtractions are done correctly.
+        """
+        result = self.parser.parse("3d12-1D6")
+
+        self.assertTrue(isinstance(result, Rollable))

tests/parser/dice/test_dice_parser_dice_rollable.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+
+from dice_notation.parser import DiceParser
+
+"""
+Dice parser tests for purely numeric expressions.
+"""
+
+__author__ = 'Bernardo Martínez Garrido'
+__license__ = 'MIT'
+
+
+class TestNumber(unittest.TestCase):
+    """
+    Tests that the parser can work with pure numeric operations.
+    """
+
+    def setUp(self):
+        """
+        Here the tests environment would be prepared.
+        """
+        self.parser = DiceParser()
+
+    def test_positive(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("5")
+
+        self.assertEqual(5, result)
+
+    def test_zero(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("0")
+
+        self.assertEqual(0, result)
+
+    def test_negative(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("-5")
+
+        # TODO: currently not supported
+        # self.assertEqual(-5, result)

tests/parser/number/__init__.py

@@ -0,0 +1,69 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+
+from dice_notation.parser import DiceParser
+
+"""
+Dice parser tests for purely numeric expressions.
+"""
+
+__author__ = 'Bernardo Martínez Garrido'
+__license__ = 'MIT'
+
+
+class TestAdd(unittest.TestCase):
+    """
+    Tests that the parser can work with pure numeric operations.
+    """
+
+    def setUp(self):
+        """
+        Here the tests environment would be prepared.
+        """
+        self.parser = DiceParser()
+
+    def test_add(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("1+2")
+
+        self.assertEqual(3, result)
+
+    def test_add_toNegative(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("-1+2")
+
+        # TODO: currently not supported
+        # self.assertEqual(1, result)
+
+
+class TestAddLong(unittest.TestCase):
+    """
+    Tests that the parser can work with pure numeric operations.
+    """
+
+    def setUp(self):
+        """
+        Here the tests environment would be prepared.
+        """
+        self.parser = DiceParser()
+
+    def test_longAdd(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("1+2+3")
+
+        self.assertEqual(6, result)
+
+    def test_longerAdd(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("1+2+3+4+5")
+
+        self.assertEqual(15, result)

tests/parser/number/test_dice_parser_number.py

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+
+import unittest
+
+from dice_notation.parser import DiceParser
+
+"""
+Dice parser tests for purely numeric expressions.
+"""
+
+__author__ = 'Bernardo Martínez Garrido'
+__license__ = 'MIT'
+
+
+class TestNumericBinaryOperationMixed(unittest.TestCase):
+    """
+    Tests that the parser can work with pure numeric operations.
+    """
+
+    def setUp(self):
+        """
+        Here the tests environment would be prepared.
+        """
+        self.parser = DiceParser()
+
+    def test_addAndSub(self):
+        """
+        Tests that numeric additions are done correctly.
+        """
+        result = self.parser.parse("1+2-3")
+
+        self.assertEqual(0, result)
+
+    def test_subAndAdd(self):
+        """
+        Tests that numeric subtractions are done correctly.
+        """
+        result = self.parser.parse("3-1+2")
+
+        self.assertEqual(4, result)