From 9ddaa7e110014004309b6bccd9c7d539a085f2f6 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Tue, 1 May 2018 18:22:15 +0300
Subject: [PATCH] Refactor.

---
 tests/lib/pysol_tests/import_file1.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/tests/lib/pysol_tests/import_file1.py b/tests/lib/pysol_tests/import_file1.py
index 432770a5..d1f8f126 100644
--- a/tests/lib/pysol_tests/import_file1.py
+++ b/tests/lib/pysol_tests/import_file1.py
@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 # Written by Shlomi Fish, under the MIT Expat License.
 
 import unittest
@@ -86,12 +85,16 @@ class Mock_S_Game:
 
 
 class MyTests(unittest.TestCase):
-    def test_import(self):
+    def _successful_import(self, fn, want_s, blurb):
         s_game = Mock_S_Game()
         h = FreeCellSolver_Hint(s_game, None)
-        fh = open('tests/unit/data/with-10-for-rank.txt', 'r+b')
+        fh = open(fn, 'r+b')
         h.importFileHelper(fh, s_game)
-        self.assertEqual(h.calcBoardString(), '''FC: - - - -
+        self.assertEqual(h.calcBoardString(), want_s, blurb)
+
+    def test_import(self):
+        return self._successful_import('tests/unit/data/with-10-for-rank.txt',
+                                       '''FC: - - - -
 4C 2C 9C 8C QS 4S 2H
 5H QH 3C AC 3H 4H QD
 QC 9S 6H 9H 3S KS 3D
@@ -100,14 +103,11 @@ QC 9S 6H 9H 3S KS 3D
 7H JS KH TS KC 7C
 AH 5S 6S AD 8H JD
 7S 6C 7D 4D 8S 9D
-''', 'game is sane')
+''', 'import worked with "10"s as ranks')
 
     def test_import_2(self):
-        s_game = Mock_S_Game()
-        h = FreeCellSolver_Hint(s_game, None)
-        fh = open('tests/unit/data/624.board', 'r+b')
-        h.importFileHelper(fh, s_game)
-        self.assertEqual(h.calcBoardString(), '''FC: - - - -
+        return self._successful_import('tests/unit/data/624.board',
+                                       '''FC: - - - -
 KC 6H 4C QS 2D 4S AS
 4H TH 2S JH 2H 9S AH
 3S 6C 9H AD KH QD 7C
@@ -118,10 +118,6 @@ KD QC 5C QH 6S 3D
 8S 7H 3H 2C AC 7D
 ''', 'import worked with Ts')
 
-    def test_output(self):
-        # TEST
-        self.assertEqual(1, 1, 'card2str2 works')
-
 
 def mymain():
     from pycotap import TAPTestRunner