cleanup, last chapter

kyclark · kyclark · commit 2e94f789f7a5 · 2020-02-25T20:04:32.000-07:00
diff --git a/05_howler/test.py b/05_howler/test.py
@@ -37,7 +37,7 @@ def test_usage():
     """usage"""
 
     for flag in ['-h', '--help']:
-        rv, out = getstatusoutput('{} {}'.format(prg, flag))
+        rv, out = getstatusoutput(f'{prg} {flag}')
         assert rv == 0
         assert re.match("usage", out, re.IGNORECASE)
 
diff --git a/06_wc/test.py b/06_wc/test.py
@@ -24,7 +24,7 @@ def test_usage():
     """usage"""
 
     for flag in ['-h', '--help']:
-        rv, out = getstatusoutput('{} {}'.format(prg, flag))
+        rv, out = getstatusoutput(f'{prg} {flag}')
         assert rv == 0
         assert re.match("usage", out, re.IGNORECASE)
 
@@ -42,7 +42,7 @@ def test_bad_file():
     """bad_file"""
 
     bad = random_string()
-    rv, out = getstatusoutput('{} {}'.format(prg, bad))
+    rv, out = getstatusoutput(f'{prg} {bad}')
     assert rv != 0
     assert re.search(f"No such file or directory: '{bad}'", out)
 
@@ -51,8 +51,7 @@ def test_bad_file():
 def test_empty():
     """Test on empty"""
 
-    rv, out = getstatusoutput('{} ./empty.txt'.format(prg))
-
+    rv, out = getstatusoutput(f'{prg} ./empty.txt')
     assert rv == 0
     assert out.rstrip() == '       0       0       0 ./empty.txt'
 
@@ -61,8 +60,7 @@ def test_empty():
 def test_one():
     """Test on one"""
 
-    rv, out = getstatusoutput('{} ./one.txt'.format(prg))
-
+    rv, out = getstatusoutput(f'{prg} ./one.txt')
     assert rv == 0
     assert out.rstrip() == '       1       1       2 ./one.txt'
 
@@ -71,8 +69,7 @@ def test_one():
 def test_two():
     """Test on two"""
 
-    rv, out = getstatusoutput('{} ./two.txt'.format(prg))
-
+    rv, out = getstatusoutput(f'{prg} ./two.txt')
     assert rv == 0
     assert out.rstrip() == '       2       2       4 ./two.txt'
 
@@ -81,8 +78,7 @@ def test_two():
 def test_fox():
     """Test on fox"""
 
-    rv, out = getstatusoutput('{} {}'.format(prg, fox))
-
+    rv, out = getstatusoutput(f'{prg} {fox}')
     assert rv == 0
     assert out.rstrip() == '       1       9      45 ../inputs/fox.txt'
 
@@ -91,8 +87,7 @@ def test_fox():
 def test_more():
     """Test on more than one file"""
 
-    rv, out = getstatusoutput('{} {} {}'.format(prg, fox, sonnet))
-
+    rv, out = getstatusoutput(f'{prg} {fox} {sonnet}')
     expected = ('       1       9      45 ../inputs/fox.txt\n'
                 '      17     118     661 ../inputs/sonnet-29.txt\n'
                 '      18     127     706 total')
@@ -104,7 +99,6 @@ def test_more():
 def test_stdin():
     """Test on stdin"""
 
-    rv, out = getstatusoutput('{} < {}'.format(prg, fox))
-
+    rv, out = getstatusoutput(f'{prg} < {fox}')
     assert rv == 0
     assert out.rstrip() == '       1       9      45 <stdin>'
diff --git a/08_apples_and_bananas/test.py b/08_apples_and_bananas/test.py
@@ -21,7 +21,7 @@ def test_usage():
     """usage"""
 
     for flag in ['-h', '--help']:
-        rv, out = getstatusoutput('{} {}'.format(prg, flag))
+        rv, out = getstatusoutput(f'{prg} {flag}')
         assert rv == 0
         assert re.match("usage", out, re.IGNORECASE)
 
@@ -30,7 +30,7 @@ def test_usage():
 def test_bad_vowel():
     """Should fail on a bad vowel"""
 
