Rename, move and parametrize indexer test

Include some non-monotonic/overlapping IntervalIndex.
This triggers another bug, due to the fact that self.get_loc(i)
is called on an unexpected key.

Author: samuelsinayoko

pandas/core/indexes/interval.py

@@ -788,7 +788,10 @@ def get_loc(self, key, method=None):
                 left, right = _get_interval_closed_bounds(key)
                 return self._engine.get_loc_interval(left, right)
             else:
-                return self._engine.get_loc(key)
+                try:
+                    return self._engine.get_loc(key)
+                except TypeError:
+                    raise KeyError('No engine for key {!r}'.format(key))
 
     def get_value(self, series, key):
         if com.is_bool_indexer(key):
@@ -829,7 +832,8 @@ def get_indexer(self, target, method=None, limit=None, tolerance=None):
             except TypeError:
                 # This is probably wrong
                 # but not sure what I should do here
-                return np.array([-1])
+                #return np.array([-1])
+                return np.repeat(np.int(-1), len(target))
 
             start_plus_one = start + 1
             if not ((start_plus_one < stop).any()):
@@ -844,7 +848,13 @@ def get_indexer(self, target, method=None, limit=None, tolerance=None):
 
         # non IntervalIndex
         else:
-            indexer = np.concatenate([self.get_loc(i) for i in target])
+            vals = []
+            for i in target:
+                try:
+                    vals.append(self.get_loc(i))
+                except KeyError:
+                    vals.append(np.array([-1]))
+                indexer = np.concatenate(vals)
 
         return ensure_platform_int(indexer)
 

pandas/tests/indexes/interval/test_interval.py

@@ -616,6 +616,13 @@ def test_get_indexer_length_one(self, item, closed):
         expected = np.array([0] * len(item), dtype='intp')
         tm.assert_numpy_array_equal(result, expected)
 
+    @pytest.mark.parametrize('index', [
+        pd.interval_range(0, 1),
+        pd.IntervalIndex.from_tuples([(1, 3), (2, 4), (0, 2)])
+    ])
+    def test_get_indexer_errors(self, index):
+        assert np.all(index.get_indexer(['gg']) == np.array([-1]))
+
     # Make consistent with test_interval_new.py (see #16316, #16386)
     @pytest.mark.parametrize('arrays', [
         (date_range('20180101', periods=4), date_range('20180103', periods=4)),
@@ -886,13 +893,6 @@ def test_symmetric_difference(self, closed, sort):
         result = index.symmetric_difference(other, sort=sort)
         tm.assert_index_equal(result, expected)
 
-    def test_interval_range_get_indexer_with_different_input_type(self):
-        # not sure about this one
-        index = pd.interval_range(0, 1)
-        # behaviour should be the same as Int64Index and return an
-        # array with values of -1
-        assert np.all(index.get_indexer(['gg']) == np.array([-1]))
-
     @pytest.mark.parametrize('op_name', [
         'union', 'intersection', 'difference', 'symmetric_difference'])
     @pytest.mark.parametrize("sort", [None, False])