Skip to content

Commit 3306cac

Browse files
committed
test all filter types
1 parent 3097276 commit 3306cac

1 file changed

Lines changed: 30 additions & 20 deletions

File tree

‎packages/google-cloud-bigtable/tests/unit/v2_client/test_row_filters.py‎

Lines changed: 30 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import pytest
1717

18+
from google.cloud.bigtable import row_filters
1819
from google.cloud.bigtable.row_filters import (
1920
_BoolFilter as _BaseBoolFilter,
2021
_RegexFilter as _BaseRegexFilter,
@@ -1193,27 +1194,36 @@ def _ValueBitmaskPB(*args, **kw):
11931194
return data_v2_pb2.ValueBitmask(*args, **kw)
11941195

11951196

1196-
def test_row_filter_to_pb_backwards_compatibility():
1197-
from google.cloud.bigtable.row_filters import (
1198-
PassAllFilter,
1199-
RowKeyRegexFilter,
1200-
ValueBitmaskFilter,
1201-
)
1202-
1203-
pass_filter = PassAllFilter(True)
1204-
assert hasattr(pass_filter, "to_pb")
1205-
with pytest.deprecated_call():
1206-
assert pass_filter.to_pb() == pass_filter._to_pb()
1207-
1208-
regex_filter = RowKeyRegexFilter(b"row-.*")
1209-
assert hasattr(regex_filter, "to_pb")
1210-
with pytest.deprecated_call():
1211-
assert regex_filter.to_pb() == regex_filter._to_pb()
1212-
1213-
bitmask_filter = ValueBitmaskFilter(b"mask")
1214-
assert hasattr(bitmask_filter, "to_pb")
1197+
@pytest.mark.parametrize(
1198+
"filter_instance",
1199+
[
1200+
row_filters.SinkFilter(True),
1201+
row_filters.PassAllFilter(True),
1202+
row_filters.BlockAllFilter(True),
1203+
row_filters.RowKeyRegexFilter(b"key.*"),
1204+
row_filters.RowSampleFilter(0.5),
1205+
row_filters.FamilyNameRegexFilter("fam.*"),
1206+
row_filters.ColumnQualifierRegexFilter(b"col.*"),
1207+
row_filters.TimestampRangeFilter(row_filters.TimestampRange()),
1208+
row_filters.ColumnRangeFilter("fam", start_column=b"a", end_column=b"b"),
1209+
row_filters.ValueRegexFilter(b"val.*"),
1210+
row_filters.ExactValueFilter(b"exact"),
1211+
row_filters.ValueRangeFilter(start_value=b"a", end_value=b"b"),
1212+
row_filters.ValueBitmaskFilter(b"mask"),
1213+
row_filters.CellsRowOffsetFilter(5),
1214+
row_filters.CellsRowLimitFilter(10),
1215+
row_filters.CellsColumnLimitFilter(2),
1216+
row_filters.StripValueTransformerFilter(True),
1217+
row_filters.ApplyLabelFilter("label"),
1218+
row_filters.RowFilterChain(filters=[row_filters.PassAllFilter(True)]),
1219+
row_filters.RowFilterUnion(filters=[row_filters.PassAllFilter(True)]),
1220+
row_filters.ConditionalRowFilter(base_filter=row_filters.PassAllFilter(True)),
1221+
],
1222+
)
1223+
def test_all_row_filters_to_pb_backwards_compatibility(filter_instance):
1224+
assert hasattr(filter_instance, "to_pb")
12151225
with pytest.deprecated_call():
1216-
assert bitmask_filter.to_pb() == bitmask_filter._to_pb()
1226+
assert filter_instance.to_pb() == filter_instance._to_pb()
12171227

12181228

12191229
def test_timestamp_range_to_pb_backwards_compatibility():

0 commit comments

Comments
 (0)