-    rv, out = getstatusoutput('{} -v x foo'.format(prg))
+    rv, out = getstatusoutput(f'{prg} -v x foo')
     assert rv != 0
     assert re.match("usage", out, re.IGNORECASE)
 
@@ -39,37 +39,37 @@ def test_bad_vowel():
 def test_command_line():
     """ foo -> faa """
 
-    out = getoutput('{} foo'.format(prg))
+    out = getoutput(f'{prg} foo')
     assert out.strip() == 'faa'
 
 
 # --------------------------------------------------
 def test_command_line_with_vowel():
     """ foo -> fii """
 
-    out = getoutput('{} -v i foo'.format(prg))
+    out = getoutput(f'{prg} -v i foo')
     assert out.strip() == 'fii'
 
 
 # --------------------------------------------------
 def test_command_line_with_vowel_preserve_case():
     """ foo -> fii """
 
-    out = getoutput('{} "APPLES AND BANANAS" --vowel i'.format(prg))
+    out = getoutput(f'{prg} "APPLES AND BANANAS" --vowel i')
     assert out.strip() == 'IPPLIS IND BININIS'
 
 
 # --------------------------------------------------
 def test_file():
     """ fox.txt """
 
-    out = getoutput('{} {}'.format(prg, fox))
+    out = getoutput(f'{prg} {fox}')
     assert out.strip() == 'Tha qaack brawn fax jamps avar tha lazy dag.'
 
 
 # --------------------------------------------------
 def test_file_with_vowel():
     """ fox.txt """
 
-    out = getoutput('{} --vowel o {}'.format(prg, fox))
+    out = getoutput(f'{prg} --vowel o {fox}')
     assert out.strip() == 'Tho qoock brown fox jomps ovor tho lozy dog.'
diff --git a/22_itictactoe/Makefile b/22_itictactoe/Makefile
@@ -0,0 +1,7 @@
+.PHONY: test
+
+test:
+	pytest -xv test.py
+
+unit:
+	pytest -xv unit.py
diff --git a/22_itictactoe/itictactoe.py b/22_itictactoe/itictactoe.py
diff --git a/22_itictactoe/itictactoe_dict.py b/22_itictactoe/itictactoe_dict.py
diff --git a/22_itictactoe/unit.py b/22_itictactoe/unit.py
@@ -0,0 +1,68 @@
+from tictactoe import format_board, find_winner
+import random
+
+
+# --------------------------------------------------
+def test_board_no_state():
+    """makes default board"""
+
+    board = """
+-------------
+| 1 | 2 | 3 |
+-------------
+| 4 | 5 | 6 |
+-------------
+| 7 | 8 | 9 |
+-------------
+""".strip()
+
+    assert format_board('.' * 9) == board
+
+
+# --------------------------------------------------
+def test_board_with_state():
+    """makes board"""
+
+    board = """
+-------------
+| 1 | 2 | 3 |
+-------------
+| O | X | X |
+-------------
+| 7 | 8 | 9 |
+-------------
+""".strip()
+
+    assert format_board('...OXX...') == board
+
+
+# --------------------------------------------------
+def test_winning():
+    """test winning states"""
+
+    wins = [('PPP......'), ('...PPP...'), ('......PPP'), ('P..P..P..'),
+            ('.P..P..P.'), ('..P..P..P'), ('P...P...P'), ('..P.P.P..')]
+
+    for player in 'XO':
+        other_player = 'O' if player == 'X' else 'X'
+
+        for state in wins:
+            state = state.replace('P', player)
+            dots = [i for i in range(len(state)) if state[i] == '.']
+            mut = random.sample(dots, k=2)
+            test_state = ''.join([
+                other_player if i in mut else state[i]
+                for i in range(len(state))
+            ])
+            assert find_winner(test_state) == player
+
+
+# --------------------------------------------------
+def test_losing():
+    """test losing states"""
+
+    losing_state = list('XXOO.....')
+
+    for i in range(10):
+        random.shuffle(losing_state)
+        assert find_winner(''.join(losing_state)) == None
