removing the named_index fixture

Author: elmq0022

pandas/tests/indexes/multi/conftest.py

@@ -22,11 +22,6 @@ def idx():
     return index
 
 
-@pytest.fixture
-def named_index(idx):
-    return {'index': idx}
-
-
 @pytest.fixture
 def index_names():
     return ['first', 'second']

pandas/tests/indexes/multi/test_contains.py

@@ -4,9 +4,8 @@
 import pandas as pd
 import pandas.util.testing as tm
 import pytest
-from pandas import Int64Index, MultiIndex, PeriodIndex, UInt64Index
+from pandas import MultiIndex
 from pandas.compat import PYPY
-from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin, iNaT
 
 
 def test_contains_top_level():
@@ -94,37 +93,37 @@ def test_isin_level_kwarg():
     pytest.raises(KeyError, idx.isin, vals_1, level='C')
 
 
-def test_hasnans_isnans(named_index):
+def test_hasnans_isnans(idx):
     # GH 11343, added tests for hasnans / isnans
-    for name, index in named_index.items():
-        if isinstance(index, MultiIndex):
-            pass
-        else:
-            idx = index.copy()
-
-            # cases in indices doesn't include NaN
-            expected = np.array([False] * len(idx), dtype=bool)
-            tm.assert_numpy_array_equal(idx._isnan, expected)
-            assert not idx.hasnans
-
-            idx = index.copy()
-            values = idx.values
-
-            if len(index) == 0:
-                continue
-            elif isinstance(index, DatetimeIndexOpsMixin):
-                values[1] = iNaT
-            elif isinstance(index, (Int64Index, UInt64Index)):
-                continue
-            else:
-                values[1] = np.nan
-
-            if isinstance(index, PeriodIndex):
-                idx = index.__class__(values, freq=index.freq)
-            else:
-                idx = index.__class__(values)
-
-            expected = np.array([False] * len(idx), dtype=bool)
-            expected[1] = True
-            tm.assert_numpy_array_equal(idx._isnan, expected)
-            assert idx.hasnans
+    # TODO: remove or change test not valid for MultiIndex
+    if isinstance(idx, MultiIndex):
+        pass
+    # else:
+    #     _index = idx.copy()
+
+    #     # cases in indices doesn't include NaN
+    #     expected = np.array([False] * len(_index), dtype=bool)
+    #     tm.assert_numpy_array_equal(_index._isnan, expected)
+    #     assert not _index.hasnans
+
+    #     _index = idx.copy()
+    #     values = _index.values
+
+    #     if len(idx) == 0:
+    #         continue
+    #     elif isinstance(idx, DatetimeIndexOpsMixin):
+    #         values[1] = iNaT
+    #     elif isinstance(idx, (Int64Index, UInt64Index)):
+    #         continue
+    #     else:
+    #         values[1] = np.nan
+
+    #     if isinstance(idx, PeriodIndex):
+    #         _index = idx.__class__(values, freq=idx.freq)
+    #     else:
+    #         _index = idx.__class__(values)
+
+    #     expected = np.array([False] * len(_index), dtype=bool)
+    #     expected[1] = True
+    #     tm.assert_numpy_array_equal(_index._isnan, expected)
+    #     assert _index.hasnans

pandas/tests/indexes/multi/test_copy.py

@@ -40,11 +40,12 @@ def test_view(idx):
     assert_multiindex_copied(i_view, idx)
 
 
-def test_copy_name(named_index):
+def test_copy_name(idx):
     # gh-12309: Check that the "name" argument
     # passed at initialization is honored.
 
-    for name, index in compat.iteritems(named_index):
+    # TODO: Remove or refactor MultiIndex not tested.
+    for name, index in compat.iteritems({'idx': idx}):
         if isinstance(index, MultiIndex):
             continue
 
@@ -69,10 +70,12 @@ def test_copy_name(named_index):
             assert s3.index.name == 'mario'
 
 
-def test_ensure_copied_data(named_index):
+def test_ensure_copied_data(idx):
     # Check the "copy" argument of each Index.__new__ is honoured
     # GH12309
-    for name, index in compat.iteritems(named_index):
+    # TODO: REMOVE THIS TEST.  MultiIndex is tested seperately as noted below.
+
+    for name, index in compat.iteritems({'idx': idx}):
         init_kwargs = {}
         if isinstance(index, PeriodIndex):
             # Needs "freq" specification:

pandas/tests/indexes/multi/test_equivalence.py

@@ -9,9 +9,9 @@
 from pandas.compat import lrange, lzip, range
 
 
-def test_equals(named_index):
-
-    for name, idx in compat.iteritems(named_index):
+def test_equals(idx):
+    # TODO: Remove or Refactor. MultiIndex not tested.
+    for name, idx in compat.iteritems({'idx': idx}):
         assert idx.equals(idx)
         assert idx.equals(idx.copy())
         assert idx.equals(idx.astype(object))
@@ -208,11 +208,12 @@ def test_is_numeric(idx):
     assert not idx.is_numeric()
 
 
-def test_nulls(named_index):
+def test_nulls(idx):
     # this is really a smoke test for the methods
     # as these are adequately tested for function elsewhere
 
-    for name, index in named_index.items():
+    # TODO: Remove or Refactor. MultiIndex not Implemeted.
+    for name, index in [('idx', idx), ]:
         if len(index) == 0:
             tm.assert_numpy_array_equal(
                 index.isna(), np.array([], dtype=bool))

pandas/tests/indexes/multi/test_get_set.py

@@ -630,21 +630,20 @@ def test_get_unique_index(idx):
         tm.assert_index_equal(result, expected)
 
 
