@@ -321,33 +321,31 @@ def test_invalidate_cache(self):
321321
322322
323323class PreparedTests (unittest .TestCase ):
324- def test_normalize (self ):
325- tests = [
326- # Simple
327- ("sample" , "sample" ),
328- # Mixed case
329- ("Sample" , "sample" ),
330- ("SAMPLE" , "sample" ),
331- ("SaMpLe" , "sample" ),
332- # Separator conversions
333- ("sample-pkg" , "sample_pkg" ),
334- ("sample.pkg" , "sample_pkg" ),
335- ("sample_pkg" , "sample_pkg" ),
336- # Multiple separators
337- ("sample---pkg" , "sample_pkg" ),
338- ("sample___pkg" , "sample_pkg" ),
339- ("sample...pkg" , "sample_pkg" ),
340- # Mixed separators
341- ("sample-._pkg" , "sample_pkg" ),
342- ("sample_.-pkg" , "sample_pkg" ),
343- # Complex
344- ("Sample__Pkg-name.foo" , "sample_pkg_name_foo" ),
345- ("Sample__Pkg.name__foo" , "sample_pkg_name_foo" ),
346- # Uppercase with separators
347- ("SAMPLE-PKG" , "sample_pkg" ),
348- ("Sample.Pkg" , "sample_pkg" ),
349- ("SAMPLE_PKG" , "sample_pkg" ),
350- ]
351- for name , expected in tests :
352- with self .subTest (name = name ):
353- self .assertEqual (Prepared .normalize (name ), expected )
324+ @fixtures .parameterize (
325+ # Simple
326+ dict (input = 'sample' , expected = 'sample' ),
327+ # Mixed case
328+ dict (input = 'Sample' , expected = 'sample' ),
329+ dict (input = 'SAMPLE' , expected = 'sample' ),
330+ dict (input = 'SaMpLe' , expected = 'sample' ),
331+ # Separator conversions
332+ dict (input = 'sample-pkg' , expected = 'sample_pkg' ),
333+ dict (input = 'sample.pkg' , expected = 'sample_pkg' ),
334+ dict (input = 'sample_pkg' , expected = 'sample_pkg' ),
335+ # Multiple separators
336+ dict (input = 'sample---pkg' , expected = 'sample_pkg' ),
337+ dict (input = 'sample___pkg' , expected = 'sample_pkg' ),
338+ dict (input = 'sample...pkg' , expected = 'sample_pkg' ),
339+ # Mixed separators
340+ dict (input = 'sample-._pkg' , expected = 'sample_pkg' ),
341+ dict (input = 'sample_.-pkg' , expected = 'sample_pkg' ),
342+ # Complex
343+ dict (input = 'Sample__Pkg-name.foo' , expected = 'sample_pkg_name_foo' ),
344+ dict (input = 'Sample__Pkg.name__foo' , expected = 'sample_pkg_name_foo' ),
345+ # Uppercase with separators
346+ dict (input = 'SAMPLE-PKG' , expected = 'sample_pkg' ),
347+ dict (input = 'Sample.Pkg' , expected = 'sample_pkg' ),
348+ dict (input = 'SAMPLE_PKG' , expected = 'sample_pkg' ),
349+ )
350+ def test_normalize (self , input , expected ):
351+ self .assertEqual (Prepared .normalize (input ), expected )
0 commit comments