@@ -63,32 +63,15 @@ def test_search(self):
6363
6464 def test_search_all (self ):
6565 text = self .text
66- text .insert ('1.0' ,
67- 'ababa ababa\n '
68- 'ababababa\n '
69- 'aba aba' )
66+ text .insert ('1.0' , 'ababa' )
7067
7168 all_res = text .search_all ('aba' , '1.0' , 'end' )
7269 all_res_strs = [str (i ) for i in all_res ]
73- self .assertIsInstance (all_res , tuple )
74- self .assertGreaterEqual (len (all_res ), 3 )
75- self .assertEqual (str (all_res [0 ]), '1.0' )
76- self .assertEqual (str (all_res [1 ]), '1.6' )
70+ self .assertEqual (all_res_strs , ['1.0' , '1.2' ])
7771
7872 overlap_res = text .search_all ('aba' , '1.0' , 'end' , overlap = True )
7973 overlap_res_strs = [str (i ) for i in overlap_res ]
80- self .assertIsInstance (overlap_res , tuple )
81- self .assertGreater (len (overlap_res ), len (all_res ))
82-
83- # Check that overlap actually finds overlapping matches
84- self .assertIn ('2.0' , overlap_res_strs )
85- self .assertIn ('2.2' , overlap_res_strs )
86- self .assertIn ('2.4' , overlap_res_strs )
87- self .assertNotIn ('2.2' , all_res_strs )
88-
89- # Ensure all results are valid text indices
90- for i in overlap_res :
91- self .assertRegex (str (i ), r'^\d+\.\d+$' )
74+ self .assertEqual (overlap_res_strs , ['1.0' , '1.2' , '1.4' ])
9275
9376 def test_count (self ):
9477 text = self .text
0 commit comments