|
15 | 15 |
|
16 | 16 | import pytest |
17 | 17 |
|
| 18 | +from google.cloud.bigtable import row_filters |
18 | 19 | from google.cloud.bigtable.row_filters import ( |
19 | 20 | _BoolFilter as _BaseBoolFilter, |
20 | 21 | _RegexFilter as _BaseRegexFilter, |
@@ -1193,27 +1194,36 @@ def _ValueBitmaskPB(*args, **kw): |
1193 | 1194 | return data_v2_pb2.ValueBitmask(*args, **kw) |
1194 | 1195 |
|
1195 | 1196 |
|
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") |
1215 | 1225 | with pytest.deprecated_call(): |
1216 | | - assert bitmask_filter.to_pb() == bitmask_filter._to_pb() |
| 1226 | + assert filter_instance.to_pb() == filter_instance._to_pb() |
1217 | 1227 |
|
1218 | 1228 |
|
1219 | 1229 | def test_timestamp_range_to_pb_backwards_compatibility(): |
|
0 commit comments