Fixing tests

Author: reddyalready

.gitignore

@@ -24,6 +24,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+.pytest_cache/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

.idea/inspectionProfiles/Project_Default.xml

@@ -3,13 +3,11 @@ python:
 - '3.5'
 - '3.6'
 install:
-- pip3 install coveralls
+- pip install coveralls
 script: coverage run --source=ultimate_ttt setup.py test
 after_success: coveralls
 deploy:
   provider: pypi
   user: reddyalready
-  password:
-    secure: WOk8Sq+EsrebaGbf/d6OtRYmaEaDF7bBbbiqvDBD3jIz5EVIQjyf3kpQ04P4pFR2Duf3OEEk1RByciiQXDaI++Hl0esLp/jsAN/eB/UebPnXyQkpPLu1K9lLXMz2nRrZDgSIDWYyg7rXgoN7tPhziaNEJmYn4d46p1HhApZXhJLjy1An3s7/tGTsR1EmTFfKBgshaHl9ZRMJCtXYg5h9opjegEK/2LTrj88+vnjTd141gn+rdoj3PpJmt2XJj/tkQdrAMu1/hIk70bvkfV5DrETyZGb1chCDH1jPjPwGo0icJD7RHE+CDz4R151+nM3B08l1G+V7YNF5T6JaAp+Ai8bhIf50BNS6sE7SRsE7y8Tx7xtSa3AO55VgO4ES/7IHE2O3vEQzses+ZIzWM7HZchw9rTXCGJYmrOktwj/wUXREpK98klRUziIej7NsfWgbXJxfWDVqPsyLYf12TuqlY+8mNoY7SJ6TjHIj7Gmr3fNRWIsksKQ880U1Vd9k5ffnHu0FZEjcGhPpS0qqvbhshgLyhwZKi7cC5NWOEUOj3TRXAkrgfdC204nXfoEQ+yqHn3WA9iMj9Qt6B6b7HZPp6i8VAn1dbx29aTq6Y/4X+wLzK3M8k8UrSmIoZD4D5QMxaB/NhKvwPBEUJq/tBKHQ9yMwitIBUHEVYkNccmGgR9k=
   on:
     tags: true

.idea/libraries/R_User_Library.xml

