diff options
Diffstat (limited to 'boost/test/impl/xml_log_formatter.ipp')
| -rw-r--r-- | boost/test/impl/xml_log_formatter.ipp | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/boost/test/impl/xml_log_formatter.ipp b/boost/test/impl/xml_log_formatter.ipp index 286cd60005..81284020dd 100644 --- a/boost/test/impl/xml_log_formatter.ipp +++ b/boost/test/impl/xml_log_formatter.ipp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2014. +// (C) Copyright Gennadiy Rozental 2001. // 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) @@ -66,9 +66,9 @@ void xml_log_formatter::log_build_info( std::ostream& ostr ) { ostr << "<BuildInfo" - << " platform" << attr_value() << BOOST_PLATFORM - << " compiler" << attr_value() << BOOST_COMPILER - << " stl" << attr_value() << BOOST_STDLIB + << " platform" << utils::attr_value() << BOOST_PLATFORM + << " compiler" << utils::attr_value() << BOOST_COMPILER + << " stl" << utils::attr_value() << BOOST_STDLIB << " boost=\"" << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100 << '\"' @@ -80,11 +80,11 @@ xml_log_formatter::log_build_info( std::ostream& ostr ) void xml_log_formatter::test_unit_start( std::ostream& ostr, test_unit const& tu ) { - ostr << "<" << tu_type_name( tu ) << " name" << attr_value() << tu.p_name.get(); + ostr << "<" << tu_type_name( tu ) << " name" << utils::attr_value() << tu.p_name.get(); - if( !tu.p_file_name.get().empty() ) - ostr << BOOST_TEST_L( " file" ) << attr_value() << tu.p_file_name - << BOOST_TEST_L( " line" ) << attr_value() << tu.p_line_num; + if( !tu.p_file_name.empty() ) + ostr << BOOST_TEST_L( " file" ) << utils::attr_value() << tu.p_file_name + << BOOST_TEST_L( " line" ) << utils::attr_value() << tu.p_line_num; ostr << ">"; } @@ -106,9 +106,9 @@ void xml_log_formatter::test_unit_skipped( std::ostream& ostr, test_unit const& tu, const_string reason ) { ostr << "<" << tu_type_name( tu ) - << " name" << attr_value() << tu.p_name.get() - << " skipped" << attr_value() << "yes" - << " reason" << attr_value() << reason + << " name" << utils::attr_value() << tu.p_name + << " skipped" << utils::attr_value() << "yes" + << " reason" << utils::attr_value() << reason << "/>"; } @@ -119,19 +119,19 @@ xml_log_formatter::log_exception_start( std::ostream& ostr, log_checkpoint_data { execution_exception::location const& loc = ex.where(); - ostr << "<Exception file" << attr_value() << loc.m_file_name - << " line" << attr_value() << loc.m_line_num; + ostr << "<Exception file" << utils::attr_value() << loc.m_file_name + << " line" << utils::attr_value() << loc.m_line_num; if( !loc.m_function.is_empty() ) - ostr << " function" << attr_value() << loc.m_function; + ostr << " function" << utils::attr_value() << loc.m_function; - ostr << ">" << cdata() << ex.what(); + ostr << ">" << utils::cdata() << ex.what(); if( !checkpoint_data.m_file_name.is_empty() ) { - ostr << "<LastCheckpoint file" << attr_value() << checkpoint_data.m_file_name - << " line" << attr_value() << checkpoint_data.m_line_num + ostr << "<LastCheckpoint file" << utils::attr_value() << checkpoint_data.m_file_name + << " line" << utils::attr_value() << checkpoint_data.m_line_num << ">" - << cdata() << checkpoint_data.m_message + << utils::cdata() << checkpoint_data.m_message << "</LastCheckpoint>"; } } @@ -153,8 +153,8 @@ xml_log_formatter::log_entry_start( std::ostream& ostr, log_entry_data const& en m_curr_tag = xml_tags[let]; ostr << '<' << m_curr_tag - << BOOST_TEST_L( " file" ) << attr_value() << entry_data.m_file_name - << BOOST_TEST_L( " line" ) << attr_value() << entry_data.m_line_num + << BOOST_TEST_L( " file" ) << utils::attr_value() << entry_data.m_file_name + << BOOST_TEST_L( " line" ) << utils::attr_value() << entry_data.m_line_num << BOOST_TEST_L( "><![CDATA[" ); m_value_closed = false; @@ -165,7 +165,7 @@ xml_log_formatter::log_entry_start( std::ostream& ostr, log_entry_data const& en void xml_log_formatter::log_entry_value( std::ostream& ostr, const_string value ) { - print_escaped_cdata( ostr, value ); + utils::print_escaped_cdata( ostr, value ); } //____________________________________________________________________________// @@ -194,7 +194,6 @@ xml_log_formatter::entry_context_start( std::ostream& ostr, log_level ) } ostr << BOOST_TEST_L( "<Context>" ); - } //____________________________________________________________________________// @@ -210,7 +209,7 @@ xml_log_formatter::entry_context_finish( std::ostream& ostr ) void xml_log_formatter::log_entry_context( std::ostream& ostr, const_string context_descr ) { - ostr << BOOST_TEST_L( "<Frame>" ) << cdata() << context_descr << BOOST_TEST_L( "</Frame>" ); + ostr << BOOST_TEST_L( "<Frame>" ) << utils::cdata() << context_descr << BOOST_TEST_L( "</Frame>" ); } //____________________________________________________________________________// |