Finished TDD page

Author: ChrisBarker-NOAA

source/examples/test_driven_development/roman16.py

@@ -10,19 +10,19 @@
 
 import pytest
 
-roman_numeral_map = (('M',  1000),
+roman_numeral_map = (('M', 1000),
                      ('CM', 900),
-                     ('D',  500),
+                     ('D', 500),
                      ('CD', 400),
-                     ('C',  100),
+                     ('C', 100),
                      ('XC', 90),
-                     ('L',  50),
+                     ('L', 50),
                      ('XL', 40),
-                     ('X',  10),
+                     ('X', 10),
                      ('IX', 9),
-                     ('V',  5),
+                     ('V', 5),
                      ('IV', 4),
-                     ('I',  1))
+                     ('I', 1))
 
 
 def to_roman(n):
@@ -63,9 +63,9 @@ def is_valid_roman_numeral(s):
     print("the hundreds")
     print(f"{s = }")
     # there can be only one of CM, CD, or D:
-    if s[:2] == "CM": # 900
+    if s[:2] == "CM":  # 900
         s = s[2:]
-    elif s[:2] == "CD": # 400
+    elif s[:2] == "CD":  # 400
         s = s[2:]
     else:
         if s[:1] == "D":  # 500

source/examples/test_driven_development/roman17.py

@@ -10,19 +10,19 @@
 
 import pytest
 
-roman_numeral_map = (('M',  1000),
+roman_numeral_map = (('M', 1000),
                      ('CM', 900),
-                     ('D',  500),
+                     ('D', 500),
                      ('CD', 400),
-                     ('C',  100),
+                     ('C', 100),
                      ('XC', 90),
-                     ('L',  50),
+                     ('L', 50),
                      ('XL', 40),
-                     ('X',  10),
+                     ('X', 10),
                      ('IX', 9),
-                     ('V',  5),
+                     ('V', 5),
                      ('IV', 4),
-                     ('I',  1))
+                     ('I', 1))
 
 
 def to_roman(n):
@@ -47,25 +47,15 @@ def is_valid_roman_numeral(s):
     looking for valid characters and removing them to determine
     if this is, indeed, a valid Roman numeral
     """
-    # first check if uses only valid characters
-    for c in s:
-        if c not in "MDCLXVI":
-            return False
-
-    print("starting to parse")
-    print("the thousands")
-    print(f"{s = }")
     # first look for the thousands -- up to three Ms
     for _ in range(3):
         if s[:1] == "M":
             s = s[1:]
     # then look for the hundreds:
-    print("the hundreds")
-    print(f"{s = }")
     # there can be only one of CM, CD, or D:
-    if s[:2] == "CM": # 900
+    if s[:2] == "CM":  # 900
         s = s[2:]
-    elif s[:2] == "CD": # 400
+    elif s[:2] == "CD":  # 400
         s = s[2:]
     else:
         if s[:1] == "D":  # 500
@@ -75,8 +65,6 @@ def is_valid_roman_numeral(s):
             if s[:1] == "C":
                 s = s[1:]
     # now the tens
-    print("the tens")
-    print(f"{s = }")
     # There can be one of either XC, XL or L
     if s[:2] == "XC":  # 90
         s = s[2:]
@@ -90,8 +78,6 @@ def is_valid_roman_numeral(s):
             if s[:1] == "X":
                 s = s[1:]
     # and the ones
-    print("the ones")
-    print(f"{s = }")
     # There can be one of IX, IV or V
     if s[:2] == "IX":  # 9
         s = s[2:]
@@ -100,15 +86,11 @@ def is_valid_roman_numeral(s):
     else:
         if s[:1] == "V":  # 5
             s = s[1:]
-        print("looking for the Is")
-        print(f"{s = }")
         # There can be up to three Is
         for _ in range(3):
             if s[:1] == "I":  # 1
                 s = s[1:]
     # if there is anything left, it's not a valid Roman numeral
-    print("done")
-    print(f"{s = }")
     if s:
         return False
     else:
@@ -125,7 +107,6 @@ def from_roman(s):
         while s[index:index + len(numeral)] == numeral:
             result += integer
             index += len(numeral)
-            # print(f'found, {numeral} of length, {len(numeral)} adding {integer}')
     return result
 
 
@@ -203,27 +184,27 @@ def test_to_roman_known_values():
 
 def test_too_large():
     """
-    to_roman should raise an ValueError when passed
+    to_roman should raise a ValueError when passed
     values over 3999
     """
     with pytest.raises(ValueError):
         to_roman(4000)
 
 
 def test_zero():
-    """to_roman should raise an ValueError with 0 input"""
+    """to_roman should raise a ValueError with 0 input"""
     with pytest.raises(ValueError):
         to_roman(0)
 
 
 def test_negative():
-    """to_roman should raise an ValueError with negative input"""
+    """to_roman should raise a ValueError with negative input"""
     with pytest.raises(ValueError):
         to_roman(-1)
 
 
 def test_non_integer():
-    """to_roman should raise an ValueError with non-integer input"""
+    """to_roman should raise a ValueError with non-integer input"""
     with pytest.raises(ValueError):
         to_roman(0.5)
 
@@ -232,8 +213,10 @@ def test_float_with_integer_value():
     """to_roman should work for floats with integer values"""
     assert to_roman(3.0) == "III"
 
+
 # ####################
 # Tests for from_roman
+# ####################
 
 
 def test_from_roman_known_values():
@@ -251,7 +234,6 @@ def test_roundtrip():
         assert integer == result
 
 
-# #####################
 # The following to test for valid roman numerals
 
 def test_invalid_character():
@@ -290,5 +272,3 @@ def test_malformed_antecedents():
         with pytest.raises(ValueError):
             print(f"trying: {s}")
             from_roman(s)
-
-