@@ -169,12 +169,12 @@ <h1>Source code for ultimate_ttt.errors</h1><div class="highlight"><pre>
         <span class="k">return</span> <span class="s2">&quot;Co-ordinate (&quot;</span><span class="o">+</span><span class="nb">str</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">coords</span><span class="p">)</span><span class="o">+</span><span class="s2">&quot;) made outside main board bounds&quot;</span></div>
 
 <div class="viewcode-block" id="MoveNotOnNextBoardError"><a class="viewcode-back" href="../../source/ultimate_ttt.html#ultimate_ttt.errors.MoveNotOnNextBoardError">[docs]</a><span class="k">class</span> <span class="nc">MoveNotOnNextBoardError</span><span class="p">(</span><span class="n">Error</span><span class="p">):</span>
-    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">board_coords</span><span class="p">,</span> <span class="n">next_board_coords</span><span class="p">):</span>
+    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">board_coords</span><span class="p">,</span> <span class="n">sent_to_sub_board_coords</span><span class="p">):</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">coords</span> <span class="o">=</span> <span class="n">board_coords</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">next_board_coords</span> <span class="o">=</span> <span class="n">next_board_coords</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">sent_to_sub_board_coords</span> <span class="o">=</span> <span class="n">sent_to_sub_board_coords</span>
 
     <span class="k">def</span> <span class="nf">__str__</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
-        <span class="k">return</span> <span class="s2">&quot;Next board to play is &quot;</span><span class="o">+</span><span class="bp">self</span><span class="o">.</span><span class="n">next_board_coords</span><span class="o">+</span><span class="s2">&quot;, but player played &quot;</span><span class="o">+</span><span class="bp">self</span><span class="o">.</span><span class="n">coords</span></div>
+        <span class="k">return</span> <span class="s2">&quot;Next board to play is &quot;</span><span class="o">+</span><span class="bp">self</span><span class="o">.</span><span class="n">sent_to_sub_board_coords</span><span class="o">+</span><span class="s2">&quot;, but player played &quot;</span><span class="o">+</span><span class="bp">self</span><span class="o">.</span><span class="n">coords</span></div>
 
 <div class="viewcode-block" id="MoveOutsideSubBoardError"><a class="viewcode-back" href="../../source/ultimate_ttt.html#ultimate_ttt.errors.MoveOutsideSubBoardError">[docs]</a><span class="k">class</span> <span class="nc">MoveOutsideSubBoardError</span><span class="p">(</span><span class="n">Error</span><span class="p">):</span>
     <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">move</span><span class="p">):</span>
@@ -269,4 +269,4 @@ <h1>Source code for ultimate_ttt.errors</h1><div class="highlight"><pre>
 
 
 </body>
-</html>
+</html>

.idea/misc.xml

@@ -185,12 +185,12 @@ <h1>Source code for ultimate_ttt.gameplay</h1><div class="highlight"><pre>
         <span class="nb">super</span><span class="p">()</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="n">move</span><span class="o">.</span><span class="n">row</span><span class="p">,</span> <span class="n">move</span><span class="o">.</span><span class="n">col</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">player</span> <span class="o">=</span> <span class="n">player</span></div>
 
-<div class="viewcode-block" id="BoardCoords"><a class="viewcode-back" href="../../source/ultimate_ttt.html#ultimate_ttt.gameplay.BoardCoords">[docs]</a><span class="k">class</span> <span class="nc">BoardCoords</span><span class="p">(</span><span class="n">Move</span><span class="p">):</span>
+<div class="viewcode-block" id="SubBoardCoords"><a class="viewcode-back" href="../../source/ultimate_ttt.html#ultimate_ttt.gameplay.SubBoardCoords">[docs]</a><span class="k">class</span> <span class="nc">SubBoardCoords</span><span class="p">(</span><span class="n">Move</span><span class="p">):</span>
     <span class="sd">&quot;&quot;&quot;Convenience wrapper to represent MainBoard co-ordinates (referencing a SubBoard)&quot;&quot;&quot;</span>
     <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">main_board_row</span><span class="p">,</span> <span class="n">main_board_col</span><span class="p">):</span>
         <span class="nb">super</span><span class="p">()</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="n">main_board_row</span><span class="p">,</span> <span class="n">main_board_col</span><span class="p">)</span></div>
 
-<div class="viewcode-block" id="is_winning_move"><a class="viewcode-back" href="../../source/ultimate_ttt.html#ultimate_ttt.gameplay.is_winning_move">[docs]</a><span class="k">def</span> <span class="nf">is_winning_move</span><span class="p">(</span><span class="n">board</span><span class="p">,</span> <span class="n">player_move</span><span class="p">):</span>
+<div class="viewcode-block" id="did_move_win"><a class="viewcode-back" href="../../source/ultimate_ttt.html#ultimate_ttt.gameplay.did_move_win">[docs]</a><span class="k">def</span> <span class="nf">did_move_win</span><span class="p">(</span><span class="n">board</span><span class="p">,</span> <span class="n">player_move</span><span class="p">):</span>
     <span class="k">return</span> <span class="p">(</span><span class="n">is_row_won</span><span class="p">(</span><span class="n">board</span><span class="p">,</span> <span class="n">player_move</span><span class="p">)</span> <span class="ow">or</span> <span class="n">is_col_won</span><span class="p">(</span><span class="n">board</span><span class="p">,</span> <span class="n">player_move</span><span class="p">)</span> <span class="ow">or</span>
                 <span class="n">is_diagonal_won</span><span class="p">(</span><span class="n">board</span><span class="p">,</span> <span class="n">player_move</span><span class="p">))</span></div>
 
@@ -295,4 +295,4 @@ <h1>Source code for ultimate_ttt.gameplay</h1><div class="highlight"><pre>
 
 
 </body>
-</html>
+</html>