Update Repetition and number element test cases

Re changes to Repetition and Integer *max* constructor arguments.

Author: drmfinlay

documentation/test_grammar_elements_basic_doctest.txt

@@ -178,7 +178,7 @@ Basic usage::
 Exact number of repetitions::
 
     >>> seq = Sequence([Literal("hello"), Literal("world")])
-    >>> rep = Repetition(seq, min=3, max=None, optimize=False)
+    >>> rep = Repetition(seq, min=3, max=3, optimize=False)
     >>> test_rep = ElementTester(rep)
     >>> test_rep.recognize("hello world")
     RecognitionFailure
@@ -189,12 +189,12 @@ Exact number of repetitions::
     >>> test_rep.recognize("hello world hello world hello world hello world")
     RecognitionFailure
 
-min must be less than max::
+min must be less than or equal to max::
 
-    >>> rep = Repetition(Literal("hello"), min=3, max=3, optimize=False)
+    >>> rep = Repetition(Literal("hello"), min=4, max=3, optimize=False)
     Traceback (most recent call last):
       ...
-    AssertionError: min must be less than max
+    AssertionError: min must be less than or equal to max
 
 
 Modifier element class

documentation/test_recobs_doctest.txt

@@ -88,7 +88,7 @@ Simple literal element recognitions::
 
 Integer element recognitions::
 
-    >>> test_int = ElementTester(Integer(min=1, max=100))
+    >>> test_int = ElementTester(Integer(min=1, max=99))
     >>> test_int.recognize("seven")
     7
     >>> test_recobs.waiting, test_recobs.words

dragonfly/test/test_language_en_number.py

@@ -67,10 +67,10 @@ def _build_element(self):
                    ]
 
 
-class Limit3to14TestCase(ElementTestCase):
-    """ Verify integer limits of range 3 -- 14. """
+class Limit3to13TestCase(ElementTestCase):
+    """ Verify integer limits of range 3 -- 13. """
     def _build_element(self):
-        return Integer(content=IntegerContent, min=3, max=14)
+        return Integer(content=IntegerContent, min=3, max=13)
     input_output = [
                     ("oh",         RecognitionFailure),
                     ("zero",       RecognitionFailure),
@@ -96,10 +96,10 @@ def _build_element(self):
                    ]
 
 
-class Limit23to47TestCase(ElementTestCase):
-    """ Verify integer limits of range 23 -- 47. """
+class Limit23to46TestCase(ElementTestCase):
+    """ Verify integer limits of range 23 -- 46. """
     def _build_element(self):
-        return Integer(content=IntegerContent, min=23, max=47)
+        return Integer(content=IntegerContent, min=23, max=46)
     input_output = [
                     ("twenty two",        RecognitionFailure),
                     ("twenty three",      23),
@@ -108,10 +108,10 @@ def _build_element(self):
                    ]
 
 
-class Limit230to350TestCase(ElementTestCase):
-    """ Verify integer limits of range 230 -- 350. """
+class Limit230to349TestCase(ElementTestCase):
+    """ Verify integer limits of range 230 -- 349. """
     def _build_element(self):
-        return Integer(content=IntegerContent, min=230, max=350)
+        return Integer(content=IntegerContent, min=230, max=349)
     input_output = [
                     ("two hundred twenty nine",     RecognitionFailure),
                     ("two hundred thirty",          230),
@@ -125,10 +125,10 @@ def _build_element(self):
                    ]
 
 
-class Limit351TestCase(ElementTestCase):
-    """ Verify integer limits of range up to 351. """
+class Limit350TestCase(ElementTestCase):
+    """ Verify integer limits of range up to 350. """
     def _build_element(self):
-        return Integer(content=IntegerContent, min=230, max=351)
+        return Integer(content=IntegerContent, min=230, max=350)
     input_output = [
                     ("three hundred forty nine",    349),
                     ("three hundred fifty",         350),
@@ -137,10 +137,10 @@ def _build_element(self):
                    ]
 
 
-class Limit352TestCase(ElementTestCase):
-    """ Verify integer limits of range up to 352. """
+class Limit351TestCase(ElementTestCase):
+    """ Verify integer limits of range up to 351. """
     def _build_element(self):
-        return Integer(content=IntegerContent, min=230, max=352)
+        return Integer(content=IntegerContent, min=230, max=351)
     input_output = [
                     ("three hundred forty nine",    349),
                     ("three hundred fifty",         350),
@@ -153,7 +153,7 @@ def _build_element(self):
 class DigitsTestCase(ElementTestCase):
     """ Verify that digits between 0 and 10 can be recognized. """
     def _build_element(self):
-        return Digits(content=DigitsContent, min=1, max=6)
+        return Digits(content=DigitsContent, min=1, max=5)
     input_output = [
                     ("zero",                                           [0]),
                     ("oh",                                             [0]),
@@ -182,7 +182,7 @@ def _build_element(self):
 class DigitsAsIntTestCase(ElementTestCase):
     """ Verify that Digits used with as_int=True gives correct values. """
     def _build_element(self):
-        return Digits(content=DigitsContent, min=1, max=6, as_int=True)
+        return Digits(content=DigitsContent, min=1, max=5, as_int=True)
     input_output = [
                     ("zero",                                             0),
                     ("oh",                                               0),