X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FFormat.test.cc;h=62e7c57b0ebfb9d3424d07cd984a056b61d5950c;hb=4101c2b818ec67e7469ebb44f030eed2185c4ab0;hp=ef1a2a2747bc7a981f12b38161beb644c46dc981;hpb=c9d8ba8de7801af854581eb9e175d7b4f19ece3d;p=senf.git diff --git a/senf/Utils/Format.test.cc b/senf/Utils/Format.test.cc index ef1a2a2..62e7c57 100644 --- a/senf/Utils/Format.test.cc +++ b/senf/Utils/Format.test.cc @@ -1,6 +1,6 @@ // $Id$ // -// Copyright (C) 2009 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) // Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund @@ -37,9 +37,9 @@ #include #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -BOOST_AUTO_UNIT_TEST(formatEng) +SENF_AUTO_UNIT_TEST(formatEng) { std::stringstream ss; @@ -86,9 +86,9 @@ BOOST_AUTO_UNIT_TEST(formatEng) CheckFormat( (1.345e-3, 3.456), "0.0+-3.5" ); # undef CheckFormat - + // From documentation - + { std::stringstream ss; ss << senf::format::eng(1.23); @@ -103,7 +103,7 @@ BOOST_AUTO_UNIT_TEST(formatEng) { std::stringstream ss; - ss << std::setw(25) << std::setprecision(5) << std::showpos << std::uppercase + ss << std::setw(25) << std::setprecision(5) << std::showpos << std::uppercase << std::internal << senf::format::eng(12345,67); BOOST_CHECK_EQUAL( ss.str(), "+ 12.35+-000.07E+03" ); } @@ -132,10 +132,10 @@ BOOST_AUTO_UNIT_TEST(formatEng) " 12.35+-067.00E+00" ); } -BOOST_AUTO_UNIT_TEST(dumpint) +SENF_AUTO_UNIT_TEST(dumpint) { std::stringstream ss; - + # define CheckFormat(v,s) \ { \ ss.str(""); \ @@ -149,7 +149,32 @@ BOOST_AUTO_UNIT_TEST(dumpint) # undef CheckFormat } -///////////////////////////////cc.e//////////////////////////////////////// +namespace { + void f1(std::ostream & os) { + senf::format::IndentHelper indent; + os << indent << "f1\n"; + } + void f2(std::ostream & os) { + senf::format::IndentHelper indent; + os << indent << "f2_1\n"; + f1( os); + os << indent << "f2_2\n"; + indent.increase(); + os << indent << "f2_3\n"; + } +} +SENF_AUTO_UNIT_TEST(indent) +{ + std::stringstream ss; + f2(ss); + BOOST_CHECK_EQUAL( ss.str(), + " f2_1\n" + " f1\n" + " f2_2\n" + " f2_3\n"); +} + +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_