TST: change from using unittest.TestCase directly to using pandas.util.testing.TestCase

Author: jreback

pandas/io/tests/test_clipboard.py

@@ -19,7 +19,7 @@
 class TestClipboard(tm.TestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestClipboard, cls).setupClass()
+        super(TestClipboard, cls).setUpClass()
         cls.data = {}
         cls.data['string'] = mkdf(5, 3, c_idx_type='s', r_idx_type='i',
                                   c_idx_names=[None], r_idx_names=[None])

pandas/io/tests/test_cparser.py

@@ -9,7 +9,6 @@
 import os
 import sys
 import re
-import unittest
 
 import nose
 
@@ -32,7 +31,7 @@
 import pandas.parser as parser
 
 
-class TestCParser(unittest.TestCase):
+class TestCParser(tm.TestCase):
 
     def setUp(self):
         self.dirpath = tm.get_data_path()
@@ -132,7 +131,7 @@ def test_integer_thousands(self):
 
         expected = [123456, 12500]
         tm.assert_almost_equal(result[0], expected)
-        
+
     def test_integer_thousands_alt(self):
         data = '123.456\n12.500'
 

pandas/io/tests/test_data.py

@@ -37,7 +37,7 @@ def assert_n_failed_equals_n_null_columns(wngs, obj, cls=SymbolWarning):
 class TestGoogle(tm.TestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestGoogle, cls).setupClass()
+        super(TestGoogle, cls).setUpClass()
         cls.locales = tm.get_locales(prefix='en_US')
         if not cls.locales:
             raise nose.SkipTest("US English locale not available for testing")
@@ -109,7 +109,7 @@ def test_get_multi2(self):
 class TestYahoo(tm.TestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestYahoo, cls).setupClass()
+        super(TestYahoo, cls).setUpClass()
         _skip_if_no_lxml()
 
     @network
@@ -229,7 +229,7 @@ def test_get_date_ret_index(self):
 class TestYahooOptions(tm.TestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestYahooOptions, cls).setupClass()
+        super(TestYahooOptions, cls).setUpClass()
         _skip_if_no_lxml()
 
         # aapl has monthlies
@@ -290,7 +290,7 @@ def test_get_put_data(self):
 class TestOptionsWarnings(tm.TestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestOptionsWarnings, cls).setupClass()
+        super(TestOptionsWarnings, cls).setUpClass()
         _skip_if_no_lxml()
 
         with assert_produces_warning(FutureWarning):

pandas/io/tests/test_date_converters.py

@@ -4,7 +4,6 @@
 import os
 import sys
 import re
-import unittest
 
 import nose
 
@@ -22,9 +21,9 @@
 from pandas import compat
 from pandas.lib import Timestamp
 import pandas.io.date_converters as conv
+import pandas.util.testing as tm
 
-
-class TestConverters(unittest.TestCase):
+class TestConverters(tm.TestCase):
 
     def setUp(self):
         self.years = np.array([2007, 2008])

pandas/io/tests/test_excel.py

@@ -3,7 +3,6 @@
 from pandas.compat import u, range, map
 from datetime import datetime
 import os
-import unittest
 
 import nose
 
@@ -86,7 +85,7 @@ def read_csv(self, *args, **kwds):
         return read_csv(*args, **kwds)
 
 
-class ExcelReaderTests(SharedItems, unittest.TestCase):
+class ExcelReaderTests(SharedItems, tm.TestCase):
     def test_parse_cols_int(self):
         _skip_if_no_openpyxl()
         _skip_if_no_xlrd()
@@ -942,7 +941,7 @@ def test_swapped_columns(self):
             tm.assert_series_equal(write_frame['B'], read_frame['B'])
 
 
-class OpenpyxlTests(ExcelWriterBase, unittest.TestCase):
+class OpenpyxlTests(ExcelWriterBase, tm.TestCase):
     ext = '.xlsx'
     engine_name = 'openpyxl'
     check_skip = staticmethod(_skip_if_no_openpyxl)
@@ -975,7 +974,7 @@ def test_to_excel_styleconverter(self):
                           xlsx_style.alignment.vertical)
 
 
-class XlwtTests(ExcelWriterBase, unittest.TestCase):
+class XlwtTests(ExcelWriterBase, tm.TestCase):
     ext = '.xls'
     engine_name = 'xlwt'
     check_skip = staticmethod(_skip_if_no_xlwt)
@@ -1002,13 +1001,13 @@ def test_to_excel_styleconverter(self):
         self.assertEquals(xlwt.Alignment.VERT_TOP, xls_style.alignment.vert)
 
 
-class XlsxWriterTests(ExcelWriterBase, unittest.TestCase):
+class XlsxWriterTests(ExcelWriterBase, tm.TestCase):
     ext = '.xlsx'
     engine_name = 'xlsxwriter'
     check_skip = staticmethod(_skip_if_no_xlsxwriter)
 
 
