Skip to content

Commit 81503e7

Browse files
committed
update to tests
1 parent 274c963 commit 81503e7

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

tests/functions/test_conditional_join.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -833,17 +833,18 @@ def test_dual_conditions_eq_and_ne(df, right):
833833
.query(f"{eq_A} == {eq_B} and {ne_A} != {ne_B}")
834834
.reset_index(drop=True)
835835
)
836-
expected = expected.filter([eq_A, eq_B, ne_A, ne_B])
836+
# nulls are not preserved for multiple conditions
837+
# that involve `!=`
838+
expected = expected.filter([eq_A, eq_B, ne_A, ne_B]).dropna()
837839
actual = df.conditional_join(
838840
right,
839841
(eq_A, eq_B, "=="),
840842
(ne_A, ne_B, "!="),
841843
how="inner",
842844
sort_by_appearance=True,
843845
)
844-
# nulls are not preserved for multiple conditions
845-
# that involve `!=`
846-
actual = actual.filter([eq_A, eq_B, ne_A, ne_B]).dropna()
846+
847+
actual = actual.filter([eq_A, eq_B, ne_A, ne_B])
847848
assert_frame_equal(actual, actual)
848849

849850

@@ -861,15 +862,16 @@ def test_dual_conditions_ne_and_eq(df, right):
861862
.query(f"{eq_A} != {eq_B} and {ne_A} == {ne_B}")
862863
.reset_index(drop=True)
863864
)
864-
expected = expected.filter([eq_A, eq_B, ne_A, ne_B])
865+
# nulls are not preserved for multiple conditions
866+
# that involve `!=`
867+
expected = expected.filter([eq_A, eq_B, ne_A, ne_B]).dropna()
865868
actual = df.conditional_join(
866869
right,
867870
(eq_A, eq_B, "!="),
868871
(ne_A, ne_B, "=="),
869872
how="inner",
870873
sort_by_appearance=True,
871874
)
872-
# nulls are not preserved for multiple conditions
873-
# that involve `!=`
874-
actual = actual.filter([eq_A, eq_B, ne_A, ne_B]).dropna()
875+
876+
actual = actual.filter([eq_A, eq_B, ne_A, ne_B])
875877
assert_frame_equal(expected, actual)

0 commit comments

Comments
 (0)