wire logger in tests

Author: andiwand

src/odr/odr.cpp

@@ -225,8 +225,9 @@ odr::DecoderEngine odr::decoder_engine_by_name(const std::string &name) {
   throw UnknownDecoderEngine();
 }
 
-std::vector<odr::FileType> odr::list_file_types(const std::string &path) {
-  return DecodedFile::list_file_types(path);
+std::vector<odr::FileType> odr::list_file_types(const std::string &path,
+                                                Logger &logger) {
+  return DecodedFile::list_file_types(path, logger);
 }
 
 std::vector<odr::DecoderEngine> odr::list_decoder_engines(const FileType as) {

src/odr/odr.hpp

@@ -64,7 +64,8 @@ file_type_by_file_extension(const std::string &extension) noexcept;
 /// @brief Determine the file types by the file path.
 /// @param path The file path.
 /// @return The file types.
-[[nodiscard]] std::vector<FileType> list_file_types(const std::string &path);
+[[nodiscard]] std::vector<FileType>
+list_file_types(const std::string &path, Logger &logger = Logger::null());
 /// @brief Determine the decoder engines for a file path and file type.
 /// @param as The file type.
 /// @return The decoder engines.

test/src/document_test.cpp

@@ -11,8 +11,10 @@ using namespace odr;
 using namespace odr::test;
 
 TEST(Document, odt) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   DocumentFile document_file(
-      TestData::test_file_path("odr-public/odt/about.odt"));
+      TestData::test_file_path("odr-public/odt/about.odt"), *logger);
 
   EXPECT_EQ(document_file.file_type(), FileType::opendocument_text);
 
@@ -30,8 +32,10 @@ TEST(Document, odt) {
 }
 
 TEST(Document, odg) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   DocumentFile document_file(
-      TestData::test_file_path("odr-public/odg/sample.odg"));
+      TestData::test_file_path("odr-public/odg/sample.odg"), *logger);
 
   EXPECT_EQ(document_file.file_type(), FileType::opendocument_graphics);
 
@@ -51,8 +55,10 @@ TEST(Document, odg) {
 }
 
 TEST(Document, edit_odt) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   DocumentFile document_file(
-      TestData::test_file_path("odr-public/odt/about.odt"));
+      TestData::test_file_path("odr-public/odt/about.odt"), *logger);
   Document document = document_file.document();
 
   std::function<void(Element)> edit = [&](Element element) {
@@ -70,8 +76,11 @@ TEST(Document, edit_odt) {
 }
 
 TEST(Document, edit_docx) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   DocumentFile document_file(
-      TestData::test_file_path("odr-public/docx/style-various-1.docx"));
+      TestData::test_file_path("odr-public/docx/style-various-1.docx"),
+      *logger);
   Document document = document_file.document();
 
   std::function<void(Element)> edit = [&](Element element) {
@@ -89,10 +98,12 @@ TEST(Document, edit_docx) {
 }
 
 TEST(Document, edit_odt_diff) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   auto diff =
       R"({"modifiedText":{"/child:16/child:0":"Outasdfsdafdline","/child:24/child:0":"Colorasdfasdfasdfed Line","/child:6/child:0":"Text hello world!"}})";
   DocumentFile document_file(
-      TestData::test_file_path("odr-public/odt/style-various-1.odt"));
+      TestData::test_file_path("odr-public/odt/style-various-1.odt"), *logger);
   Document document = document_file.document();
 
   html::edit(document, diff);
@@ -102,10 +113,12 @@ TEST(Document, edit_odt_diff) {
 }
 
 TEST(Document, edit_ods_diff) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   auto diff =
       R"({"modifiedText":{"/child:0/row:0/child:0/child:0/child:0":"Page 1 hi","/child:1/row:0/child:0/child:0/child:0":"Page 2 hihi","/child:2/row:0/child:0/child:0/child:0":"Page 3 hihihi","/child:3/row:0/child:0/child:0/child:0":"Page 4 hihihihi","/child:4/row:0/child:0/child:0/child:0":"Page 5 hihihihihi"}})";
   DocumentFile document_file(
-      TestData::test_file_path("odr-public/ods/pages.ods"));
+      TestData::test_file_path("odr-public/ods/pages.ods"), *logger);
   document_file = document_file.decrypt(
       TestData::test_file("odr-public/ods/pages.ods").password.value());
   Document document = document_file.document();
@@ -117,10 +130,13 @@ TEST(Document, edit_ods_diff) {
 }
 
 TEST(Document, edit_docx_diff) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   auto diff =
       R"({"modifiedText":{"/child:16/child:0/child:0":"Outasdfsdafdline","/child:24/child:0/child:0":"Colorasdfasdfasdfed Line","/child:6/child:0/child:0":"Text hello world!"}})";
   DocumentFile document_file(
-      TestData::test_file_path("odr-public/docx/style-various-1.docx"));
+      TestData::test_file_path("odr-public/docx/style-various-1.docx"),
+      *logger);
   Document document = document_file.document();
 
   html::edit(document, diff);

test/src/file_test.cpp

@@ -12,9 +12,11 @@ TEST(File, open) { EXPECT_THROW(File("/"), FileNotFound); }
 TEST(DocumentFile, open) { EXPECT_THROW(DocumentFile("/"), FileNotFound); }
 
 TEST(DecodedFile, wpd) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   auto path = TestData::test_file_path("odr-public/wpd/Sync3 Sample Page.wpd");
   try {
-    DecodedFile file(path);
+    DecodedFile file(path, *logger);
     FAIL();
   } catch (const UnsupportedFileType &e) {
     EXPECT_EQ(e.file_type, FileType::word_perfect);

test/src/html_output_test.cpp

@@ -34,6 +34,8 @@ struct TestParams {
 using HtmlOutputTests = ::testing::TestWithParam<TestParams>;
 
 TEST_P(HtmlOutputTests, html_meta) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   const TestParams &params = GetParam();
   const TestFile &test_file = params.test_file;
   const DecoderEngine engine = params.engine;
@@ -64,7 +66,8 @@ TEST_P(HtmlOutputTests, html_meta) {
   DecodePreference decode_preference;
   decode_preference.as_file_type = test_file.type;
   decode_preference.with_engine = engine;
-  DecodedFile file = odr::open(test_file.absolute_path, decode_preference);
+  DecodedFile file =
+      odr::open(test_file.absolute_path, decode_preference, *logger);
 
   FileMeta file_meta = file.file_meta();
 

test/src/odr_test.cpp

@@ -13,16 +13,20 @@ TEST(odr, version) { EXPECT_TRUE(odr::version().empty()); }
 TEST(odr, commit) { EXPECT_FALSE(odr::commit_hash().empty()); }
 
 TEST(odr, types_odt) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   auto path = TestData::test_file_path("odr-public/odt/about.odt");
-  auto types = odr::list_file_types(path);
+  auto types = odr::list_file_types(path, *logger);
   EXPECT_EQ(types.size(), 2);
   EXPECT_EQ(types[0], FileType::zip);
   EXPECT_EQ(types[1], FileType::opendocument_text);
 }
 
 TEST(odr, types_wpd) {
+  auto logger = Logger::create_stdio("odr-test", LogLevel::verbose);
+
   auto path = TestData::test_file_path("odr-public/wpd/Sync3 Sample Page.wpd");
-  auto types = odr::list_file_types(path);
+  auto types = odr::list_file_types(path, *logger);
   EXPECT_EQ(types.size(), 1);
   EXPECT_EQ(types[0], FileType::word_perfect);
 }