Skip to content

Commit f7da06c

Browse files
committed
updates
1 parent ac9ebd1 commit f7da06c

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

tests/functions/test_conditional_join.py

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -826,14 +826,7 @@ def test_dual_conditions_eq_and_ne(df, right):
826826
"""Test output for equal and not equal conditions."""
827827
assume(not df.empty)
828828
assume(not right.empty)
829-
830829
eq_A, eq_B, ne_A, ne_B = ("B", "Numeric", "E", "Dates")
831-
832-
# nulls are not preserved for multiple conditions
833-
# that involve `!=`
834-
df = df.dropna(subset=["B", "E"])
835-
right = right.dropna(subset=["Numeric", "Dates"])
836-
837830
expected = (
838831
df.assign(t=1)
839832
.merge(right.assign(t=1), on="t")
@@ -848,8 +841,9 @@ def test_dual_conditions_eq_and_ne(df, right):
848841
how="inner",
849842
sort_by_appearance=True,
850843
)
851-
852-
actual = actual.filter([eq_A, eq_B, ne_A, ne_B])
844+
# nulls are not preserved for multiple conditions
845+
# that involve `!=`
846+
actual = actual.filter([eq_A, eq_B, ne_A, ne_B]).dropna()
853847
assert_frame_equal(actual, actual)
854848

855849

@@ -861,12 +855,6 @@ def test_dual_conditions_ne_and_eq(df, right):
861855
assume(not right.empty)
862856

863857
eq_A, eq_B, ne_A, ne_B = ("B", "Numeric", "E", "Dates")
864-
865-
# nulls are not preserved for multiple conditions
866-
# that involve `!=`
867-
df = df.dropna(subset=["B", "E"])
868-
right = right.dropna(subset=["Numeric", "Dates"])
869-
870858
expected = (
871859
df.assign(t=1)
872860
.merge(right.assign(t=1), on="t")
@@ -881,6 +869,7 @@ def test_dual_conditions_ne_and_eq(df, right):
881869
how="inner",
882870
sort_by_appearance=True,
883871
)
884-
885-
actual = actual.filter([eq_A, eq_B, ne_A, ne_B])
872+
# nulls are not preserved for multiple conditions
873+
# that involve `!=`
874+
actual = actual.filter([eq_A, eq_B, ne_A, ne_B]).dropna()
886875
assert_frame_equal(expected, actual)

0 commit comments

Comments
 (0)