X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FFormat.test.cc;h=cbb785942565099c317dc5d6ce2947bab31debf7;hb=refs%2Fheads%2Fmaster;hp=ece8647c32dbbc039126cfe47ce9937d92527e8b;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git

diff --git a/senf/Utils/Format.test.cc b/senf/Utils/Format.test.cc
index ece8647..cbb7859 100644
--- a/senf/Utils/Format.test.cc
+++ b/senf/Utils/Format.test.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief Format.test unit tests */
@@ -37,7 +42,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 SENF_AUTO_UNIT_TEST(formatEng)
 {
@@ -86,9 +91,9 @@ SENF_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 +108,7 @@ SENF_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" );
     }
@@ -135,7 +140,7 @@ SENF_AUTO_UNIT_TEST(formatEng)
 SENF_AUTO_UNIT_TEST(dumpint)
 {
     std::stringstream ss;
-    
+
 #   define CheckFormat(v,s)                                             \
         {                                                               \
             ss.str("");                                                 \
@@ -149,7 +154,32 @@ SENF_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_