flat_mutation_reader_test: fix "test_flat_mutation_reader_consume_sin…

…gle_partition"

Since `flat_reader_assertions::produces(const range_tombstone&,...)`
records the range tombstone for checking, be sure to explicitly pass
in a clustering range that does not extend beyond the mock-read part
of the mutation.

Also (provisionally) change the assertion method to accept clustering
ranges.

Signed-off-by: Michael Livshin <michael.livshin@scylladb.com>

test/boost/flat_mutation_reader_test.cc

@@ -109,8 +109,17 @@ SEASTAR_TEST_CASE(test_flat_mutation_reader_consume_single_partition) {
                 BOOST_REQUIRE_EQUAL(m.partition().partition_tombstone() ? 1 : 0, result._consume_tombstone_call_count);
                 auto r2 = assert_that(make_flat_mutation_reader_from_mutations(m.schema(), semaphore.make_permit(), {m}));
                 r2.produces_partition_start(m.decorated_key(), m.partition().partition_tombstone());
+                if (result._fragments.empty()) {
+                    continue;
+                }
+                query::clustering_row_ranges ck_ranges = {};
+                if (depth > 1) {
+                    const auto& mf = result._fragments.back();
+                    auto ck_range = query::clustering_range::make_ending_with({mf.position().key(), false});
+                    ck_ranges = {ck_range};
+                }
                 for (auto& mf : result._fragments) {
-                    r2.produces(*m.schema(), mf);
+                    r2.produces(*m.schema(), mf, ck_ranges);
                 }
             }
         });

test/lib/flat_mutation_reader_assertions.hh

@@ -327,7 +327,7 @@ public:
         return *this;
     }
 
-    flat_reader_assertions& produces(const schema& s, const mutation_fragment& mf) {
+    flat_reader_assertions& produces(const schema& s, const mutation_fragment& mf, const query::clustering_row_ranges& ck_ranges = {}) {
         testlog.trace("Expect {}", mutation_fragment::printer(s, mf));
         if (mf.is_range_tombstone()) {
             apply_rt(mf.as_range_tombstone());