Skip to content

Commit bb06cc4

Browse files
committed
fixed test-case reviewed changes
1 parent 77436f1 commit bb06cc4

File tree

1 file changed

+14
-25
lines changed

1 file changed

+14
-25
lines changed

pandas/tests/series/test_constructors.py

Lines changed: 14 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1445,11 +1445,11 @@ def test_constructor_tuple_of_tuples(self):
14451445
"data, expected_values, expected_index",
14461446
[
14471447
({(1, 2): 3, (None, 5): 6}, [3, 6], [(1, 2), (None, 5)]),
1448-
# GH 60695 test case
14491448
({(1,): 3, (4, 5): 6}, [3, 6], [(1, None), (4, 5)]),
14501449
],
14511450
)
14521451
def test_constructor_dict_of_tuples(self, data, expected_values, expected_index):
1452+
# GH 60695
14531453
result = Series(data).sort_values()
14541454
expected = Series(expected_values, index=MultiIndex.from_tuples(expected_index))
14551455
tm.assert_series_equal(result, expected)
@@ -1870,44 +1870,33 @@ class A(OrderedDict):
18701870
@pytest.mark.parametrize(
18711871
"data, expected_index_multi, expected_index_single",
18721872
[
1873+
({("a", "a"): 0.0, ("b", "a"): 1.0, ("b", "c"): 2.0}, True, None),
1874+
({("a",): 0.0, ("a", "b"): 1.0}, True, None),
18731875
(
1874-
{("a", "a"): 0.0, ("b", "a"): 1.0, ("b", "c"): 2.0},
1875-
MultiIndex.from_tuples([("a", "a"), ("b", "a"), ("b", "c")]),
1876+
{"z": 111.0, ("a", "a"): 0.0, ("b", "a"): 1.0, ("b", "c"): 2.0},
18761877
None,
1877-
),
1878-
(
1879-
{("a",): 0.0, ("a", "b"): 1.0},
1880-
MultiIndex.from_tuples([("a",), ("a", "b")]),
1881-
None,
1882-
),
1883-
(
1884-
{("a", "a"): 0.0, ("b", "a"): 1.0, ("b", "c"): 2.0, "z": 111.0},
1885-
None,
1886-
Index(["z", ("a", "a"), ("b", "a"), ("b", "c")], dtype=object),
1878+
True,
18871879
),
18881880
],
18891881
)
18901882
def test_constructor_dict_multiindex(
18911883
self, data, expected_index_multi, expected_index_single
18921884
):
1893-
if all(isinstance(k, tuple) for k in data.keys()):
1894-
sorted_data = sorted(data.items())
1895-
else:
1896-
sorted_data = list(data.items())
1897-
1885+
# GH#60695
18981886
result = Series(data)
18991887

19001888
if expected_index_multi is not None:
1901-
expected = Series([x[1] for x in sorted_data], index=expected_index_multi)
1889+
expected = Series(
1890+
list(data.values()),
1891+
index=MultiIndex.from_tuples(list(data.keys())),
1892+
)
19021893
tm.assert_series_equal(result, expected)
19031894

19041895
if expected_index_single is not None:
1905-
result = result.reindex(index=expected_index_single, fill_value=np.nan)
1906-
expected_values = [
1907-
data[idx] if idx in data else np.nan for idx in expected_index_single
1908-
]
1909-
expected = Series(expected_values, index=expected_index_single)
1910-
1896+
expected = Series(
1897+
list(data.values()),
1898+
index=Index(list(data.keys())),
1899+
)
19111900
tm.assert_series_equal(result, expected)
19121901

19131902
def test_constructor_dict_multiindex_reindex_flat(self):

0 commit comments

Comments
 (0)