Jeff's changes

Author: Brian Tu

pandas/tests/indexes/test_base.py

@@ -1092,11 +1092,6 @@ def test_get_indexer_nearest(self):
             tm.assert_numpy_array_equal(actual, np.array([0, 5, 9],
                                                          dtype=np.intp))
 
-            actual = idx.get_indexer([0, 5, 9], method=method,
-                                     tolerance=[0, 0, 0])
-            tm.assert_numpy_array_equal(actual, np.array([0, 5, 9],
-                                                         dtype=np.intp))
-
         for method, expected in zip(all_methods, [[0, 1, 8], [1, 2, 9],
                                                   [0, 2, 9]]):
             actual = idx.get_indexer([0.2, 1.8, 8.5], method=method)
@@ -1108,51 +1103,50 @@ def test_get_indexer_nearest(self):
             tm.assert_numpy_array_equal(actual, np.array(expected,
                                                          dtype=np.intp))
 
-            actual = idx.get_indexer([0.2, 1.8, 8.5], method=method,
-                                     tolerance=[1.5, 1, 1])
-            tm.assert_numpy_array_equal(actual, np.array(expected,
-                                                         dtype=np.intp))
-
         for method, expected in zip(all_methods, [[0, -1, -1], [-1, 2, -1],
                                                   [0, 2, -1]]):
             actual = idx.get_indexer([0.2, 1.8, 8.5], method=method,
                                      tolerance=0.2)
             tm.assert_numpy_array_equal(actual, np.array(expected,
                                                          dtype=np.intp))
 
-            actual = idx.get_indexer([0.2, 1.8, 8.5], method=method,
-                                     tolerance=[0.5, 0.2, 0.2])
-            tm.assert_numpy_array_equal(actual, np.array(expected,
-                                                         dtype=np.intp))
+        with tm.assert_raises_regex(ValueError, 'limit argument'):
+            idx.get_indexer([1, 0], method='nearest', limit=1)
 
-        for tolerance, expected in zip([[0.3, 0.3, 0.1], [0.2, 0.1, 0.1],
-                                        [0.1, 0.5, 0.5]],
-                                       [[0, 2, -1], [0, -1, -1],
-                                        [-1, 2, 9]]):
-            # list
-            actual = idx.get_indexer([0.2, 1.8, 8.5], method='nearest',
-                                     tolerance=tolerance)
-            tm.assert_numpy_array_equal(actual, np.array(expected,
+    def test_get_indexer_nearest_listtolerance(self):
+        idx = Index(np.arange(10))
+
+        all_methods = ['pad', 'backfill', 'nearest']
+        for method in all_methods:
+            actual = idx.get_indexer([0, 5, 9], method=method,
+                                     tolerance=[0, 0, 0])
+            tm.assert_numpy_array_equal(actual, np.array([0, 5, 9],
                                                          dtype=np.intp))
-            # tuple
-            actual = idx.get_indexer([0.2, 1.8, 8.5], method='nearest',
-                                     tolerance=tuple(tolerance))
+
+        for method, expected in zip(all_methods, [[0, 1, 8], [1, 2, 9],
+                                                  [0, 2, 9]]):
+            actual = idx.get_indexer([0.2, 1.8, 8.5], method=method,
+                                     tolerance=[1.5, 1, 1])
             tm.assert_numpy_array_equal(actual, np.array(expected,
                                                          dtype=np.intp))
-            # Series
-            actual = idx.get_indexer([0.2, 1.8, 8.5], method='nearest',
-                                     tolerance=Series(tolerance))
+
+        for method, expected in zip(all_methods, [[0, -1, -1], [-1, 2, -1],
+                                                  [0, 2, -1]]):
+            actual = idx.get_indexer([0.2, 1.8, 8.5], method=method,
+                                     tolerance=[0.5, 0.2, 0.2])
             tm.assert_numpy_array_equal(actual, np.array(expected,
                                                          dtype=np.intp))
-            # ndarray
+        for tolerance, expected, listtype in \
+                zip([[0.3, 0.3, 0.1], [0.2, 0.1, 0.1],
+                     [0.1, 0.5, 0.5]],
+                    [[0, 2, -1], [0, -1, -1],
+                     [-1, 2, 9]],
+                    (list, tuple, Series, np.array)):
             actual = idx.get_indexer([0.2, 1.8, 8.5], method='nearest',
-                                     tolerance=np.array(tolerance))
+                                     tolerance=listtype(tolerance))
             tm.assert_numpy_array_equal(actual, np.array(expected,
                                                          dtype=np.intp))
 
-        with tm.assert_raises_regex(ValueError, 'limit argument'):
-            idx.get_indexer([1, 0], method='nearest', limit=1)
-
     def test_get_indexer_nearest_decreasing(self):
         idx = Index(np.arange(10))[::-1]