Include/cppunit/XmlOutputter.

include/cppunit/XmlOutputter.h:
* src/cppunit/XmlOutputter.cpp: Made XML output more human readable. Idented element.

* examples/cppunittest/XmlUniformiser.h:
* examples/cppunittest/XmlUniformiser.cpp:
* examples/cppunittest/XmlUniformiserTest.cpp: modified to ignore trailing space
at the end of element content.

4 files changed, 22 insertions, 2 deletions

diff --git a/examples/cppunittest/CppUnitTestMain.cpp b/examples/cppunittest/CppUnitTestMain.cpp
index fad2868..04da95d 100644
--- a/examples/cppunittest/CppUnitTestMain.cpp
+++ b/examples/cppunittest/CppUnitTestMain.cpp
@@ -3,8 +3,10 @@
 #include <cppunit/TestResultCollector.h>
 #include <cppunit/TestRunner.h>
 #include <cppunit/TextTestProgressListener.h>
+#include <cppunit/XmlOutputter.h>
 #include "CppUnitTestSuite.h"
 #include <stdexcept>
+#include <fstream>
 
 
 int 
@@ -37,7 +39,13 @@ main( int argc, char* argv[] )
 
     // Print test in a compiler compatible format.
     CppUnit::CompilerOutputter outputter( &result, std::cerr );
-    outputter.write();                      
+    outputter.write(); 
+
+    std::ofstream file( "tests.xml" );
+    CppUnit::XmlOutputter xml( &result, file );
+    xml.setStyleSheet( "report.xsl" );
+    xml.write();
+    file.close();
   }
   catch ( std::invalid_argument &e )  // Test path not resolved
   {
diff --git a/examples/cppunittest/XmlUniformiser.cpp b/examples/cppunittest/XmlUniformiser.cpp
index 2776ddc..109a843 100644
--- a/examples/cppunittest/XmlUniformiser.cpp
+++ b/examples/cppunittest/XmlUniformiser.cpp
@@ -223,6 +223,17 @@ XmlUniformiser::copyElementContent()
 {
   while ( isValidIndex()  &&  !startsWith( "<" ) )
     copyNext();
+  removeTrailingSpaces();
+}
+
+
+void 
+XmlUniformiser::removeTrailingSpaces()
+{
+  int index = m_stripped.length();
+  while ( index-1 > 0  &&  isSpace( m_stripped[index-1] ) )
+    --index;
+  m_stripped.resize( index );
 }
 
 
diff --git a/examples/cppunittest/XmlUniformiser.h b/examples/cppunittest/XmlUniformiser.h
index 7df2cc5..d1e98d5 100644
--- a/examples/cppunittest/XmlUniformiser.h
+++ b/examples/cppunittest/XmlUniformiser.h
@@ -40,6 +40,7 @@ private:
   bool isEndOfAttributeName();
   void copyAttributeValue();
   void copyUntilDoubleQuote();
+  void removeTrailingSpaces();
 
 private:
   int m_index;
diff --git a/examples/cppunittest/XmlUniformiserTest.cpp b/examples/cppunittest/XmlUniformiserTest.cpp
index c440f0a..300ca6b 100644
--- a/examples/cppunittest/XmlUniformiserTest.cpp
+++ b/examples/cppunittest/XmlUniformiserTest.cpp
@@ -98,7 +98,7 @@ void
 XmlUniformiserTest::testElementWithContent()
 {
   check( "<Element>\nContent\n</Element>\n",
-         "<Element>Content\n</Element>" );
+         "<Element>Content</Element>" );
 }