diff options
Diffstat (limited to 'boost/test/impl/xml_report_formatter.ipp')
| -rw-r--r-- | boost/test/impl/xml_report_formatter.ipp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/boost/test/impl/xml_report_formatter.ipp b/boost/test/impl/xml_report_formatter.ipp index 261db788b3..5606fdc0b1 100644 --- a/boost/test/impl/xml_report_formatter.ipp +++ b/boost/test/impl/xml_report_formatter.ipp @@ -1,6 +1,6 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2014. // Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at +// (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // See http://www.boost.org/libs/test for the library home page. @@ -9,7 +9,7 @@ // // Version : $Revision$ // -// Description : XML report formatter +// Description : OF_XML report formatter // *************************************************************************** #ifndef BOOST_TEST_XML_REPORT_FORMATTER_IPP_020105GER @@ -17,9 +17,9 @@ // Boost.Test #include <boost/test/results_collector.hpp> -#include <boost/test/unit_test_suite_impl.hpp> #include <boost/test/output/xml_report_formatter.hpp> +#include <boost/test/tree/test_unit.hpp> #include <boost/test/utils/xml_printer.hpp> #include <boost/test/utils/basic_cstring/io.hpp> @@ -28,9 +28,7 @@ //____________________________________________________________________________// namespace boost { - namespace unit_test { - namespace output { void @@ -66,20 +64,23 @@ xml_report_formatter::test_unit_report_start( test_unit const& tu, std::ostream& else descr = "failed"; - ostr << '<' << ( tu.p_type == tut_case ? "TestCase" : "TestSuite" ) + ostr << '<' << ( tu.p_type == TUT_CASE ? "TestCase" : "TestSuite" ) << " name" << attr_value() << tu.p_name.get() << " result" << attr_value() << descr << " assertions_passed" << attr_value() << tr.p_assertions_passed << " assertions_failed" << attr_value() << tr.p_assertions_failed + << " warnings_failed" << attr_value() << tr.p_warnings_failed << " expected_failures" << attr_value() << tr.p_expected_failures; - if( tu.p_type == tut_suite ) + if( tu.p_type == TUT_SUITE ) { ostr << " test_cases_passed" << attr_value() << tr.p_test_cases_passed + << " test_cases_passed_with_warnings" << attr_value() << tr.p_test_cases_warned << " test_cases_failed" << attr_value() << tr.p_test_cases_failed << " test_cases_skipped" << attr_value() << tr.p_test_cases_skipped << " test_cases_aborted" << attr_value() << tr.p_test_cases_aborted; - - + } + + ostr << '>'; } @@ -88,7 +89,7 @@ xml_report_formatter::test_unit_report_start( test_unit const& tu, std::ostream& void xml_report_formatter::test_unit_report_finish( test_unit const& tu, std::ostream& ostr ) { - ostr << "</" << ( tu.p_type == tut_case ? "TestCase" : "TestSuite" ) << '>'; + ostr << "</" << ( tu.p_type == TUT_CASE ? "TestCase" : "TestSuite" ) << '>'; } //____________________________________________________________________________// @@ -97,19 +98,15 @@ void xml_report_formatter::do_confirmation_report( test_unit const& tu, std::ostream& ostr ) { test_unit_report_start( tu, ostr ); - test_unit_report_finish( tu, ostr ); + test_unit_report_finish( tu, ostr ); } //____________________________________________________________________________// } // namespace output - } // namespace unit_test - } // namespace boost -//____________________________________________________________________________// - #include <boost/test/detail/enable_warnings.hpp> #endif // BOOST_TEST_XML_REPORT_FORMATTER_IPP_020105GER |