Merge pull request #89 from tmontes/cleaner-fake-tkinter

Cleaner fake tkinter.

Author: tmontes

tests/fake_tkinter.py

@@ -10,9 +10,10 @@
 
 
 
-class FakeCanvas:
+class Canvas:
 
-    def __init__(self):
+    def __init__(self, *args, **kwargs):
+        self.init_args = mock.call(*args, **kwargs)
         self.pack = mock.Mock()
         self.config = mock.Mock()
         self.xview_scroll = mock.Mock()
@@ -21,23 +22,16 @@ def __init__(self):
         self.coords = mock.Mock()
         self.update = mock.Mock()
         self.delete = mock.Mock()
-        self.create_polygon_coords = None
-        self.create_polygon_kwargs = None
+        self.create_polygon = mock.Mock(return_value=42)
         self.create_image = mock.Mock(return_value=24)
         self.create_line = mock.Mock(return_value=42)
         self.itemconfig = mock.Mock()
         self.tag_lower = mock.Mock()
         self.tag_raise = mock.Mock()
 
-    def create_polygon(self, coords, **kwargs):
-        self.create_polygon_coords = coords
-        self.create_polygon_kwargs = kwargs
-        # Return some numeric id.
-        return 42
-
 
 
-class FakeWindow:
+class Window:
 
     def __init__(self, screen_width, screen_height):
         self.winfo_screenwidth = mock.Mock(return_value=screen_width)
@@ -82,15 +76,15 @@ def winfo_height(self):
         return self._h
 
 
-class FakeTk(FakeWindow):
+class Tk(Window):
     pass
 
 
-class FakeToplevel(FakeWindow):
+class Toplevel(Window):
     pass
 
 
-class FakePhotoImage:
+class PhotoImage:
 
     def __init__(self):
         self.copies = 0
@@ -103,28 +97,34 @@ def __init__(self):
 
     def copy(self):
         self.copies += 1
-        return FakePhotoImage()
+        return PhotoImage()
 
 
 
-class FakeTkinter:
+class Module:
 
     def __init__(self, screen_width, screen_height):
         self.screen_width = screen_width
         self.screen_height = screen_height
-        self.canvas_init_calls = []
+        self.windows = []
+        self.canvases = []
         self.photoimage_init_calls = []
 
     def Tk(self):
-        return FakeTk(self.screen_width, self.screen_height)
+        window = Tk(self.screen_width, self.screen_height)
+        self.windows.append(window)
+        return window
 
     def Toplevel(self):
-        return FakeToplevel(self.screen_width, self.screen_height)
+        window = Toplevel(self.screen_width, self.screen_height)
+        self.windows.append(window)
+        return window
 
     def Canvas(self, *args, **kwargs):
-        self.canvas_init_calls.append((args, kwargs))
-        return FakeCanvas()
+        canvas = Canvas(*args, **kwargs)
+        self.canvases.append(canvas)
+        return canvas
 
     def PhotoImage(self, *args, **kwargs):
         self.photoimage_init_calls.append((args, kwargs))
-        return FakePhotoImage()
+        return PhotoImage()

tests/test_base_sprites.py

