fix tests

Author: aram-cedarwood

pandas/tests/computation/test_eval.py

@@ -1978,140 +1978,6 @@ def test_eval_no_support_column_name(request, column):
     tm.assert_frame_equal(result, expected)
 
 
-def test_query_on_column_name_with_hashtag_character():
-    # GH 59285
-    df = DataFrame((1, 2, 3), columns=["a#"])
-    result = df.query("`a#` < 2")
-    expected = df[df["a#"] < 2]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_comment():
-    # GH 59285
-    df = DataFrame((1, 2, 3), columns=["a#"])
-    result = df.query("`a#` < 2  # This is a comment")
-    expected = df[df["a#"] < 2]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_column_name_with_backtick_and_hash():
-    # GH 59285
-    df = DataFrame((1, 2, 3), columns=["a`#b"])
-    result = df.query("`a``#b` < 2")
-    expected = df[df["a`#b"] < 2]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_column_name_with_backtick():
-    # GH 59285
-    df = DataFrame({"a`b": (1, 2, 3), "ab": (4, 5, 6)})
-    result = df.query("`a``b` < 2")
-    # Note: Formatting checks may wrongly consider the above ``inline code``.
-    expected = df[df["a`b"] < 2]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_string_with_backticks():
-    # GH 59285
-    df = DataFrame(("`", "`````", "``````````"), columns=["#backticks"])
-    result = df.query("'```' < `#backticks`")
-    expected = df["```" < df["#backticks"]]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_string_with_backticked_substring_same_as_column_name():
-    # GH 59285
-    df = DataFrame(("`", "`````", "``````````"), columns=["#backticks"])
-    result = df.query("'`#backticks`' < `#backticks`")
-    expected = df["`#backticks`" < df["#backticks"]]
-    tm.assert_frame_equal(result, expected)
-
-
-@pytest.mark.parametrize(
-    "col1,col2,expr",
-    [
-        ("it's", "that's", "`it's` < `that's`"),
-        ('it"s', 'that"s', '`it"s` < `that"s`'),
-        ("it's", 'that\'s "nice"', "`it's` < `that's \"nice\"`"),
-        ("it's", "that's #cool", "`it's` < `that's #cool` # This is a comment"),
-    ],
-)
-def test_query_on_column_names_with_special_characters(col1, col2, expr):
-    # GH 59285
-    df = DataFrame(
-        [
-            {col1: 1, col2: 2},
-            {col1: 3, col2: 4},
-            {col1: -1, col2: -2},
-            {col1: -3, col2: -4},
-        ]
-    )
-    result = df.query(expr)
-    expected = df[df[col1] < df[col2]]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_no_backticks():
-    # GH 59285
-    df = DataFrame(("aaa", "vvv", "zzz"), columns=["column_name"])
-    result = df.query("'value' < column_name")
-    expected = df["value" < df["column_name"]]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_no_quotes_and_backtick_is_unmatched():
-    # GH 59285
-    df = DataFrame((1, 5, 10), columns=["column-name"])
-    with pytest.raises(SyntaxError, match="invalid syntax"):
-        df.query("5 < `column-name")
-
-
-def test_query_on_expr_with_no_quotes_and_backtick_is_matched():
-    # GH 59285
-    df = DataFrame((1, 5, 10), columns=["column-name"])
-    result = df.query("5 < `column-name`")
-    expected = df[5 < df["column-name"]]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_backtick_opened_before_quote_and_backtick_is_unmatched():
-    # GH 59285
-    df = DataFrame((1, 5, 10), columns=["It's"])
-    with pytest.raises(SyntaxError, match="unterminated string literal"):
-        df.query("5 < `It's")
-
-
-def test_query_on_expr_with_backtick_opened_before_quote_and_backtick_is_matched():
-    # GH 59285
-    df = DataFrame((1, 5, 10), columns=["It's"])
-    result = df.query("5 < `It's`")
-    expected = df[5 < df["It's"]]
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_quote_opened_before_backtick_and_quote_is_unmatched():
-    # GH 59285
-    df = DataFrame(("aaa", "vvv", "zzz"), columns=["column-name"])
-    with pytest.raises(SyntaxError, match="unterminated string literal"):
-        df.query("`column-name` < 'It`s that\\'s \"quote\" #hash")
-
-
-def test_query_on_expr_with_quote_opened_before_backtick_and_quote_is_matched_at_end():
-    # GH 59285
-    df = DataFrame(("aaa", "vvv", "zzz"), columns=["column-name"])
-    result = df.query("`column-name` < 'It`s that\\'s \"quote\" #hash'")
-    expected = df[df["column-name"] < 'It`s that\'s "quote" #hash']
-    tm.assert_frame_equal(result, expected)
-
-
-def test_query_on_expr_with_quote_opened_before_backtick_and_quote_is_matched_in_mid():
-    # GH 59285
-    df = DataFrame(("aaa", "vvv", "zzz"), columns=["column-name"])
-    result = df.query("'It`s that\\'s \"quote\" #hash' < `column-name`")
-    expected = df['It`s that\'s "quote" #hash' < df["column-name"]]
-    tm.assert_frame_equal(result, expected)
-
-
 def test_set_inplace():
     # https://github.com/pandas-dev/pandas/issues/47449
     # Ensure we don't only update the DataFrame inplace, but also the actual

pandas/tests/frame/test_query_eval.py

@@ -1341,20 +1341,139 @@ def test_missing_attribute(self, df):
         with pytest.raises(AttributeError, match=message):
             df.eval("@pd.thing")
 
