From b4df3eb52225d71aeacfe512ac5323f7bb88937f Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Sun, 13 Aug 2023 20:39:20 +0200
Subject: [PATCH] Use test_logger in more tests

---
 test/dwarfs.cpp        | 22 ++++++++--------------
 test/dwarfs_badfs.cpp  |  8 +++++---
 test/dwarfs_compat.cpp | 10 ++++------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/test/dwarfs.cpp b/test/dwarfs.cpp
index f51e85b3..335d9042 100644
--- a/test/dwarfs.cpp
+++ b/test/dwarfs.cpp
@@ -50,6 +50,7 @@
 #include "loremipsum.h"
 #include "mmap_mock.h"
 #include "test_helpers.h"
+#include "test_logger.h"
 
 using namespace dwarfs;
 
@@ -135,8 +136,7 @@ void basic_end_to_end_test(std::string const& compressor,
   }
 
   std::ostringstream logss;
-  stream_logger lgr(logss); // TODO: mock
-  lgr.set_policy<prod_logger_policy>();
+  test::test_logger lgr;
 
   auto input = test::os_access_mock::create_test_instance();
 
@@ -558,8 +558,7 @@ TEST_P(packing_test, regression_empty_fs) {
   options.force_pack_string_tables = true;
 
   std::ostringstream logss;
-  stream_logger lgr(logss); // TODO: mock
-  lgr.set_policy<prod_logger_policy>();
+  test::test_logger lgr;
 
   auto input = std::make_shared<test::os_access_mock>();
 
@@ -633,8 +632,7 @@ TEST(block_manager, regression_block_boundary) {
   opts.metadata.check_consistency = true;
 
   std::ostringstream logss;
-  stream_logger lgr(logss); // TODO: mock
-  lgr.set_policy<prod_logger_policy>();
+  test::test_logger lgr;
 
   std::vector<size_t> fs_blocks;
 
@@ -682,8 +680,7 @@ TEST_P(compression_regression, github45) {
   opts.metadata.check_consistency = true;
 
   std::ostringstream logss;
-  stream_logger lgr(logss); // TODO: mock
-  lgr.set_policy<prod_logger_policy>();
+  test::test_logger lgr;
 
   std::independent_bits_engine<std::mt19937_64,
                                std::numeric_limits<uint8_t>::digits, uint16_t>
@@ -763,8 +760,7 @@ TEST_P(file_scanner, inode_ordering) {
   auto [order_mode, file_hash_algo] = GetParam();
 
   std::ostringstream logss;
-  stream_logger lgr(logss); // TODO: mock
-  lgr.set_policy<prod_logger_policy>();
+  test::test_logger lgr;
 
   auto bmcfg = block_manager::config();
   auto opts = scanner_options();
@@ -814,8 +810,7 @@ TEST_P(filter, filesystem) {
   options.remove_empty_dirs = true;
 
   std::ostringstream logss;
-  stream_logger lgr(logss); // TODO: mock
-  lgr.set_policy<prod_logger_policy>();
+  test::test_logger lgr;
 
   auto scr = std::make_shared<builtin_script>(lgr);
 
@@ -867,8 +862,7 @@ INSTANTIATE_TEST_SUITE_P(dwarfs, filter,
 
 TEST(file_scanner, input_list) {
   std::ostringstream logss;
-  stream_logger lgr(logss); // TODO: mock
-  lgr.set_policy<prod_logger_policy>();
+  test::test_logger lgr;
 
   auto bmcfg = block_manager::config();
   auto opts = scanner_options();
diff --git a/test/dwarfs_badfs.cpp b/test/dwarfs_badfs.cpp
index 6a7748ca..cffafa5d 100644
--- a/test/dwarfs_badfs.cpp
+++ b/test/dwarfs_badfs.cpp
@@ -29,6 +29,8 @@
 #include "dwarfs/mmap.h"
 #include "dwarfs/options.h"
 
+#include "test_logger.h"
+
 using namespace dwarfs;
 
 namespace {
@@ -52,14 +54,14 @@ class bad_fs : public ::testing::TestWithParam<std::string> {};
 TEST_P(bad_fs, test) {
   auto filename = testdata / GetParam();
 
-  std::ostringstream oss, oss2;
-  stream_logger lgr(oss);
+  test::test_logger lgr;
+  std::ostringstream oss;
 
   int nerror = 0;
 
   try {
     nerror =
-        filesystem_v2::identify(lgr, std::make_shared<mmap>(filename), oss2, 9,
+        filesystem_v2::identify(lgr, std::make_shared<mmap>(filename), oss, 9,
                                 1, true, filesystem_options::IMAGE_OFFSET_AUTO);
   } catch (std::exception const&) {
     nerror = 1;
diff --git a/test/dwarfs_compat.cpp b/test/dwarfs_compat.cpp
index bb4b2b8e..1db52499 100644
--- a/test/dwarfs_compat.cpp
+++ b/test/dwarfs_compat.cpp
@@ -48,6 +48,7 @@
 #include "dwarfs/worker_group.h"
 
 #include "mmap_mock.h"
+#include "test_logger.h"
 
 using namespace dwarfs;
 
@@ -1037,8 +1038,7 @@ void check_dynamic(std::string const& version, filesystem_v2 const& fs) {
 }
 
 TEST_P(compat_metadata, backwards_compat) {
-  std::ostringstream oss;
-  stream_logger lgr(oss);
+  test::test_logger lgr;
   auto version = GetParam();
   auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
   filesystem_v2 fs(lgr, std::make_shared<mmap>(filename));
@@ -1054,8 +1054,7 @@ class compat_filesystem
 TEST_P(compat_filesystem, backwards_compat) {
   auto [version, enable_nlink] = GetParam();
 
-  std::ostringstream oss;
-  stream_logger lgr(oss);
+  test::test_logger lgr;
   auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
 
   filesystem_options opts;
@@ -1097,8 +1096,7 @@ class rewrite
 TEST_P(rewrite, filesystem_rewrite) {
   auto [version, recompress_block, recompress_metadata] = GetParam();
 
-  std::ostringstream oss;
-  stream_logger lgr(oss);
+  test::test_logger lgr;
   auto filename = std::string(TEST_DATA_DIR "/compat-v") + version + ".dwarfs";
 
   rewrite_options opts;