@@ -115,6 +115,25 @@ def test_filter(table_source):
         FilterNodeOptions(None)
 
 
+@pytest.mark.parametrize('source', [
+    pa.record_batch({"number": [1, 2, 3]}),
+    pa.table({"number": [1, 2, 3]})
+])
+def test_filter_all_rows(source):
+    # GH-46057: filtering all rows should return empty RecordBatch with same schema
+    result_expr = source.filter(pc.field("number") < 0)
+
+    assert result_expr.num_rows == 0
+    assert type(result_expr) is type(source)
+    assert result_expr.schema.equals(source.schema)
+
+    result_mask = source.filter(pa.array([False, False, False]))
+
+    assert result_mask.num_rows == 0
+    assert type(result_mask) is type(source)
+    assert result_mask.schema.equals(source.schema)
+
+
 def test_project(table_source):
     # default name from expression
     decl = Declaration.from_sequence([
 
@@ -1415,17 +1415,6 @@ def test_filter_record_batch():
     expected = pa.record_batch([pa.array(["a", None, "e"])], names=["a'"])
     assert result.equals(expected)
 
-    # GH-46057: filtering all rows should return empty RecordBatch with same schema
-    mask_empty_result = batch.filter(pa.array([False] * batch.num_rows))
-    assert mask_empty_result.num_rows == 0
-    assert isinstance(mask_empty_result, pa.RecordBatch)
-    assert mask_empty_result.schema.equals(batch.schema)
-
-    expr_empty_result = batch.filter(pc.field("a'") == "zzz")
-    assert expr_empty_result.num_rows == 0
-    assert isinstance(expr_empty_result, pa.RecordBatch)
-    assert expr_empty_result.schema.equals(batch.schema)
-
 
 def test_filter_table():
     table = pa.table([pa.array(["a", None, "c", "d", "e"])], names=["a"])
@@ -1445,17 +1434,6 @@ def test_filter_table():
         result = table.filter(mask, null_selection_behavior="emit_null")
         assert result.equals(expected_null)
 
-    # GH-46057: filtering all rows should return empty table with same schema
-    mask_empty_result = table.filter(pa.array([False] * table.num_rows))
-    assert mask_empty_result.num_rows == 0
-    assert isinstance(mask_empty_result, pa.Table)
-    assert mask_empty_result.schema.equals(table.schema)
-
-    expr_empty_result = table.filter(pc.field("a") == "zzz")
-    assert expr_empty_result.num_rows == 0
-    assert isinstance(expr_empty_result, pa.Table)
-    assert expr_empty_result.schema.equals(table.schema)
-
 
 def test_filter_errors():
     arr = pa.chunked_array([["a", None], ["c", "d", "e"]])