Cleaner names for fake objects in fake Tkinter.

Author: tmontes

tests/fake_tkinter.py

@@ -10,7 +10,7 @@
 
 
 
-class FakeCanvas:
+class Canvas:
 
     def __init__(self, *args, **kwargs):
         self.init_args = mock.call(*args, **kwargs)
@@ -31,7 +31,7 @@ def __init__(self, *args, **kwargs):
 
 
 
-class FakeWindow:
+class Window:
 
     def __init__(self, screen_width, screen_height):
         self.winfo_screenwidth = mock.Mock(return_value=screen_width)
@@ -76,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
@@ -97,11 +97,11 @@ 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
@@ -111,20 +111,20 @@ def __init__(self, screen_width, screen_height):
         self.photoimage_init_calls = []
 
     def Tk(self):
-        window = FakeTk(self.screen_width, self.screen_height)
+        window = Tk(self.screen_width, self.screen_height)
         self.windows.append(window)
         return window
 
     def Toplevel(self):
-        window = 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):
-        canvas = FakeCanvas(*args, **kwargs)
+        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,
         )

tests/test_turtle.py

@@ -24,7 +24,7 @@ class TestTurtle(base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = fake_sprite.FakeSprite(
             canvas=self.canvas,
             anchor=(0, 0),
@@ -123,7 +123,7 @@ def setUp(self):
 
         super().setUp()
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = fake_sprite.FakeSprite(
             canvas=self.canvas,
             anchor=(0, 0),
@@ -207,7 +207,7 @@ def setUp(self):
 
         super().setUp()
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = fake_sprite.FakeSprite(
             canvas=self.canvas,
             anchor=(0, 0),
@@ -453,7 +453,7 @@ def setUp(self):
 
         super().setUp()
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = fake_sprite.FakeSprite(
             canvas=self.canvas,
             anchor=(0, 0),
@@ -533,7 +533,7 @@ def setUp(self):
 
         super().setUp()
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = fake_sprite.FakeSprite(
             canvas=self.canvas,
             anchor=(0, 0),
@@ -753,7 +753,7 @@ def setUp(self):
 
         super().setUp()
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = sprite_base.Sprite(self.canvas, shape=None)
 
 
@@ -923,7 +923,7 @@ def setUp(self):
 
         super().setUp()
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
         self.sprite = sprite_base.Sprite(self.canvas, shape=None)
 
 

tests/test_vector_sprites.py

@@ -31,7 +31,7 @@ class TestDefaultSprite(base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
 
 
     def test_create(self):
@@ -241,7 +241,7 @@ class TestNonDefaultSprite(base.TestCase):
 
     def setUp(self):
 
-        self.canvas = fake_tkinter.FakeCanvas()
+        self.canvas = fake_tkinter.Canvas()
 
 
     def test_custom_anchor(self):
@@ -355,7 +355,7 @@ class TestRegressionSpriteInitializedWithUpdateTrue(base.TestCase):
 
     def test_direct_rotate_around_calls_canvas_update_once(self):
 
-        canvas = fake_tkinter.FakeCanvas()
+        canvas = fake_tkinter.Canvas()
         sprite = sprites.VectorSprite(canvas, UnitSquare(), update=True)
 
         sprite.direct_rotate(30, around=(10, 10))

tests/test_window.py

@@ -23,7 +23,7 @@ class FakedTkinterTestCase(unittest.TestCase):
 
     def setUp(self):
 
-        self.tkinter = fake_tkinter.FakeTkinter(
+        self.tkinter = fake_tkinter.Module(
             screen_width=SCREEN_WIDTH,
             screen_height=SCREEN_HEIGHT,
         )
@@ -63,7 +63,7 @@ def test_create_window_creates_underlying_tk_object(self):
 
         w = self._Window()
         wrapped_tk_window = self.tkinter.windows[0]
-        self.assertIsInstance(wrapped_tk_window, fake_tkinter.FakeTk)
+        self.assertIsInstance(wrapped_tk_window, fake_tkinter.Tk)
 
 
     def test_default_title_was_set(self):
@@ -532,9 +532,9 @@ def test_first_has_underlying_tk_others_have_underlying_toplevels(self):
         w3 = self._Window()
 
         wrapped_tk_windows = self.tkinter.windows
-        self.assertIsInstance(wrapped_tk_windows[0], fake_tkinter.FakeTk)
-        self.assertIsInstance(wrapped_tk_windows[1], fake_tkinter.FakeToplevel)
-        self.assertIsInstance(wrapped_tk_windows[2], fake_tkinter.FakeToplevel)
+        self.assertIsInstance(wrapped_tk_windows[0], fake_tkinter.Tk)
+        self.assertIsInstance(wrapped_tk_windows[1], fake_tkinter.Toplevel)
+        self.assertIsInstance(wrapped_tk_windows[2], fake_tkinter.Toplevel)
 
 
     def test_close_first_window_raises_if_there_are_other_windows(self):