diff --git a/include/boost/test/impl/xml_log_formatter.ipp b/include/boost/test/impl/xml_log_formatter.ipp index e297d71f..e244d4d5 100644 --- a/include/boost/test/impl/xml_log_formatter.ipp +++ b/include/boost/test/impl/xml_log_formatter.ipp @@ -108,7 +108,7 @@ void xml_log_formatter::test_unit_skipped( std::ostream& ostr, test_unit const& tu, const_string reason ) { ostr << "<" << tu_type_name( tu ) - << " name" << utils::attr_value() << tu.p_name + << " name" << utils::attr_value() << tu.p_name.get() << " skipped" << utils::attr_value() << "yes" << " reason" << utils::attr_value() << reason << "/>"; diff --git a/test/baseline-outputs/log-formatter-test.pattern b/test/baseline-outputs/log-formatter-test.pattern index 14791083..d7f26825 100644 --- a/test/baseline-outputs/log-formatter-test.pattern +++ b/test/baseline-outputs/log-formatter-test.pattern @@ -279,11 +279,11 @@ xxx/log-formatter-test.cpp:64: fatal error: in "Fake Test Suite Hierarchy/3 test Failure occurred in a following context: some context xxx/log-formatter-test.cpp:174: Leaving test case "very_bad_foo" -xxx/log-formatter-test.cpp:176: Test case "Fake Test Suite Hierarchy/3 test cases inside/bad_foo2" is skipped because dependency test case "Fake Test Suite Hierarchy/3 test cases inside/very_bad_foo" has failed +xxx/log-formatter-test.cpp:176: Test case "Fake Test Suite Hierarchy/3 test cases inside/bad_foo2" is skipped because dependency test case "Fake Test Suite Hierarchy/3 test cases inside/very_bad_foo" has failed xxx/log-formatter-test.cpp:172: Leaving test suite "3 test cases inside" * 2-format ******************************************************************* -ZZZZZZ +ZZZZZZ * 3-format ******************************************************************* @@ -343,10 +343,10 @@ ASSERTION FAILURE: - line: 174 ]]> - + ' - reason: 'dependency test case "Fake Test Suite Hierarchy/3 test cases inside/very_bad_foo" has failed']]> @@ -398,10 +398,10 @@ ASSERTION FAILURE: - line: 174 ]]> - + ' - reason: 'dependency test case "Fake Test Suite Hierarchy/3 test cases inside/very_bad_foo" has failed']]> @@ -703,16 +703,16 @@ xxx/log-formatter-test.cpp:159: Entering test suite "1 test cases inside" xxx/log-formatter-test.cpp:160: Entering test case "good_foo" Test case Fake Test Suite Hierarchy/1 test cases inside/good_foo did not check any assertions xxx/log-formatter-test.cpp:160: Leaving test case "good_foo" -xxx/log-formatter-test.cpp:219: Entering test case "bad_foo" -xxx/log-formatter-test.cpp:50: error: in "Fake Test Suite Hierarchy/1 test cases inside/bad_foo": +xxx/log-formatter-test.cpp:219: Entering test case "bad" +xxx/log-formatter-test.cpp:50: error: in "Fake Test Suite Hierarchy/1 test cases inside/bad": this is a message xxx/log-formatter-test.cpp:53: info: check true has passed -xxx/log-formatter-test.cpp:57: error: in "Fake Test Suite Hierarchy/1 test cases inside/bad_foo": with some message +xxx/log-formatter-test.cpp:57: error: in "Fake Test Suite Hierarchy/1 test cases inside/bad": with some message Failure occurred in a following context: Context value=something Context value2=something different -xxx/log-formatter-test.cpp:59: error: in "Fake Test Suite Hierarchy/1 test cases inside/bad_foo": non sense -xxx/log-formatter-test.cpp:219: Leaving test case "bad_foo" +xxx/log-formatter-test.cpp:59: error: in "Fake Test Suite Hierarchy/1 test cases inside/bad": non sense +xxx/log-formatter-test.cpp:219: Leaving test case "bad" xxx/log-formatter-test.cpp:159: Leaving test suite "1 test cases inside" xxx/log-formatter-test.cpp:168: Entering test suite "2 test cases inside" xxx/log-formatter-test.cpp:169: Entering test case "good_foo" @@ -770,7 +770,7 @@ xxx/log-formatter-test.cpp:172: Test suite "Fake Test Suite Hierarchy/3 test cas xxx/log-formatter-test.cpp:186: Leaving test suite "Fake Test Suite Hierarchy" * 2-format ******************************************************************* -ZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZZZZZZZZZZZZZZZZZZZZZZ * 3-format ******************************************************************* @@ -782,7 +782,7 @@ xxx/log-formatter-test.cpp:186: Leaving test suite "Fake Test Suite Hierarchy" ]]> - + - file: log-formatter-test.cpp - line: 219 ]]> @@ -884,10 +884,10 @@ INFO: - disabled test unit: 'Fake Test Suite Hierarchy/3 test cases inside' - reason: 'dependency test suite "Fake Test Suite Hierarchy/1 test cases inside" has failed']]> - + ' - disabled test unit: 'Fake Test Suite Hierarchy/3 test cases inside' - reason: 'dependency test suite "Fake Test Suite Hierarchy/1 test cases inside" has failed']]> @@ -1028,7 +1028,7 @@ INFO: - + - file: log-formatter-test.cpp - line: 219 ]]> @@ -1102,10 +1102,10 @@ ASSERTION FAILURE: - disabled test unit: 'Fake Test Suite Hierarchy/3 test cases inside' - reason: 'dependency test suite "Fake Test Suite Hierarchy/1 test cases inside" has failed']]> - + ' - disabled test unit: 'Fake Test Suite Hierarchy/3 test cases inside' - reason: 'dependency test suite "Fake Test Suite Hierarchy/1 test cases inside" has failed']]> diff --git a/test/framework-ts/log-formatter-test.cpp b/test/framework-ts/log-formatter-test.cpp index 1ed32cf0..fb6b034c 100644 --- a/test/framework-ts/log-formatter-test.cpp +++ b/test/framework-ts/log-formatter-test.cpp @@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE( test_logs ) ts_3->add( BOOST_TEST_CASE( bad_foo ) ); test_case* tc1 = BOOST_TEST_CASE( very_bad_foo ); ts_3->add( tc1 ); - test_case* tc2 = BOOST_TEST_CASE( bad_foo2 ); + test_case* tc2 = BOOST_TEST_CASE_NAME( bad_foo2 , "bad_foo2" ); // this is for skipped message GH-253 ts_3->add( tc2 ); tc2->depends_on( tc1 ); @@ -212,7 +212,7 @@ BOOST_AUTO_TEST_CASE( test_logs ) check( test_output, ts_4 ); - ts_1->add( BOOST_TEST_CASE( bad_foo ) ); + ts_1->add( BOOST_TEST_CASE_NAME( bad_foo, "bad" ) ); ts_3->depends_on( ts_1 ); check( test_output, ts_main );