test/crimson/seastore: use gtest assertion macros instead of assert()

Plain assert() is compiled out under NDEBUG, leaving the checked
variables unused. Use the always-evaluated gtest macros instead.

  src/test/crimson/seastore/test_cbjournal.cc:586: variable 'old_written_to' set but not used [-Wunused-but-set-variable]
  src/test/crimson/seastore/test_btree_lba_manager.cc:345: unused structured binding declaration [-Wunused-variable]

Signed-off-by: Sun Yuechi <sunyuechi@iscas.ac.cn>

diff --git a/src/test/crimson/seastore/test_btree_lba_manager.cc b/src/test/crimson/seastore/test_btree_lba_manager.cc
index a312f5c3d031ab0d6227a5b11e0a3cd05145267e..6d02ec53c2e003148588f69a0288c40557b1f866 100644 (file)
--- a/src/test/crimson/seastore/test_btree_lba_manager.cc
+++ b/src/test/crimson/seastore/test_btree_lba_manager.cc
@@ -342,8 +342,9 @@ struct lba_btree_test : btree_test_base {
            get_op_context(t), addr,
             get_map_val(len, extent->get_type()), extent.get()
          ).si_then([addr, extent](auto p){
-           auto& [iter, inserted] = p;
-           assert(inserted);
+           // there should be no element at the given addr before insert(),
+           // so the insertion (p.second) should take place here.
+           EXPECT_TRUE(p.second);
            extent->set_laddr(addr);
          });
        });

diff --git a/src/test/crimson/seastore/test_cbjournal.cc b/src/test/crimson/seastore/test_cbjournal.cc
index 932485a6476a29918d44be787f43f0bcdf1d535b..ffd9c96c938c1477d93a82596efce00958a314d9 100644 (file)
--- a/src/test/crimson/seastore/test_cbjournal.cc
+++ b/src/test/crimson/seastore/test_cbjournal.cc
@@ -594,6 +594,6 @@ TEST_F(cbjournal_test_t, multiple_submit_at_end)
       return Journal::replay_ertr::make_ready_future<
        std::pair<bool, CachedExtentRef>>(true, nullptr);
     }).unsafe_get();
-    assert(get_written_to() == old_written_to);
+    ASSERT_EQ(get_written_to(), old_written_to);
   });
 }