BUG: "Switched to single test method asserting functions that use pad raise correctly."

Author: wcwagner

pandas/tests/test_strings.py

@@ -1604,16 +1604,14 @@ def test_pad_fillchar(self):
             result = values.str.pad(5, fillchar=5)
 
     def test_pad_width(self):
-
         values = Series(['1', '22', 'a', 'bb'])
+        string_methods = Series.str(values)
 
-        result = values.str.pad(5, side='left', fillchar='0')
-        expected = Series(['00001', '00022', '0000a', '000bb'])
-        tm.assert_almost_equal(result, expected)
-
-        with tm.assertRaisesRegexp(TypeError,
-                                   "width must be of integer type, not*"):
-            result = values.str.pad('f', fillchar='0')
+        for f_name, f in Series.str.__dict__.items():
+            if f_name in ['center', 'ljust', 'rjust', 'zfill', 'pad']:
+                with tm.assertRaisesRegexp(TypeError,
+                                           "width must be of integer type,*"):
+                    f(string_methods, 'f')
 
     def test_translate(self):
 
@@ -1757,33 +1755,6 @@ def test_center_ljust_rjust_fillchar(self):
                                    "fillchar must be a character, not int"):
             result = values.str.rjust(5, fillchar=1)
 
-    def test_center_ljust_rjust_width(self):
-        values = Series(['a', 'bb', 'ccc', NA, 'eeeee'])
-
-        result = values.str.center(4, fillchar='X')
-        expected = Series(['XaXX', 'XbbX', 'cccX', NA, 'eeeee'])
-        tm.assert_almost_equal(result, expected)
-
-        result = values.str.ljust(4, fillchar='X')
-        expected = Series(['aXXX', 'bbXX', 'cccX', NA, 'eeeee'])
-        tm.assert_almost_equal(result, expected)
-
-        result = values.str.rjust(4, fillchar='X')
-        expected = Series(['XXXa', 'XXbb', 'Xccc', NA, 'eeeee'])
-        tm.assert_almost_equal(result, expected)
-
-        with tm.assertRaisesRegexp(TypeError,
-                                   "width must be of integer type, not*"):
-            result = values.str.center('f', fillchar='X')
-
-        with tm.assertRaisesRegexp(TypeError,
-                                   "width must be of integer type, not*"):
-            result = values.str.ljust('f', fillchar='X')
-
-        with tm.assertRaisesRegexp(TypeError,
-                                   "width must be of integer type, not*"):
-            result = values.str.rjust('f', fillchar='X')
-
     def test_zfill(self):
         values = Series(['1', '22', 'aaa', '333', '45678'])
 
@@ -1806,17 +1777,6 @@ def test_zfill(self):
         expected = Series(['00001', np.nan, '00aaa', np.nan, '45678'])
         tm.assert_series_equal(result, expected)
 
-    def test_zfill_width(self):
-        values = Series(['1', '22', 'ccc', NA, 'eeeee'])
-
-        result = values.str.zfill(5)
-        expected = Series(['00001', '00022', '00ccc', NA, 'eeeee'])
-        tm.assert_almost_equal(result, expected)
-
-        with tm.assertRaisesRegexp(TypeError,
-                                   "width must be of integer type, not*"):
-            result = values.str.zfill('f')
-
     def test_split(self):
         values = Series(['a_b_c', 'c_d_e', NA, 'f_g_h'])