@@ -22,7 +22,7 @@ class TestDefaultSprite(test_base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
 
 
     def test_create(self):
@@ -332,7 +332,7 @@ class TestNonDefaultSprite(test_base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = base.Sprite(
             canvas=self.canvas,
             shape=None,
@@ -549,7 +549,7 @@ class AsyncAnimationBase(test_base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
 
         self.asyncio = fake_asyncio.FakeAsyncio()
         self._exit_stack = contextlib.ExitStack()
@@ -1382,7 +1382,7 @@ class SyncAnimationBase(test_base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
 
         self.time = mock.Mock()
         self._exit_stack = contextlib.ExitStack()
@@ -1974,7 +1974,7 @@ class TestRegressionSpriteInitializedWithUpdateTrue(test_base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = base.Sprite(self.canvas, shape=None, update=True)
 
 

tests/test_bitmap_shapes.py

@@ -61,7 +61,7 @@ class _TkBasedTests(unittest.TestCase):
     def setUp(self):
 
         # PIL code path tests run against fake_tkinter.
-        self.tkinter = fake_tkinter.FakeTkinter(640, 480)
+        self.tkinter = fake_tkinter.Module(640, 480)
 
         # Replace tkinter with the fake one.
         self.save_tkinter = bitmap.tkinter

tests/test_bitmap_sprites.py

@@ -26,7 +26,7 @@ class TestDefaultSprite(base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
 
 
     def test_create(self):

tests/test_canvas.py

@@ -23,7 +23,7 @@ class TestInvertedTkYCanvas(unittest.TestCase):
 
     def setUp(self):
 
-        self.tkinter = fake_tkinter.FakeTkinter(
+        self.tkinter = fake_tkinter.Module(
             screen_width=SCREEN_WIDTH,
             screen_height=SCREEN_HEIGHT,
         )
@@ -44,40 +44,33 @@ def test_create_creates_tkinter_Canvas(self):
 
         _c = canvas.InvertedYCanvas(self.master, 'background')
 
-        tkinter_canvas_call_args = self.tkinter.canvas_init_calls
-
-        self.assertEqual(len(tkinter_canvas_call_args), 1, 'tkinter.Canvas call count')
+        self.assertEqual(len(self.tkinter.canvases), 1, 'tkinter.Canvas call count')
 
 
     def test_create_creates_tkinter_Canvas_with_given_master(self):
 
         _c = canvas.InvertedYCanvas(self.master, 'background')
 
-        tkinter_canvas_call_args = self.tkinter.canvas_init_calls
+        canvas_init_args = self.tkinter.canvases[0].init_args
 
         # Passed a single positional argument: self.master
-        (single_arg,), _kwargs = tkinter_canvas_call_args[0]
-        self.assertIs(single_arg, self.master)
+        self.assertIs(canvas_init_args.args[0], self.master)
 
 
     def test_create_creates_tkinter_Canvas_with_given_background(self):
 
         _c = canvas.InvertedYCanvas(self.master, 'background')
 
-        tkinter_canvas_call_args = self.tkinter.canvas_init_calls
-
-        _args, kwargs = tkinter_canvas_call_args[0]
-        self.assertEqual(kwargs['background'], 'background')
+        canvas_init_args = self.tkinter.canvases[0].init_args
+        self.assertEqual(canvas_init_args.kwargs['background'], 'background')
 
 
     def test_create_creates_tkinter_Canvas_with_zero_highlightthickness(self):
 
         _c = canvas.InvertedYCanvas(self.master, 'background')
 
-        tkinter_canvas_call_args = self.tkinter.canvas_init_calls
-
-        _args, kwargs = tkinter_canvas_call_args[0]
-        self.assertEqual(kwargs['highlightthickness'], 0)
+        canvas_init_args = self.tkinter.canvases[0].init_args
+        self.assertEqual(canvas_init_args.kwargs['highlightthickness'], 0)
 
 
     def test_create_polygon_returns_integer_item_id(self):
@@ -96,9 +89,13 @@ def test_create_polygon_inverts_y_coordinates(self):
         coords = [0, 0, 1, 1, 2, -2]
         _item_id = c.create_polygon(coords, fill='fill', outline='outline', width=42)
 
-        args = c._canvas.create_polygon_coords
-
-        self.assertEqual(args, [0, 0, 1, -1, 2, 2])
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.create_polygon.assert_called_once_with(
+            [0, 0, 1, -1, 2, 2],
+            fill=mock.ANY,
+            outline=mock.ANY,
+            width=mock.ANY,
+        )
 
 
     def test_create_polygon_passes_args_to_Canvas_create_polygon(self):
@@ -107,8 +104,13 @@ def test_create_polygon_passes_args_to_Canvas_create_polygon(self):
 
         _item_id = c.create_polygon([], fill='fill', outline='outline', width=42)
 
-        kwargs = c._canvas.create_polygon_kwargs
-        self.assertEqual(kwargs, dict(fill='fill', outline='outline', width=42))
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.create_polygon.assert_called_once_with(
+            mock.ANY,
+            fill='fill',
+            outline='outline',
+            width=42,
+        )
 
 
     def test_create_image_returns_integer_item_id(self):
@@ -126,7 +128,8 @@ def test_create_image_inverts_y_coordinate(self):
 
         _item_id = c.create_image(42, 24, image=None, anchor=None)
 
-        c._canvas.create_image.assert_called_with(
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.create_image.assert_called_with(
             42, -24, image=mock.ANY, anchor=mock.ANY
         )
 
@@ -137,7 +140,8 @@ def test_create_image_passes_args_to_Canvas_create_image(self):
 
         _item_id = c.create_image(42, 24, image='image', anchor='anchor')
 
-        c._canvas.create_image.assert_called_with(
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.create_image.assert_called_with(
             mock.ANY, mock.ANY, image='image', anchor='anchor'
         )
 
@@ -158,7 +162,8 @@ def test_create_line_inverts_y_coordinates(self):
         coords = [0, 0, 1, 1, 2, -2]
         _item_id = c.create_line(coords, fill='fill', width=42, capstyle='capstyle')
 
-        c._canvas.create_line.assert_called_with(
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.create_line.assert_called_with(
             [0, 0, 1, -1, 2, 2], fill=mock.ANY, width=mock.ANY, capstyle=mock.ANY,
         )
 
@@ -169,7 +174,8 @@ def test_create_line_passes_args_to_Canvas_create_line(self):
 
         _item_id = c.create_line([], fill='fill', width=42, capstyle='capstyle')
 
-        c._canvas.create_line.assert_called_with(
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.create_line.assert_called_with(
             mock.ANY, fill='fill', width=42, capstyle='capstyle',
         )
 
@@ -180,7 +186,8 @@ def test_move_calls_canvas_move_with_same_item_id(self):
 
         c.move(42, 0, 0)
 
-        c._canvas.move.assert_called_with(42, mock.ANY, mock.ANY)
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.move.assert_called_with(42, mock.ANY, mock.ANY)
 
 
     def test_move_calls_canvas_move_with_inverted_y(self):
@@ -189,7 +196,8 @@ def test_move_calls_canvas_move_with_inverted_y(self):
 
         c.move(None, 42, 24)
 
-        c._canvas.move.assert_called_with(mock.ANY, 42, -24)
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.move.assert_called_with(mock.ANY, 42, -24)
 
 
     def test_coords_calls_canvas_coords_with_same_item_id(self):
@@ -198,7 +206,8 @@ def test_coords_calls_canvas_coords_with_same_item_id(self):
 
         c.coords(42, [])
 
-        c._canvas.coords.assert_called_with(42, mock.ANY)
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.coords.assert_called_with(42, mock.ANY)
 
 
     def test_coords_calls_canvas_coords_with_inverted_y_coords(self):
@@ -207,7 +216,8 @@ def test_coords_calls_canvas_coords_with_inverted_y_coords(self):
 
         c.coords(None, [1, 2, 3, 4, 5, 6])
 
-        c._canvas.coords.assert_called_with(
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
+        wrapped_tkinter_canvas.coords.assert_called_with(
             mock.ANY, [1, -2, 3, -4, 5, -6]
         )
 
@@ -228,8 +238,9 @@ def test_attribute_access_returns_tkinter_Canvas_attribute(self):
             'tag_raise',
         )
 
+        wrapped_tkinter_canvas = self.tkinter.canvases[0]
         for name in names:
             with self.subTest(attr_name=name):
                 result = getattr(c, name)
-                underlying = getattr(c._canvas, name)
+                underlying = getattr(wrapped_tkinter_canvas, name)
                 self.assertIs(result, underlying)