@@ -202,14 +202,10 @@ def test_preferred_s_case_sensitive(
202202 check_type = types .PreferredFormsSimple (items = items , padding = padding )
203203 results = list (check_type .check (text , check ))
204204
205- assert all (result .replacements in items .values () for result in results )
206- for i , result in enumerate (results ):
207- key = list (items .keys ())[i ]
208- expected_replacement = items [key ]
209-
205+ for result , (original , replacement ) in zip (results , items .items ()):
210206 assert result .check_path == path
211- assert result .message == f"{ expected_replacement } || { key } "
212- assert result .replacements == expected_replacement
207+ assert result .message == f"{ replacement } || { original } "
208+ assert result .replacements == replacement
213209
214210
215211@given (PREFERRED_ITEMS_CASED_STRATEGY , PADDING_STRATEGY , st .text ())
@@ -218,35 +214,28 @@ def test_preferred_s_case_insensitive(
218214) -> None :
219215 """Return correct matches when ignore_case=True with case variations."""
220216 normalised = {k .lower (): v for k , v in items .items ()}
217+
218+ check_type = types .PreferredFormsSimple (items = normalised , padding = padding )
221219 check = Check (
222- check_type = types . PreferredFormsSimple ( items = items , padding = padding ) ,
220+ check_type = check_type ,
223221 path = path ,
224222 message = "{} || {}" ,
225223 ignore_case = True ,
226224 )
227225
228- text = " " .join (
229- k .swapcase () if i % 2 == 0 else k .upper ()
230- for i , k in enumerate (items .keys ())
231- )
232-
233- check_type = types .PreferredFormsSimple (items = normalised , padding = padding )
234- results = list (check_type .check (text , check ))
235- assert all (result .replacements in normalised .values () for result in results )
236-
237- text_keys = [
226+ text_variations = [
238227 k .swapcase () if i % 2 == 0 else k .upper ()
239228 for i , k in enumerate (items .keys ())
240229 ]
241230
242- for i , result in enumerate ( results ):
243- original_key = list ( items . keys ())[ i ]
244- text_key = text_keys [ i ]
245- expected_replacement = normalised [original_key .lower ()]
231+ results = list ( check_type . check ( " " . join ( text_variations ), check ))
232+
233+ for result , text in zip ( results , text_variations ):
234+ replacements = normalised [text .lower ()]
246235
247236 assert result .check_path == path
248- assert result .message == f"{ expected_replacement } || { text_key } "
249- assert result .replacements == expected_replacement
237+ assert result .message == f"{ replacements } || { text } "
238+ assert result .replacements == replacements
250239
251240
252241@given (PREFERRED_ITEMS_STRATEGY , PADDING_STRATEGY , st .text (), st .data ())
0 commit comments