From a9e23ae7de694aa0efebb0c7dce718f95136b622 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Fri, 11 May 2018 13:54:15 +0300
Subject: [PATCH] Refactor - extract a method.

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

diff --git a/tests/lib/pysol_tests/import_file1.py b/tests/lib/pysol_tests/import_file1.py
index f7796dfa..654df7de 100644
--- a/tests/lib/pysol_tests/import_file1.py
+++ b/tests/lib/pysol_tests/import_file1.py
@@ -85,12 +85,16 @@ class Mock_S_Game:
 
 
 class MyTests(unittest.TestCase):
-    def _successful_import(self, fn, want_s, blurb):
+    def _calc_hint(self, fn):
+        """docstring for _calc_hint"""
         s_game = Mock_S_Game()
         h = FreeCellSolver_Hint(s_game, None)
         fh = open(fn, 'r+b')
         h.importFileHelper(fh, s_game)
-        self.assertEqual(h.calcBoardString(), want_s, blurb)
+        return h
+
+    def _successful_import(self, fn, want_s, blurb):
+        self.assertEqual(self._calc_hint(fn).calcBoardString(), want_s, blurb)
 
     def test_import(self):
         return self._successful_import('tests/unit/data/with-10-for-rank.txt',
@@ -133,11 +137,8 @@ KD QC 5C QH 6S 3D
 ''', 'import worked with utf-8 bom')
 
     def test_throw_error_on_duplicate_card(self):
-        s_game = Mock_S_Game()
-        h = FreeCellSolver_Hint(s_game, None)
-        fh = open('tests/unit/data/624-with-dup-card.board', 'r+b')
         try:
-            h.importFileHelper(fh, s_game)
+            self._calc_hint('tests/unit/data/624-with-dup-card.board')
         except PySolHintLayoutImportError as err:
             self.assertEqual(err.msg, "Duplicate cards in input")
             self.assertEqual(err.cards, ["KC"])
@@ -147,11 +148,9 @@ KD QC 5C QH 6S 3D
         self.fail("No exception thrown.")
 
     def test_throw_error_on_invalid_foundations_line(self):
-        s_game = Mock_S_Game()
-        h = FreeCellSolver_Hint(s_game, None)
-        fh = open('tests/unit/data/624-invalid-foundations-line.board', 'r+b')
         try:
-            h.importFileHelper(fh, s_game)
+            self._calc_hint(
+                'tests/unit/data/624-invalid-foundations-line.board')
         except PySolHintLayoutImportError as err:
             self.assertEqual(err.msg, "Invalid Foundations line")
             self.assertEqual(err.cards, [])