-class OpenpyxlTests_NoMerge(ExcelWriterBase, unittest.TestCase):
+class OpenpyxlTests_NoMerge(ExcelWriterBase, tm.TestCase):
     ext = '.xlsx'
     engine_name = 'openpyxl'
     check_skip = staticmethod(_skip_if_no_openpyxl)
@@ -1017,7 +1016,7 @@ class OpenpyxlTests_NoMerge(ExcelWriterBase, unittest.TestCase):
     merge_cells = False
 
 
-class XlwtTests_NoMerge(ExcelWriterBase, unittest.TestCase):
+class XlwtTests_NoMerge(ExcelWriterBase, tm.TestCase):
     ext = '.xls'
     engine_name = 'xlwt'
     check_skip = staticmethod(_skip_if_no_xlwt)
@@ -1026,7 +1025,7 @@ class XlwtTests_NoMerge(ExcelWriterBase, unittest.TestCase):
     merge_cells = False
 
 
-class XlsxWriterTests_NoMerge(ExcelWriterBase, unittest.TestCase):
+class XlsxWriterTests_NoMerge(ExcelWriterBase, tm.TestCase):
     ext = '.xlsx'
     engine_name = 'xlsxwriter'
     check_skip = staticmethod(_skip_if_no_xlsxwriter)
@@ -1035,7 +1034,7 @@ class XlsxWriterTests_NoMerge(ExcelWriterBase, unittest.TestCase):
     merge_cells = False
 
 
-class ExcelWriterEngineTests(unittest.TestCase):
+class ExcelWriterEngineTests(tm.TestCase):
     def test_ExcelWriter_dispatch(self):
         with tm.assertRaisesRegexp(ValueError, 'No engine'):
             ExcelWriter('nothing')

pandas/io/tests/test_ga.py

@@ -1,12 +1,12 @@
 import os
-import unittest
 from datetime import datetime
 
 import nose
 import pandas as pd
 from pandas import DataFrame
 from pandas.util.testing import network, assert_frame_equal, with_connectivity_check
 from numpy.testing.decorators import slow
+import pandas.util.testing as tm
 
 try:
     import httplib2
@@ -17,7 +17,7 @@
 except ImportError:
     raise nose.SkipTest("need httplib2 and auth libs")
 
-class TestGoogle(unittest.TestCase):
+class TestGoogle(tm.TestCase):
 
     _multiprocess_can_split_ = True
 
@@ -103,17 +103,17 @@ def test_v2_advanced_segment_format(self):
         advanced_segment_id = 1234567
         query = ga.format_query('google_profile_id', ['visits'], '2013-09-01', segment=advanced_segment_id)
         assert query['segment'] == 'gaid::' + str(advanced_segment_id), "An integer value should be formatted as an advanced segment."
-    
+
     def test_v2_dynamic_segment_format(self):
         dynamic_segment_id = 'medium==referral'
         query = ga.format_query('google_profile_id', ['visits'], '2013-09-01', segment=dynamic_segment_id)
         assert query['segment'] == 'dynamic::ga:' + str(dynamic_segment_id), "A string value with more than just letters and numbers should be formatted as a dynamic segment."
-    
+
     def test_v3_advanced_segment_common_format(self):
         advanced_segment_id = 'aZwqR234'
         query = ga.format_query('google_profile_id', ['visits'], '2013-09-01', segment=advanced_segment_id)
         assert query['segment'] == 'gaid::' + str(advanced_segment_id), "A string value with just letters and numbers should be formatted as an advanced segment."
-    
+
     def test_v3_advanced_segment_weird_format(self):
         advanced_segment_id = 'aZwqR234-s1'
         query = ga.format_query('google_profile_id', ['visits'], '2013-09-01', segment=advanced_segment_id)

pandas/io/tests/test_gbq.py

@@ -138,28 +138,30 @@ def setUp(self):
           'NULL_BOOLEAN']]
 
     @classmethod
-    def setUpClass(self):
+    def setUpClass(cls):
         # Integration tests require a valid bigquery token
         # be present in the user's home directory. This
         # can be generated with 'bq init' in the command line
-        super(TestGbq, cls).setupClass()
-        self.dirpath = tm.get_data_path()
+        super(TestGbq, cls).setUpClass()
+        cls.dirpath = tm.get_data_path()
         home = os.path.expanduser("~")
-        self.bq_token = os.path.join(home, '.bigquery.v2.token')
-        self.fake_job_path = os.path.join(self.dirpath, 'gbq_fake_job.txt')
+        cls.bq_token = os.path.join(home, '.bigquery.v2.token')
+        cls.fake_job_path = os.path.join(cls.dirpath, 'gbq_fake_job.txt')
 
         # If we're using a valid token, make a test dataset
         # Note, dataset functionality is beyond the scope
         # of the module under test, so we rely on the command
         # line utility for this.
-        if os.path.exists(self.bq_token):
+        if os.path.exists(cls.bq_token):
             subprocess.call(['bq','mk', '-d', 'pandas_testing_dataset'])
 
     @classmethod
