@@ -189,37 +189,24 @@ def test_from_arrays_tuples(idx):
189
189
tm .assert_index_equal (result , idx )
190
190
191
191
192
- def test_from_arrays_index_series_datetimetz ():
193
- idx1 = date_range ("2015-01-01 10:00" , freq = "D" , periods = 3 , tz = "US/Eastern" )
194
- idx2 = date_range ("2015-01-01 10:00" , freq = "H" , periods = 3 , tz = "Asia/Tokyo" )
195
- result = MultiIndex .from_arrays ([idx1 , idx2 ])
196
- tm .assert_index_equal (result .get_level_values (0 ), idx1 )
197
- tm .assert_index_equal (result .get_level_values (1 ), idx2 )
198
-
199
- result2 = MultiIndex .from_arrays ([Series (idx1 ), Series (idx2 )])
200
- tm .assert_index_equal (result2 .get_level_values (0 ), idx1 )
201
- tm .assert_index_equal (result2 .get_level_values (1 ), idx2 )
202
-
203
- tm .assert_index_equal (result , result2 )
204
-
205
-
206
- def test_from_arrays_index_series_timedelta ():
207
- idx1 = pd .timedelta_range ("1 days" , freq = "D" , periods = 3 )
208
- idx2 = pd .timedelta_range ("2 hours" , freq = "H" , periods = 3 )
209
- result = MultiIndex .from_arrays ([idx1 , idx2 ])
210
- tm .assert_index_equal (result .get_level_values (0 ), idx1 )
211
- tm .assert_index_equal (result .get_level_values (1 ), idx2 )
212
-
213
- result2 = MultiIndex .from_arrays ([Series (idx1 ), Series (idx2 )])
214
- tm .assert_index_equal (result2 .get_level_values (0 ), idx1 )
215
- tm .assert_index_equal (result2 .get_level_values (1 ), idx2 )
216
-
217
- tm .assert_index_equal (result , result2 )
218
-
219
-
220
- def test_from_arrays_index_series_period ():
221
- idx1 = pd .period_range ("2011-01-01" , freq = "D" , periods = 3 )
222
- idx2 = pd .period_range ("2015-01-01" , freq = "H" , periods = 3 )
192
+ @pytest .mark .parametrize (
193
+ ("idx1" , "idx2" ),
194
+ [
195
+ (
196
+ pd .period_range ("2011-01-01" , freq = "D" , periods = 3 ),
197
+ pd .period_range ("2015-01-01" , freq = "H" , periods = 3 ),
198
+ ),
199
+ (
200
+ date_range ("2015-01-01 10:00" , freq = "D" , periods = 3 , tz = "US/Eastern" ),
201
+ date_range ("2015-01-01 10:00" , freq = "H" , periods = 3 , tz = "Asia/Tokyo" ),
202
+ ),
203
+ (
204
+ pd .timedelta_range ("1 days" , freq = "D" , periods = 3 ),
205
+ pd .timedelta_range ("2 hours" , freq = "H" , periods = 3 ),
206
+ ),
207
+ ],
208
+ )
209
+ def test_from_arrays_index_series_period_datetimetz_and_timedelta (idx1 , idx2 ):
223
210
result = MultiIndex .from_arrays ([idx1 , idx2 ])
224
211
tm .assert_index_equal (result .get_level_values (0 ), idx1 )
225
212
tm .assert_index_equal (result .get_level_values (1 ), idx2 )
0 commit comments