Implemented basic log_record tests (and fixes)

Klaim · Klaim · commit 4510497a312f · 2012-11-15T13:58:17.000+01:00
diff --git a/include/network/logging/logging.hpp b/include/network/logging/logging.hpp
@@ -1,4 +1,4 @@
-// Copyright 2011 A. Joel Lamotte <mjklaim@gmail.com>.
+// Copyright (c) 2012 A. Joel Lamotte <mjklaim@gmail.com>.
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
@@ -29,12 +29,17 @@ namespace handler
 class log_record
 {
 public:
-  log_record(){} // = default;
+  log_record()
+    : m_filename( UNKNOWN_FILE_NAME )
+	, m_line(0)
+  {} // = default;
+
+  static const char* UNKNOWN_FILE_NAME;
 
   // Implicit construction from anything serializable to text.
   template< typename TypeOfSomething >
   log_record( TypeOfSomething&& message ) 
-      : m_filename( "unknown" )
+      : m_filename( UNKNOWN_FILE_NAME )
       , m_line(0)
   {
     write( std::forward<TypeOfSomething>(message) );
@@ -69,7 +74,7 @@ class log_record
   log_record& operator=( const log_record& ); // = delete;
 
   std::ostringstream m_text_stream; // stream in which we build the message
-  std::string m_filename; // = "unknown";
+  std::string m_filename; // = UNKNOWN_FILE_NAME;
   unsigned long m_line; // = 0;
 };
   
diff --git a/libs/network/src/logging/logging.cpp b/libs/network/src/logging/logging.cpp
@@ -13,6 +13,9 @@
 
 namespace network { namespace logging { 
 
+	const char* log_record::UNKNOWN_FILE_NAME = "unknown";
+
+
 namespace handler 
 {
   namespace
diff --git a/libs/network/test/logging/logging_log_record.cpp b/libs/network/test/logging/logging_log_record.cpp
@@ -0,0 +1,67 @@
+// Copyright (c) 2012 A. Joel Lamotte <mjklaim@gmail.com>
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+#include <string>
+
+#define BOOST_TEST_MODULE logging log_record
+#include <boost/config/warning_disable.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include <network/logging/logging.hpp>
+
+using namespace network::logging;
+
+BOOST_AUTO_TEST_CASE(default_constructor) {
+	log_record record;
+	BOOST_CHECK( record.message() == "" );
+	BOOST_CHECK( record.filename() == log_record::UNKNOWN_FILE_NAME );
+	BOOST_CHECK( record.line() == 0 );
+}
+
+BOOST_AUTO_TEST_CASE(cstring_constructor) {
+	const auto message = "This is a test.";
+	log_record record( message );
+	BOOST_CHECK( record.message() == message );
+	BOOST_CHECK( record.filename() == log_record::UNKNOWN_FILE_NAME );
+	BOOST_CHECK( record.line() == 0 );
+}
+
+BOOST_AUTO_TEST_CASE(string_constructor) {
+	const std::string message("This is a test.");
+	log_record record( message );
+	BOOST_CHECK( record.message() == message );
+	BOOST_CHECK( record.filename() == log_record::UNKNOWN_FILE_NAME );
+	BOOST_CHECK( record.line() == 0 );
+}
+
+BOOST_AUTO_TEST_CASE(int_constructor) {
+	const auto num = 42;
+	log_record record( num );
+	BOOST_CHECK( record.message() == std::to_string( num ) );
+	BOOST_CHECK( record.filename() == log_record::UNKNOWN_FILE_NAME );
+	BOOST_CHECK( record.line() == 0 );
+}
+
+BOOST_AUTO_TEST_CASE(info_constructor) {
+	const auto line_num = 42;
+	const auto file_name = "somewhere.cpp";
+	log_record record( file_name, line_num );
+	BOOST_CHECK( record.message() == "" );
+	BOOST_CHECK( record.filename() == file_name );
+	BOOST_CHECK( record.line() == line_num );
+}
+
+BOOST_AUTO_TEST_CASE(text_stream) {
+	const auto line_num = 42;
+	const auto file_name = "somewhere.cpp";
+	const auto message = "At line " + std::to_string(line_num) + " we check the code.";
+	log_record record( file_name, line_num );
+
+	record << "At line " << line_num << " we check the code.";
+
+	BOOST_CHECK( record.message() == message );
+	BOOST_CHECK( record.filename() == file_name );
+	BOOST_CHECK( record.line() == line_num );
+}

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,9 @@`
`13`	`13`
`14`	`14`	`namespace network { namespace logging {`
`15`	`15`
	`16`	`+ const char* log_record::UNKNOWN_FILE_NAME = "unknown";`
	`17`	`+`
	`18`	`+`
`16`	`19`	`namespace handler`
`17`	`20`	`{`
`18`	`21`	`namespace`