From f3c23332d5ba04fc2f4be529d1630079f37e43e4 Mon Sep 17 00:00:00 2001 From: Marcus Winter Date: Wed, 9 Mar 2016 13:01:50 +0100 Subject: [PATCH] base_cpp: fixed log test --- base_cpp/test/log_test.cc | 101 +++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------- 1 file changed, 45 insertions(+), 56 deletions(-) diff --git a/base_cpp/test/log_test.cc b/base_cpp/test/log_test.cc index bb68181..fe8fde8 100644 --- a/base_cpp/test/log_test.cc +++ b/base_cpp/test/log_test.cc @@ -28,7 +28,7 @@ #include #include -#include +#include namespace embb { namespace base { @@ -38,7 +38,7 @@ LogTest::LogTest() { CreateUnit("Test all").Add(&LogTest::Test, this); } -static char const * logged_message; +static std::string logged_message; static void test_log_function(void * context, char const * msg) { EMBB_UNUSED(context); @@ -48,101 +48,90 @@ static void test_log_function(void * context, char const * msg) { void LogTest::Test() { using embb::base::Log; char const * test_msg = "hello"; - char const * null = 0; Log::SetLogFunction(0, test_log_function); Log::SetLogLevel(EMBB_LOG_LEVEL_TRACE); - logged_message = null; + logged_message = "none"; Log::Trace("chn", test_msg); #ifdef EMBB_DEBUG - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [TRACE] hello")); + PT_EXPECT(logged_message == "[chn] - [TRACE] hello"); #else - PT_EXPECT_EQ(null, logged_message); + PT_EXPECT(logged_message == "none"); #endif - logged_message = null; + logged_message = "none"; Log::Info("chn", test_msg); #ifdef EMBB_DEBUG - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [INFO ] hello")); + PT_EXPECT(logged_message == "[chn] - [INFO ] hello"); #else - PT_EXPECT_EQ(null, logged_message); + PT_EXPECT(logged_message == "none"); #endif - logged_message = null; + logged_message = "none"; Log::Warning("chn", test_msg); - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [WARN ] hello")); - logged_message = null; + PT_EXPECT(logged_message == "[chn] - [WARN ] hello"); + logged_message = "none"; Log::Error("chn", test_msg); - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [ERROR] hello")); + PT_EXPECT(logged_message == "[chn] - [ERROR] hello"); Log::SetLogLevel(EMBB_LOG_LEVEL_INFO); - logged_message = null; + logged_message = "none"; Log::Trace("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Info("chn", test_msg); #ifdef EMBB_DEBUG - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [INFO ] hello")); + PT_EXPECT(logged_message == "[chn] - [INFO ] hello"); #else - PT_EXPECT_EQ(null, logged_message); + PT_EXPECT(logged_message == "none"); #endif - logged_message = null; + logged_message = "none"; Log::Warning("chn", test_msg); - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [WARN ] hello")); - logged_message = null; + PT_EXPECT(logged_message == "[chn] - [WARN ] hello"); + logged_message = "none"; Log::Error("chn", test_msg); - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [ERROR] hello")); + PT_EXPECT(logged_message == "[chn] - [ERROR] hello"); Log::SetLogLevel(EMBB_LOG_LEVEL_WARNING); - logged_message = null; + logged_message = "none"; Log::Trace("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Info("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Warning("chn", test_msg); - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [WARN ] hello")); - logged_message = null; + PT_EXPECT(logged_message == "[chn] - [WARN ] hello"); + logged_message = "none"; Log::Error("chn", test_msg); - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [ERROR] hello")); + PT_EXPECT(logged_message == "[chn] - [ERROR] hello"); Log::SetLogLevel(EMBB_LOG_LEVEL_ERROR); - logged_message = null; + logged_message = "none"; Log::Trace("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Info("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Warning("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Error("chn", test_msg); - PT_ASSERT_NE(logged_message, null); - PT_EXPECT(0 == strcmp(logged_message, "[chn] - [ERROR] hello")); + PT_EXPECT(logged_message == "[chn] - [ERROR] hello"); Log::SetLogLevel(EMBB_LOG_LEVEL_NONE); - logged_message = null; + logged_message = "none"; Log::Trace("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Info("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Warning("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); - logged_message = null; + PT_EXPECT(logged_message == "none"); + logged_message = "none"; Log::Error("chn", test_msg); - PT_EXPECT_EQ(null, logged_message); + PT_EXPECT(logged_message == "none"); } } // namespace test -- libgit2 0.26.0