-def test_get_indexer_consistency(named_index):
+def test_get_indexer_consistency(idx):
     # See GH 16819
-    for name, index in named_index.items():
-        if isinstance(index, IntervalIndex):
-            continue
-
-        if index.is_unique or isinstance(index, CategoricalIndex):
-            indexer = index.get_indexer(index[0:2])
-            assert isinstance(indexer, np.ndarray)
-            assert indexer.dtype == np.intp
-        else:
-            e = "Reindexing only valid with uniquely valued Index objects"
-            with tm.assert_raises_regex(InvalidIndexError, e):
-                indexer = index.get_indexer(index[0:2])
-
-        indexer, _ = index.get_indexer_non_unique(index[0:2])
+    if isinstance(idx, IntervalIndex):
+        pass
+
+    if idx.is_unique or isinstance(idx, CategoricalIndex):
+        indexer = idx.get_indexer(idx[0:2])
         assert isinstance(indexer, np.ndarray)
         assert indexer.dtype == np.intp
+    else:
+        e = "Reindexing only valid with uniquely valued Index objects"
+        with tm.assert_raises_regex(InvalidIndexError, e):
+            indexer = idx.get_indexer(idx[0:2])
+
+    indexer, _ = idx.get_indexer_non_unique(idx[0:2])
+    assert isinstance(indexer, np.ndarray)
+    assert indexer.dtype == np.intp

pandas/tests/indexes/multi/test_indexing.py

@@ -6,8 +6,7 @@
 import numpy as np
 import pandas.util.testing as tm
 import pytest
-from pandas import (Index, Int64Index, MultiIndex, PeriodIndex, RangeIndex,
-                    UInt64Index, compat)
+from pandas import Index, Int64Index, MultiIndex, PeriodIndex, UInt64Index
 from pandas.compat import lrange
 from pandas.core.indexes.datetimelike import DatetimeIndexOpsMixin, iNaT
 
@@ -141,47 +140,36 @@ def test_shift(idx):
     pytest.raises(NotImplementedError, idx.shift, 1, 2)
 
 
-def test_insert_base(named_index):
+def test_insert_base(idx):
 
-    for name, idx in compat.iteritems(named_index):
-        result = idx[1:4]
+    result = idx[1:4]
 
-        if not len(idx):
-            continue
+    # test 0th element
+    assert idx[0:4].equals(result.insert(0, idx[0]))
 
-        # test 0th element
-        assert idx[0:4].equals(result.insert(0, idx[0]))
 
+def test_delete_base(idx):
 
-def test_delete_base(named_index):
+    expected = idx[1:]
+    result = idx.delete(0)
+    assert result.equals(expected)
+    assert result.name == expected.name
 
-    for name, idx in compat.iteritems(named_index):
+    expected = idx[:-1]
+    result = idx.delete(-1)
+    assert result.equals(expected)
+    assert result.name == expected.name
 
-        if not len(idx):
-            continue
+    with pytest.raises((IndexError, ValueError)):
+        # either depending on numpy version
+        result = idx.delete(len(idx))
 
-        if isinstance(idx, RangeIndex):
-            # tested in class
-            continue
 
-        expected = idx[1:]
-        result = idx.delete(0)
-        assert result.equals(expected)
-        assert result.name == expected.name
-
-        expected = idx[:-1]
-        result = idx.delete(-1)
-        assert result.equals(expected)
-        assert result.name == expected.name
-
-        with pytest.raises((IndexError, ValueError)):
-            # either depending on numpy version
-            result = idx.delete(len(idx))
-
-
-def test_fillna(named_index):
+def test_fillna(idx):
     # GH 11343
-    for name, index in named_index.items():
+
+    # TODO: Remove or Refactor.  Not Implemented for MultiIndex
+    for name, index in [('idx', idx), ]:
         if len(index) == 0:
             pass
         elif isinstance(index, MultiIndex):

pandas/tests/indexes/multi/test_integrity.py

@@ -7,7 +7,7 @@
 import pandas.util.testing as tm
 import pytest
 from pandas import (DataFrame, IntervalIndex, MultiIndex,
-                    RangeIndex, compat, date_range)
+                    RangeIndex, date_range)
 from pandas.compat import lrange, range
 from pandas.core.dtypes.cast import construct_1d_object_array_from_listlike
 
@@ -378,26 +378,25 @@ def testit(ind):
     tm.assert_raises_regex(ValueError, "^Length", testit, indices)
 
 
-def test_memory_usage(named_index):
-    for name, index in compat.iteritems(named_index):
-        result = index.memory_usage()
-        if len(index):
-            index.get_loc(index[0])
-            result2 = index.memory_usage()
-            result3 = index.memory_usage(deep=True)
+def test_memory_usage(idx):
+    result = idx.memory_usage()
+    if len(idx):
+        idx.get_loc(idx[0])
+        result2 = idx.memory_usage()
+        result3 = idx.memory_usage(deep=True)
 
-            # RangeIndex, IntervalIndex
-            # don't have engines
-            if not isinstance(index, (RangeIndex, IntervalIndex)):
-                assert result2 > result
+        # RangeIndex, IntervalIndex
+        # don't have engines
+        if not isinstance(idx, (RangeIndex, IntervalIndex)):
+            assert result2 > result
 
-            if index.inferred_type == 'object':
-                assert result3 > result2
+        if idx.inferred_type == 'object':
+            assert result3 > result2
 
-        else:
+    else:
 
-            # we report 0 for no-length
-            assert result == 0
+        # we report 0 for no-length
+        assert result == 0
 
 
 def test_nlevels(idx):