Skip to content

Commit d3621e2

Browse files
committed
Modify test_search to also test search_all()
1 parent d58a291 commit d3621e2

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

Lib/test/test_tkinter/test_text.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,14 @@ def test_search(self):
4545
result = text.search('line', '1.0', 'end', nolinestop=True, regexp=True)
4646
self.assertEqual(result, '2.8')
4747

48-
all_res = text.search('test', '1.0', 'end', all=True)
49-
self.assertIsInstance(all_res, str)
50-
indices = all_res.split()
51-
self.assertGreaterEqual(len(indices), 2)
52-
self.assertTrue(all(isinstance(i, str) for i in indices))
53-
54-
overlap_res = text.search('test', '1.0', 'end', all=True, overlap=True)
55-
self.assertIsInstance(overlap_res, str)
56-
self.assertIn('textindex', overlap_res)
48+
all_res = text.search_all('test', '1.0', 'end')
49+
self.assertIsInstance(all_res, list)
50+
self.assertGreaterEqual(len(all_res), 2)
51+
self.assertTrue(all(isinstance(i, str) for i in all_res))
52+
53+
overlap_res = text.search_all('test', '1.0', 'end', overlap=True)
54+
self.assertIsInstance(overlap_res, list)
55+
self.assertGreaterEqual(len(overlap_res), len(all_res))
5756

5857
strict_res = text.search('test', '1.0', '1.20', strictlimits=True)
5958
self.assertEqual(strict_res, '1.10')

0 commit comments

Comments
 (0)