From 8de99218906a93b079fc26c002a44b25f3a01712 Mon Sep 17 00:00:00 2001 From: Liu Ming Date: Wed, 15 Jun 2016 11:20:34 +0800 Subject: [PATCH] file name and line number are in a new line. --- opm/common/OpmLog/LogUtil.cpp | 2 +- tests/test_OpmLog.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/opm/common/OpmLog/LogUtil.cpp b/opm/common/OpmLog/LogUtil.cpp index 096ac118a..4828e1f2e 100644 --- a/opm/common/OpmLog/LogUtil.cpp +++ b/opm/common/OpmLog/LogUtil.cpp @@ -35,7 +35,7 @@ namespace Log { std::string fileMessage(const std::string& filename , int line , const std::string& message) { std::ostringstream oss; - oss << message << ", file " << filename << ", line " << line; + oss << message << "\n" << "In file " << filename << ", line " << line << "\n"; return oss.str(); } diff --git a/tests/test_OpmLog.cpp b/tests/test_OpmLog.cpp index d7691d917..20fc43a89 100644 --- a/tests/test_OpmLog.cpp +++ b/tests/test_OpmLog.cpp @@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(DoLogging) { BOOST_AUTO_TEST_CASE(Test_Format) { - BOOST_CHECK_EQUAL( "There is a mild fuckup here?, file /path/to/file, line 100" , Log::fileMessage("/path/to/file" , 100 , "There is a mild fuckup here?")); + BOOST_CHECK_EQUAL( "There is a mild fuckup here?\nIn file /path/to/file, line 100\n" , Log::fileMessage("/path/to/file" , 100 , "There is a mild fuckup here?")); BOOST_CHECK_EQUAL( "Error: This is the error" , Log::prefixMessage(Log::MessageType::Error , "This is the error")); BOOST_CHECK_EQUAL( "Warning: This is the warning" , Log::prefixMessage(Log::MessageType::Warning , "This is the warning")); @@ -248,8 +248,8 @@ BOOST_AUTO_TEST_CASE(TestHelperFunctions) BOOST_CHECK(isPower2(1ul << 62)); // fileMessage - BOOST_CHECK_EQUAL(fileMessage("foo/bar", 1, "message"), "message, file foo/bar, line 1"); - BOOST_CHECK_EQUAL(fileMessage(MessageType::Error, "foo/bar", 1, "message"), "Error: message, file foo/bar, line 1"); + BOOST_CHECK_EQUAL(fileMessage("foo/bar", 1, "message"), "message\nIn file foo/bar, line 1\n"); + BOOST_CHECK_EQUAL(fileMessage(MessageType::Error, "foo/bar", 1, "message"), "Error: message\nIn file foo/bar, line 1\n"); // prefixMessage BOOST_CHECK_EQUAL(prefixMessage(MessageType::Error, "message"), "Error: message");