-    def test_failing_quote(self, df):
-        msg = r"(Could not convert ).*( to a valid Python identifier.)"
-        with pytest.raises(SyntaxError, match=msg):
-            df.query("`it's` > `that's`")
+    def test_quote(self, df):
+        res = df.query("`it's` > `that's`")
+        expect = df[df["it's"] > df["that's"]]
+        tm.assert_frame_equal(res, expect)
 
     def test_failing_character_outside_range(self, df):
         msg = r"(Could not convert ).*( to a valid Python identifier.)"
         with pytest.raises(SyntaxError, match=msg):
             df.query("`☺` > 4")
 
-    def test_failing_hashtag(self, df):
-        msg = "Failed to parse backticks"
-        with pytest.raises(SyntaxError, match=msg):
-            df.query("`foo#bar` > 4")
+    def test_hashtag(self, df):
+        res = df.query("`foo#bar` > 4")
+        expect = df[df["foo#bar"] > 4]
+        tm.assert_frame_equal(res, expect)
+
+    def test_expr_with_column_name_with_hashtag_character(self):
+        # GH 59285
+        df = DataFrame((1, 2, 3), columns=["a#"])
+        result = df.query("`a#` < 2")
+        expected = df[df["a#"] < 2]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_comment(self):
+        # GH 59285
+        df = DataFrame((1, 2, 3), columns=["a#"])
+        result = df.query("`a#` < 2  # This is a comment")
+        expected = df[df["a#"] < 2]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_column_name_with_backtick_and_hash(self):
+        # GH 59285
+        df = DataFrame((1, 2, 3), columns=["a`#b"])
+        result = df.query("`a``#b` < 2")
+        expected = df[df["a`#b"] < 2]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_column_name_with_backtick(self):
+        # GH 59285
+        df = DataFrame({"a`b": (1, 2, 3), "ab": (4, 5, 6)})
+        result = df.query("`a``b` < 2")
+        # Note: Formatting checks may wrongly consider the above ``inline code``.
+        expected = df[df["a`b"] < 2]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_string_with_backticks(self):
+        # GH 59285
+        df = DataFrame(("`", "`````", "``````````"), columns=["#backticks"])
+        result = df.query("'```' < `#backticks`")
+        expected = df["```" < df["#backticks"]]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_string_with_backticked_substring_same_as_column_name(self):
+        # GH 59285
+        df = DataFrame(("`", "`````", "``````````"), columns=["#backticks"])
+        result = df.query("'`#backticks`' < `#backticks`")
+        expected = df["`#backticks`" < df["#backticks"]]
+        tm.assert_frame_equal(result, expected)
+
+    @pytest.mark.parametrize(
+        "col1,col2,expr",
+        [
+            ("it's", "that's", "`it's` < `that's`"),
+            ('it"s', 'that"s', '`it"s` < `that"s`'),
+            ("it's", 'that\'s "nice"', "`it's` < `that's \"nice\"`"),
+            ("it's", "that's #cool", "`it's` < `that's #cool` # This is a comment"),
+        ],
+    )
+    def test_expr_with_column_names_with_special_characters(self, col1, col2, expr):
+        # GH 59285
+        df = DataFrame(
+            [
+                {col1: 1, col2: 2},
+                {col1: 3, col2: 4},
+                {col1: -1, col2: -2},
+                {col1: -3, col2: -4},
+            ]
+        )
+        result = df.query(expr)
+        expected = df[df[col1] < df[col2]]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_no_backticks(self):
+        # GH 59285
+        df = DataFrame(("aaa", "vvv", "zzz"), columns=["column_name"])
+        result = df.query("'value' < column_name")
+        expected = df["value" < df["column_name"]]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_no_quotes_and_backtick_is_unmatched(self):
+        # GH 59285
+        df = DataFrame((1, 5, 10), columns=["column-name"])
+        with pytest.raises(SyntaxError, match="invalid syntax"):
+            df.query("5 < `column-name")
+
+    def test_expr_with_no_quotes_and_backtick_is_matched(self):
+        # GH 59285
+        df = DataFrame((1, 5, 10), columns=["column-name"])
+        result = df.query("5 < `column-name`")
+        expected = df[5 < df["column-name"]]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_backtick_opened_before_quote_and_backtick_is_unmatched(self):
+        # GH 59285
+        df = DataFrame((1, 5, 10), columns=["It's"])
+        with pytest.raises(SyntaxError, match="unterminated string literal"):
+            df.query("5 < `It's")
+
+    def test_expr_with_backtick_opened_before_quote_and_backtick_is_matched(self):
+        # GH 59285
+        df = DataFrame((1, 5, 10), columns=["It's"])
+        result = df.query("5 < `It's`")
+        expected = df[5 < df["It's"]]
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_quote_opened_before_backtick_and_quote_is_unmatched(self):
+        # GH 59285
+        df = DataFrame(("aaa", "vvv", "zzz"), columns=["column-name"])
+        with pytest.raises(SyntaxError, match="unterminated string literal"):
+            df.query("`column-name` < 'It`s that\\'s \"quote\" #hash")
+
+    def test_expr_with_quote_opened_before_backtick_and_quote_is_matched_at_end(self):
+        # GH 59285
+        df = DataFrame(("aaa", "vvv", "zzz"), columns=["column-name"])
+        result = df.query("`column-name` < 'It`s that\\'s \"quote\" #hash'")
+        expected = df[df["column-name"] < 'It`s that\'s "quote" #hash']
+        tm.assert_frame_equal(result, expected)
+
+    def test_expr_with_quote_opened_before_backtick_and_quote_is_matched_in_mid(self):
+        # GH 59285
+        df = DataFrame(("aaa", "vvv", "zzz"), columns=["column-name"])
+        result = df.query("'It`s that\\'s \"quote\" #hash' < `column-name`")
+        expected = df['It`s that\'s "quote" #hash' < df["column-name"]]
+        tm.assert_frame_equal(result, expected)
 
     def test_call_non_named_expression(self, df):
         """