-    def tearDownClass(self):
+    def tearDownClass(cls):
+        super(TestGbq, cls).tearDownClass()
+
         # If we're using a valid token, remove the test dataset
         # created.
-        if os.path.exists(self.bq_token):
+        if os.path.exists(cls.bq_token):
             subprocess.call(['bq', 'rm', '-r', '-f', '-d', 'pandas_testing_dataset'])
 
     @with_connectivity_check

pandas/io/tests/test_html.py

@@ -87,7 +87,7 @@ def test_bs4_version_fails():
 class TestReadHtml(tm.TestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestReadHtml, cls).setupClass()
+        super(TestReadHtml, cls).setUpClass()
         _skip_if_none_of(('bs4', 'html5lib'))
 
     def read_html(self, *args, **kwargs):
@@ -585,7 +585,7 @@ def test_parse_dates_combine(self):
 class TestReadHtmlLxml(tm.TestCase):
     @classmethod
     def setUpClass(cls):
-        super(TestReadHtmlLxml, cls).setupClass()
+        super(TestReadHtmlLxml, cls).setUpClass()
         _skip_if_no('lxml')
 
     def read_html(self, *args, **kwargs):

pandas/io/tests/test_json/test_pandas.py

@@ -2,7 +2,6 @@
 from pandas.compat import range, lrange, StringIO
 from pandas import compat
 import os
-import unittest
 
 import numpy as np
 
@@ -27,7 +26,7 @@
 
 _mixed_frame = _frame.copy()
 
-class TestPandasContainer(unittest.TestCase):
+class TestPandasContainer(tm.TestCase):
 
     def setUp(self):
         self.dirpath = tm.get_data_path()

pandas/io/tests/test_json_norm.py

@@ -1,5 +1,4 @@
 import nose
-import unittest
 
 from pandas import DataFrame
 import numpy as np
@@ -15,7 +14,7 @@ def _assert_equal_data(left, right):
     tm.assert_frame_equal(left, right)
 
 
-class TestJSONNormalize(unittest.TestCase):
+class TestJSONNormalize(tm.TestCase):
 
     def setUp(self):
         self.state_data = [
@@ -165,7 +164,7 @@ def test_record_prefix(self):
         tm.assert_frame_equal(result, expected)
 
 
-class TestNestedToRecord(unittest.TestCase):
+class TestNestedToRecord(tm.TestCase):
 
     def test_flat_stays_flat(self):
         recs = [dict(flat1=1,flat2=2),

pandas/io/tests/test_packers.py

@@ -1,5 +1,4 @@
 import nose
-import unittest
 
 import datetime
 import numpy as np
@@ -44,7 +43,7 @@ def check_arbitrary(a, b):
         assert(a == b)
 
 
-class Test(unittest.TestCase):
+class TestPackers(tm.TestCase):
 
     def setUp(self):
         self.path = '__%s__.msg' % tm.rands(10)
@@ -57,7 +56,7 @@ def encode_decode(self, x, **kwargs):
             to_msgpack(p, x, **kwargs)
             return read_msgpack(p, **kwargs)
 
-class TestAPI(Test):
+class TestAPI(TestPackers):
 
     def test_string_io(self):
 
@@ -94,7 +93,7 @@ def test_iterator_with_string_io(self):
         for i, result in enumerate(read_msgpack(s,iterator=True)):
             tm.assert_frame_equal(result,dfs[i])
 
-class TestNumpy(Test):
+class TestNumpy(TestPackers):
 
     def test_numpy_scalar_float(self):
         x = np.float32(np.random.rand())
@@ -187,7 +186,7 @@ def test_list_mixed(self):
         x_rec = self.encode_decode(x)
         tm.assert_almost_equal(x,x_rec)
 
-class TestBasic(Test):
+class TestBasic(TestPackers):
 
     def test_timestamp(self):
 
@@ -219,7 +218,7 @@ def test_timedeltas(self):
             self.assert_(i == i_rec)
 
 
-class TestIndex(Test):
+class TestIndex(TestPackers):
 
     def setUp(self):
         super(TestIndex, self).setUp()
@@ -273,7 +272,7 @@ def test_unicode(self):
         #self.assert_(i.equals(i_rec))
 
 
-class TestSeries(Test):
+class TestSeries(TestPackers):
 
     def setUp(self):
         super(TestSeries, self).setUp()
@@ -312,7 +311,7 @@ def test_basic(self):
                 assert_series_equal(i, i_rec)
 
 
-class TestNDFrame(Test):
+class TestNDFrame(TestPackers):
 
     def setUp(self):
         super(TestNDFrame, self).setUp()
@@ -374,7 +373,7 @@ def test_iterator(self):
                 check_arbitrary(packed, l[i])
 
 
-class TestSparse(Test):
+class TestSparse(TestPackers):
 
     def _check_roundtrip(self, obj, comparator, **kwargs):