| @@ -109,6 +109,15 @@ def test_merge_misspecified(self): |
|
|
| 109 |
109 |
self.assertRaises(ValueError, merge, self.df, self.df2, |
| 110 |
110 |
left_on=['key1'], right_on=['key1', 'key2']) |
| 111 |
111 |
|
|
112 |
+def test_index_and_on_parameters_confusion(self): |
|
113 |
+self.assertRaises(ValueError, merge, self.df, self.df2, how='left', |
|
114 |
+left_index=False, right_index=['key1', 'key2']) |
|
115 |
+self.assertRaises(ValueError, merge, self.df, self.df2, how='left', |
|
116 |
+left_index=['key1', 'key2'], right_index=False) |
|
117 |
+self.assertRaises(ValueError, merge, self.df, self.df2, how='left', |
|
118 |
+left_index=['key1', 'key2'], |
|
119 |
+right_index=['key1', 'key2']) |
|
120 |
+ |
| 112 |
121 |
def test_merge_overlap(self): |
| 113 |
122 |
merged = merge(self.left, self.left, on='key') |
| 114 |
123 |
exp_len = (self.left['key'].value_counts() ** 2).sum() |