Tests for previous commit

Author: toobaz

pandas/tests/indexing/test_multiindex.py

@@ -158,12 +158,44 @@ def test_loc_getitem_series(self):
         result = x.loc[[1, 3]]
         tm.assert_series_equal(result, expected)
 
+        # GH15424
+        y1 = Series([1, 3], index=[1, 2])
+        result = x.loc[y1]
+        tm.assert_series_equal(result, expected)
+
         empty = Series(data=[], dtype=np.float64)
         expected = Series([], index=MultiIndex(
             levels=index.levels, labels=[[], []], dtype=np.float64))
         result = x.loc[empty]
         tm.assert_series_equal(result, expected)
 
+    def test_loc_getitem_dataframe(self):
+        # passing a dataframe as a key with a MultiIndex
+        index = MultiIndex.from_product([[1, 2, 3], ['A', 'B', 'C']])
+        x = Series(index=index, data=range(9), dtype=np.float64)
+        idx_keys = [(1, 'A'), (2, 'C'), (3, 'B')]
+        y = DataFrame(idx_keys)
+        expected = Series(
+            data=[0, 5, 7],
+            index=MultiIndex.from_tuples(idx_keys),
+            dtype=np.float64)
+        result = x.loc[y]
+        tm.assert_series_equal(result, expected)
+
+        result = x.loc[idx_keys]
+        tm.assert_series_equal(result, expected)
+
+        # index should not matter at all:
+        y1 = DataFrame(idx_keys, index=[1, 2, 7])
+        result = x.loc[y1]
+        tm.assert_series_equal(result, expected)
+
+        empty = DataFrame(data=[], dtype=np.float64)
+        expected = Series([], index=MultiIndex(
+            levels=index.levels, labels=[[], []], dtype=np.float64))
+        result = x.loc[empty]
+        tm.assert_series_equal(result, expected)
+
     def test_iloc_getitem_multiindex(self):
         mi_labels = DataFrame(np.random.randn(4, 3),
                               columns=[['i', 'i', 'j'], ['A', 'A', 'B']],