Skip to content

Commit 71f624c

Browse files
committed
Reduce code duplication in TestUtilities
1 parent 7661cc9 commit 71f624c

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

tests/test_utilities.py

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,29 @@
1111

1212

1313
class TestUtilities(BaseWidgetTest):
14+
def assertIsChild(self, child, parent):
15+
self.assertIn(child, parent.children.values())
16+
parent_of_parent = parent.winfo_parent()
17+
if not parent_of_parent.endswith("."):
18+
parent_of_parent += "."
19+
self.assertEquals(child.winfo_parent(), parent_of_parent + parent.winfo_name())
20+
1421
def _dummy_bind(self, event):
1522
pass
1623

1724
def test_move_widget(self):
1825
label = ttk.Label(self.window)
1926
tl = tk.Toplevel(self.window)
2027
label = move_widget(label, tl)
21-
self.assertTrue(label.winfo_parent() == tl.winfo_parent() + '.' + tl.winfo_name())
28+
self.assertIsChild(label, tl)
2229

2330
def test_move_widget_pack(self):
2431
label = ttk.Label(self.window)
2532
label.pack()
2633
tl = tk.Toplevel(self.window)
2734
label = move_widget(label, tl)
2835
label.pack()
29-
self.assertTrue(label.winfo_parent() == tl.winfo_parent() + '.' + tl.winfo_name())
36+
self.assertIsChild(label, tl)
3037
self.assertIn(label, tl.pack_slaves())
3138

3239
def test_move_widget_grid(self):
@@ -35,7 +42,7 @@ def test_move_widget_grid(self):
3542
tl = tk.Toplevel(self.window)
3643
label = move_widget(label, tl)
3744
label.grid()
38-
self.assertTrue(label.winfo_parent() == tl.winfo_parent() + '.' + tl.winfo_name())
45+
self.assertIsChild(label, tl)
3946
self.assertIn(label, tl.grid_slaves())
4047

4148
def test_move_widget_place(self):
@@ -44,7 +51,7 @@ def test_move_widget_place(self):
4451
tl = tk.Toplevel(self.window)
4552
label = move_widget(label, tl)
4653
label.place()
47-
self.assertTrue(label.winfo_parent() == tl.winfo_parent() + '.' + tl.winfo_name())
54+
self.assertIsChild(label, tl)
4855
self.assertIn(label, tl.place_slaves())
4956

5057
def test_move_widget_with_binding(self):
@@ -54,7 +61,7 @@ def test_move_widget_with_binding(self):
5461
tl = tk.Toplevel(self.window)
5562
label = move_widget(label, tl)
5663
label.pack()
57-
self.assertTrue(label.winfo_parent() == tl.winfo_parent() + '.' + tl.winfo_name())
64+
self.assertIsChild(label, tl)
5865
self.assertIn('<Enter>', label.bind())
5966

6067
def test_move_widget_with_binding_on_parent(self):

0 commit comments

Comments
 (0)