fix: update error messages in tests to use EXPR_TYPE_ERROR for consistency

Author: kosiew

python/tests/test_dataframe.py

@@ -46,7 +46,7 @@
     get_formatter,
     reset_formatter,
 )
-from datafusion.expr import Window
+from datafusion.expr import EXPR_TYPE_ERROR, Window
 from pyarrow.csv import write_csv
 
 MB = 1024 * 1024
@@ -232,7 +232,8 @@ def test_select_mixed_expr_string(df):
 
 def test_select_unsupported(df):
     with pytest.raises(
-        TypeError, match=r"Expected Expr or column name.*col\(\) or lit\(\)"
+        TypeError,
+        match=f"Expected Expr or column name.*{re.escape(EXPR_TYPE_ERROR)}",
     ):
         df.select(1)
 
@@ -288,7 +289,8 @@ def test_sort_string_and_expression_equivalent(df):
 
 def test_sort_unsupported(df):
     with pytest.raises(
-        TypeError, match=r"Expected Expr or column name.*col\(\) or lit\(\)"
+        TypeError,
+        match=f"Expected Expr or column name.*{re.escape(EXPR_TYPE_ERROR)}",
     ):
         df.sort(1)
 
@@ -302,7 +304,7 @@ def test_aggregate_string_and_expression_equivalent(df):
 
 
 def test_filter_string_unsupported(df):
-    with pytest.raises(TypeError, match=r"col\(\) or lit\(\)"):
+    with pytest.raises(TypeError, match=re.escape(EXPR_TYPE_ERROR)):
         df.filter("a > 1")
 
 

python/tests/test_expr.py

@@ -15,6 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
+import re
 from datetime import datetime, timezone
 
 import pyarrow as pa
@@ -28,6 +29,7 @@
     literal_with_metadata,
 )
 from datafusion.expr import (
+    EXPR_TYPE_ERROR,
     Aggregate,
     AggregateFunction,
     BinaryExpr,
@@ -886,5 +888,5 @@ def test_literal_metadata(ctx):
 def test_ensure_expr():
     e = col("a")
     assert ensure_expr(e) is e.expr
-    with pytest.raises(TypeError, match=r"Use col\(\) or lit\(\)"):
+    with pytest.raises(TypeError, match=re.escape(EXPR_TYPE_ERROR)):
         ensure_expr("a")