From 7734fcababaf5b4b139059c2b13f730ca7035928 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Tue, 19 Apr 2022 16:05:31 -0500 Subject: [PATCH] Boost.Log -> spdlog - test --- test/source/scwx/awips/coded_location.test.cpp | 4 +--- .../scwx/awips/coded_time_motion_location.test.cpp | 4 +--- test/source/scwx/awips/pvtec.test.cpp | 4 +--- test/source/scwx/awips/text_product_file.test.cpp | 4 +--- test/source/scwx/wsr88d/nexrad_file_factory.test.cpp | 5 +---- test/source/scwx/wxtest.cpp | 10 +++++----- 6 files changed, 10 insertions(+), 21 deletions(-) diff --git a/test/source/scwx/awips/coded_location.test.cpp b/test/source/scwx/awips/coded_location.test.cpp index 3666ae29..fa387a87 100644 --- a/test/source/scwx/awips/coded_location.test.cpp +++ b/test/source/scwx/awips/coded_location.test.cpp @@ -2,14 +2,12 @@ #include -#include - namespace scwx { namespace awips { -static const std::string logPrefix_ = "[scwx::awips::coded_location.test] "; +static const std::string logPrefix_ = "scwx::awips::coded_location.test"; TEST(CodedLocation, WFO100W) { diff --git a/test/source/scwx/awips/coded_time_motion_location.test.cpp b/test/source/scwx/awips/coded_time_motion_location.test.cpp index b533c714..b0ed1fd5 100644 --- a/test/source/scwx/awips/coded_time_motion_location.test.cpp +++ b/test/source/scwx/awips/coded_time_motion_location.test.cpp @@ -2,15 +2,13 @@ #include -#include - namespace scwx { namespace awips { static const std::string logPrefix_ = - "[scwx::awips::coded_time_motion_location.test] "; + "scwx::awips::coded_time_motion_location.test"; TEST(CodedTimeMotionLocation, LeadingZeroes) { diff --git a/test/source/scwx/awips/pvtec.test.cpp b/test/source/scwx/awips/pvtec.test.cpp index 23b21b7b..b92880de 100644 --- a/test/source/scwx/awips/pvtec.test.cpp +++ b/test/source/scwx/awips/pvtec.test.cpp @@ -2,14 +2,12 @@ #include -#include - namespace scwx { namespace awips { -static const std::string logPrefix_ = "[scwx::awips::pvtec.test] "; +static const std::string logPrefix_ = "scwx::awips::pvtec.test"; std::pair> diff --git a/test/source/scwx/awips/text_product_file.test.cpp b/test/source/scwx/awips/text_product_file.test.cpp index 251a1c01..fa335746 100644 --- a/test/source/scwx/awips/text_product_file.test.cpp +++ b/test/source/scwx/awips/text_product_file.test.cpp @@ -2,14 +2,12 @@ #include -#include - namespace scwx { namespace awips { -static const std::string logPrefix_ = "[scwx::awips::text_product_file.test] "; +static const std::string logPrefix_ = "scwx::awips::text_product_file.test"; class TextProductValidFileTest : public testing::TestWithParam { diff --git a/test/source/scwx/wsr88d/nexrad_file_factory.test.cpp b/test/source/scwx/wsr88d/nexrad_file_factory.test.cpp index 5f1b0bbf..6feb2085 100644 --- a/test/source/scwx/wsr88d/nexrad_file_factory.test.cpp +++ b/test/source/scwx/wsr88d/nexrad_file_factory.test.cpp @@ -4,15 +4,12 @@ #include -#include - namespace scwx { namespace wsr88d { -static const std::string logPrefix_ = - "[scwx::wsr88d::nexrad_file_factory.test] "; +static const std::string logPrefix_ = "scwx::wsr88d::nexrad_file_factory.test"; TEST(NexradFileFactory, Level2V06) { diff --git a/test/source/scwx/wxtest.cpp b/test/source/scwx/wxtest.cpp index 3bb34268..e3d26c74 100644 --- a/test/source/scwx/wxtest.cpp +++ b/test/source/scwx/wxtest.cpp @@ -1,12 +1,12 @@ -#include +#include -#include -#include +#include +#include int main(int argc, char** argv) { - boost::log::core::get()->set_filter(boost::log::trivial::severity >= - boost::log::trivial::debug); + scwx::util::Logger::Initialize(); + spdlog::set_level(spdlog::level::debug); ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS();