CodingGuideLines.

CodingGuideLines.txt: added. CppUnit's coding guidelines for portability.

* include/cppunit/portability/CppUnitStack.h: added. wrapper for std::stack.

* include/cppunit/portability/CppUnitSet.h: added. wrapper for std::set.

* include/cppunit/ui/text/TestRunner.h: fixed namespace definition for
deprecated TestRunner.

* include/cppunit/TestAssert.h:
* src/cppunit/TestAssert.cpp: removed old deprecated functions that did
not use SourceLine. Moved assertEquals() and assertDoubleEquals() into
CppUnit namespace.

* src/cppunit/TestFactoryRegistry.cpp: use CppUnitMap instead of std::map.

* src/DllPlugInTester/CommandLineParser.h: use CppUnitDeque instead
std::deque.

* examples/cppunittest/*.h:
* examples/cppunittest/*.cpp: removed all usage of CppUnitTest namespace.
Everything is now in global space.

* examples/*/*.h:
* examples/*/*.cpp: replaced usage of CppUnit:: with CPPUNIT_NS::.

* examples/ClockerPlugIn/ClockerModel.h: use CppUnit STL wrapper instead
of STL container.

33 files changed, 50 insertions, 96 deletions

diff --git a/examples/cppunittest/CoreSuite.h b/examples/cppunittest/CoreSuite.h
index e55387e..45b33b4 100644
--- a/examples/cppunittest/CoreSuite.h
+++ b/examples/cppunittest/CoreSuite.h
@@ -3,14 +3,9 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string coreSuiteName()
 {
-
-  inline std::string coreSuiteName()
-  {
-    return "Core";
-  }
-
+  return "Core";
 }
 
 #endif // CPPUNITTEST_CORESUITE_H
diff --git a/examples/cppunittest/CppUnitTestSuite.cpp b/examples/cppunittest/CppUnitTestSuite.cpp
index 35e8fd6..2b5ec2d 100644
--- a/examples/cppunittest/CppUnitTestSuite.cpp
+++ b/examples/cppunittest/CppUnitTestSuite.cpp
@@ -6,14 +6,9 @@
 #include "ToolsSuite.h"
 #include "UnitTestToolSuite.h"
 
-namespace CppUnitTest 
-{
-
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( coreSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( extensionSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( helperSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( outputSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( toolsSuiteName() );
 CPPUNIT_REGISTRY_ADD_TO_DEFAULT( unitTestToolSuiteName() );
-
-}
\ No newline at end of file
diff --git a/examples/cppunittest/ExceptionTest.cpp b/examples/cppunittest/ExceptionTest.cpp
index c703c7d..31dce64 100644
--- a/examples/cppunittest/ExceptionTest.cpp
+++ b/examples/cppunittest/ExceptionTest.cpp
@@ -5,7 +5,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( ExceptionTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 ExceptionTest::ExceptionTest()
diff --git a/examples/cppunittest/ExtensionSuite.h b/examples/cppunittest/ExtensionSuite.h
index 037a8ee..8ddfcaf 100644
--- a/examples/cppunittest/ExtensionSuite.h
+++ b/examples/cppunittest/ExtensionSuite.h
@@ -3,14 +3,9 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string extensionSuiteName()
 {
-
-  inline std::string extensionSuiteName()
-  {
-    return "Extensions";
-  }
-
+  return "Extensions";
 }
 
 #endif // CPPUNITTEST_EXTENSIONSSUITE_H
diff --git a/examples/cppunittest/HelperMacrosTest.cpp b/examples/cppunittest/HelperMacrosTest.cpp
index 311b4a7..4300db6 100644
--- a/examples/cppunittest/HelperMacrosTest.cpp
+++ b/examples/cppunittest/HelperMacrosTest.cpp
@@ -115,7 +115,7 @@ public:
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( HelperMacrosTest, 
-                                       CppUnitTest::helperSuiteName() );
+                                       helperSuiteName() );
 
 
 HelperMacrosTest::HelperMacrosTest()
diff --git a/examples/cppunittest/HelperSuite.h b/examples/cppunittest/HelperSuite.h
index 6edeffd..55cca0a 100644
--- a/examples/cppunittest/HelperSuite.h
+++ b/examples/cppunittest/HelperSuite.h
@@ -3,14 +3,10 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string helperSuiteName()
 {
-
-  inline std::string helperSuiteName()
-  {
-    return "Helpers";
-  }
-
+  return "Helpers";
 }
 
+
 #endif // CPPUNITTEST_HELPERSUITE_H
diff --git a/examples/cppunittest/MessageTest.cpp b/examples/cppunittest/MessageTest.cpp
index 47a34da..c59544d 100644
--- a/examples/cppunittest/MessageTest.cpp
+++ b/examples/cppunittest/MessageTest.cpp
@@ -2,7 +2,7 @@
 #include "MessageTest.h"
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( MessageTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 MessageTest::MessageTest()
diff --git a/examples/cppunittest/OrthodoxTest.cpp b/examples/cppunittest/OrthodoxTest.cpp
index 0da7180..ae1edb3 100644
--- a/examples/cppunittest/OrthodoxTest.cpp
+++ b/examples/cppunittest/OrthodoxTest.cpp
@@ -4,7 +4,7 @@
 #include <cppunit/TestResult.h>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( OrthodoxTest,
-                                       CppUnitTest::extensionSuiteName() );
+                                       extensionSuiteName() );
 
 OrthodoxTest::OrthodoxTest()
 {
diff --git a/examples/cppunittest/OutputSuite.h b/examples/cppunittest/OutputSuite.h
index 0f8ece7..d737699 100644
--- a/examples/cppunittest/OutputSuite.h
+++ b/examples/cppunittest/OutputSuite.h
@@ -3,14 +3,10 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string outputSuiteName()
 {
-
-  inline std::string outputSuiteName()
-  {
-    return "Output";
-  }
-
+  return "Output";
 }
 
+
 #endif // CPPUNITTEST_OUTPUTSUITE_H
diff --git a/examples/cppunittest/RepeatedTestTest.cpp b/examples/cppunittest/RepeatedTestTest.cpp
index 272a9a4..a8b1489 100644
--- a/examples/cppunittest/RepeatedTestTest.cpp
+++ b/examples/cppunittest/RepeatedTestTest.cpp
@@ -4,7 +4,7 @@
 #include <cppunit/TestResult.h>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( RepeatedTestTest,
-                                       CppUnitTest::extensionSuiteName() );
+                                       extensionSuiteName() );
 
 
 RepeatedTestTest::RepeatedTestTest() :
diff --git a/examples/cppunittest/RepeatedTestTest.h b/examples/cppunittest/RepeatedTestTest.h
index 09e3cb5..609fed4 100644
--- a/examples/cppunittest/RepeatedTestTest.h
+++ b/examples/cppunittest/RepeatedTestTest.h
@@ -4,7 +4,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 
 
-class RepeatedTestTest : public CppUnit::TestFixture
+class RepeatedTestTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( RepeatedTestTest );
   CPPUNIT_TEST( testRun );
@@ -20,7 +20,7 @@ public:
   void testRun();
 
 private:
-  class RunCountTest : public CppUnit::TestCase
+  class RunCountTest : public CPPUNIT_NS::TestCase
   {
   public:
     RunCountTest() : m_runCount( 0 ) {}
@@ -38,7 +38,7 @@ private:
 
 private:
   RunCountTest *m_test;
-  CppUnit::Test *m_repeatedTest;
+  CPPUNIT_NS::Test *m_repeatedTest;
   const int m_repeatCount;
 };
 
diff --git a/examples/cppunittest/StringToolsTest.h b/examples/cppunittest/StringToolsTest.h
index 4a42e20..05a834a 100644
--- a/examples/cppunittest/StringToolsTest.h
+++ b/examples/cppunittest/StringToolsTest.h
@@ -6,7 +6,7 @@
 
 
 /// Unit tests for StringToolsTest
-class StringToolsTest : public CppUnit::TestCase
+class StringToolsTest : public CPPUNIT_NS::TestCase
 {
   CPPUNIT_TEST_SUITE( StringToolsTest );
   CPPUNIT_TEST( testToStringInt );
diff --git a/examples/cppunittest/TestAssertTest.cpp b/examples/cppunittest/TestAssertTest.cpp
index da471ad..e3b57ac 100644
--- a/examples/cppunittest/TestAssertTest.cpp
+++ b/examples/cppunittest/TestAssertTest.cpp
@@ -13,7 +13,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestAssertTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestAssertTest::TestAssertTest()
diff --git a/examples/cppunittest/TestCallerTest.cpp b/examples/cppunittest/TestCallerTest.cpp
index bdfb3d0..53b1aa4 100644
--- a/examples/cppunittest/TestCallerTest.cpp
+++ b/examples/cppunittest/TestCallerTest.cpp
@@ -6,7 +6,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestCallerTest, 
-                                       CppUnitTest::helperSuiteName() );
+                                       helperSuiteName() );
 
 
 void 
diff --git a/examples/cppunittest/TestCaseTest.cpp b/examples/cppunittest/TestCaseTest.cpp
index 3a948d4..8ed31bb 100644
--- a/examples/cppunittest/TestCaseTest.cpp
+++ b/examples/cppunittest/TestCaseTest.cpp
@@ -10,7 +10,7 @@
  */
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestCaseTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestCaseTest::TestCaseTest()
diff --git a/examples/cppunittest/TestDecoratorTest.cpp b/examples/cppunittest/TestDecoratorTest.cpp
index 48dd76d..86acab6 100644
--- a/examples/cppunittest/TestDecoratorTest.cpp
+++ b/examples/cppunittest/TestDecoratorTest.cpp
@@ -4,7 +4,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestDecoratorTest,
-                                       CppUnitTest::extensionSuiteName() );
+                                       extensionSuiteName() );
 
 
 TestDecoratorTest::TestDecoratorTest()
diff --git a/examples/cppunittest/TestFailureTest.cpp b/examples/cppunittest/TestFailureTest.cpp
index 6c76820..413460d 100644
--- a/examples/cppunittest/TestFailureTest.cpp
+++ b/examples/cppunittest/TestFailureTest.cpp
@@ -5,7 +5,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestFailureTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestFailureTest::TestFailureTest()
diff --git a/examples/cppunittest/TestPathTest.cpp b/examples/cppunittest/TestPathTest.cpp
index d664273..0f3d348 100644
--- a/examples/cppunittest/TestPathTest.cpp
+++ b/examples/cppunittest/TestPathTest.cpp
@@ -3,7 +3,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestPathTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestPathTest::TestPathTest()
diff --git a/examples/cppunittest/TestResultCollectorTest.cpp b/examples/cppunittest/TestResultCollectorTest.cpp
index 0d8fdd6..175250b 100644
--- a/examples/cppunittest/TestResultCollectorTest.cpp
+++ b/examples/cppunittest/TestResultCollectorTest.cpp
@@ -4,7 +4,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestResultCollectorTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestResultCollectorTest::TestResultCollectorTest()
diff --git a/examples/cppunittest/TestResultTest.cpp b/examples/cppunittest/TestResultTest.cpp
index f1987ac..1ff6c1c 100644
--- a/examples/cppunittest/TestResultTest.cpp
+++ b/examples/cppunittest/TestResultTest.cpp
@@ -3,7 +3,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestResultTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestResultTest::TestResultTest()
diff --git a/examples/cppunittest/TestSetUpTest.cpp b/examples/cppunittest/TestSetUpTest.cpp
index 6622d41..3f8f7dd 100644
--- a/examples/cppunittest/TestSetUpTest.cpp
+++ b/examples/cppunittest/TestSetUpTest.cpp
@@ -3,7 +3,7 @@
 #include <cppunit/TestResult.h>
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestSetUpTest,
-                                       CppUnitTest::extensionSuiteName() );
+                                       extensionSuiteName() );
 
 
 TestSetUpTest::TestSetUpTest()
diff --git a/examples/cppunittest/TestSuiteTest.cpp b/examples/cppunittest/TestSuiteTest.cpp
index ae6e65a..ec4f4ad 100644
--- a/examples/cppunittest/TestSuiteTest.cpp
+++ b/examples/cppunittest/TestSuiteTest.cpp
@@ -5,7 +5,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestSuiteTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestSuiteTest::TestSuiteTest()
diff --git a/examples/cppunittest/TestSuiteTest.h b/examples/cppunittest/TestSuiteTest.h
index 3f9d21f..cdb301a 100644
--- a/examples/cppunittest/TestSuiteTest.h
+++ b/examples/cppunittest/TestSuiteTest.h
@@ -5,7 +5,7 @@
 #include <stdexcept>
 
 
-class TestSuiteTest : public CppUnit::TestFixture
+class TestSuiteTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( TestSuiteTest );
   CPPUNIT_TEST( testConstructor );
@@ -52,7 +52,7 @@ private:
   void operator =( const TestSuiteTest &copy );
 
 private:
-  CppUnit::TestSuite *m_suite;
+  CPPUNIT_NS::TestSuite *m_suite;
 };
 
 
diff --git a/examples/cppunittest/TestTest.cpp b/examples/cppunittest/TestTest.cpp
index a98cc08..4edc31c 100644
--- a/examples/cppunittest/TestTest.cpp
+++ b/examples/cppunittest/TestTest.cpp
@@ -3,7 +3,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TestTest,
-                                       CppUnitTest::coreSuiteName() );
+                                       coreSuiteName() );
 
 
 TestTest::TestTest() : 
diff --git a/examples/cppunittest/ToolsSuite.h b/examples/cppunittest/ToolsSuite.h
index 04a2edd..3d3efc0 100644
--- a/examples/cppunittest/ToolsSuite.h
+++ b/examples/cppunittest/ToolsSuite.h
@@ -3,14 +3,9 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string toolsSuiteName()
 {
-
-  inline std::string toolsSuiteName()
-  {
-    return "Tools";
-  }
-
+  return "Tools";
 }
 
 #endif // CPPUNITTEST_TOOLSSUITE_H
diff --git a/examples/cppunittest/UnitTestToolSuite.h b/examples/cppunittest/UnitTestToolSuite.h
index 90a0b0c..7d2341e 100644
--- a/examples/cppunittest/UnitTestToolSuite.h
+++ b/examples/cppunittest/UnitTestToolSuite.h
@@ -3,14 +3,9 @@
 
 #include <string>
 
-namespace CppUnitTest
+inline std::string unitTestToolSuiteName()
 {
-
-  inline std::string unitTestToolSuiteName()
-  {
-    return "UnitTestTool";
-  }
-
+  return "UnitTestTool";
 }
 
 #endif // CPPUNITTEST_UNITTESTTOOLSUITE_H
diff --git a/examples/cppunittest/XmlElementTest.cpp b/examples/cppunittest/XmlElementTest.cpp
index 02ffee7..3b5bd4c 100644
--- a/examples/cppunittest/XmlElementTest.cpp
+++ b/examples/cppunittest/XmlElementTest.cpp
@@ -5,7 +5,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlElementTest, 
-                                       CppUnitTest::toolsSuiteName() );
+                                       toolsSuiteName() );
 
 
 XmlElementTest::XmlElementTest()
diff --git a/examples/cppunittest/XmlElementTest.h b/examples/cppunittest/XmlElementTest.h
index acdcde2..875ee51 100644
--- a/examples/cppunittest/XmlElementTest.h
+++ b/examples/cppunittest/XmlElementTest.h
@@ -7,7 +7,7 @@
 
 /*! Unit tests for XmlElement.
  */
-class XmlElementTest : public CppUnit::TestFixture
+class XmlElementTest : public CPPUNIT_NS::TestFixture
 {
   CPPUNIT_TEST_SUITE( XmlElementTest );
   CPPUNIT_TEST( testStringContentConstructor );
diff --git a/examples/cppunittest/XmlOutputterTest.cpp b/examples/cppunittest/XmlOutputterTest.cpp
index 486f00c..5a64ff9 100644
--- a/examples/cppunittest/XmlOutputterTest.cpp
+++ b/examples/cppunittest/XmlOutputterTest.cpp
@@ -8,7 +8,7 @@
 
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlOutputterTest, 
-                                       CppUnitTest::outputSuiteName() );
+                                       outputSuiteName() );
 
 
 XmlOutputterTest::XmlOutputterTest()
diff --git a/examples/cppunittest/XmlOutputterTest.h b/examples/cppunittest/XmlOutputterTest.h
index c451a2b..697a452 100644
--- a/examples/cppunittest/XmlOutputterTest.h
+++ b/examples/cppunittest/XmlOutputterTest.h
@@ -2,10 +2,10 @@
 #define CPPUNITEST_XMLTESTRESULTOUTPUTTERTEST_H
 
 #include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/portability/CppUnitDeque.h>
 #include <cppunit/Test.h>
 #include <cppunit/TestFailure.h>
 #include <cppunit/TestResultCollector.h>
-#include <deque>
 
 
 /*! \class XmlOutputterTest
@@ -70,7 +70,7 @@ private:
 
 private:
   CPPUNIT_NS::TestResultCollector *m_result;
-  std::deque<CPPUNIT_NS::Test *> m_dummyTests;
+  CppUnitDeque<CPPUNIT_NS::Test *> m_dummyTests;
 };
 
 
diff --git a/examples/cppunittest/XmlUniformiser.cpp b/examples/cppunittest/XmlUniformiser.cpp
index e884e20..f989081 100644
--- a/examples/cppunittest/XmlUniformiser.cpp
+++ b/examples/cppunittest/XmlUniformiser.cpp
@@ -1,9 +1,5 @@
 #include "XmlUniformiser.h"
 
-namespace CppUnitTest
-{
-
-
 
 int 
 notEqualIndex( std::string expectedXml,
@@ -36,10 +32,10 @@ checkXmlEqual( std::string expectedXml,
   message  <<  "differ at index: "  <<  index  << "\n"
            <<  "expected: "  <<  expected.substr(index) << "\n"
            <<  "but was : "  <<  actual.substr( index );
-  ::CPPUNIT_NS::Asserter::failNotEqual( expected,
-                                     actual,
-                                     sourceLine,
-                                     message.str() );
+  CPPUNIT_NS::Asserter::failNotEqual( expected,
+                                      actual,
+                                      sourceLine,
+                                      message.str() );
 }
 
 
@@ -235,6 +231,3 @@ XmlUniformiser::removeTrailingSpaces()
     --index;
   m_stripped.resize( index );
 }
-
-
-}  // namespace CppUnitTest
diff --git a/examples/cppunittest/XmlUniformiser.h b/examples/cppunittest/XmlUniformiser.h
index d1e98d5..a63bbc8 100644
--- a/examples/cppunittest/XmlUniformiser.h
+++ b/examples/cppunittest/XmlUniformiser.h
@@ -6,10 +6,6 @@
 #include <string>
 
 
-namespace CppUnitTest
-{
-
-
 /*! Uniformise an XML string.
  *
  * Strips spaces between attribut in Element.
@@ -54,16 +50,14 @@ private:
 void 
 checkXmlEqual( std::string expectedXml,
                std::string actualXml,
-               CppUnit::SourceLine sourceLine );
+               CPPUNIT_NS::SourceLine sourceLine );
 
 
 /// Asserts that two XML strings are equivalent.
 #define CPPUNITTEST_ASSERT_XML_EQUAL( expected, actual ) \
-    ::CppUnitTest::checkXmlEqual( expected, actual,      \
-                                  CPPUNIT_SOURCELINE() )
-
+    ::checkXmlEqual( expected, actual,      \
+                     CPPUNIT_SOURCELINE() )
 
 
-}  // namespace CppUnitTest
 
 #endif  // XMLUNIFORMISER_H
diff --git a/examples/cppunittest/XmlUniformiserTest.cpp b/examples/cppunittest/XmlUniformiserTest.cpp
index d99b457..99d7ed0 100644
--- a/examples/cppunittest/XmlUniformiserTest.cpp
+++ b/examples/cppunittest/XmlUniformiserTest.cpp
@@ -4,7 +4,7 @@
 #include "XmlUniformiser.h"
 
 CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( XmlUniformiserTest, 
-                                       CppUnitTest::unitTestToolSuiteName() );
+                                       unitTestToolSuiteName() );
 
 
 XmlUniformiserTest::XmlUniformiserTest()
@@ -142,6 +142,6 @@ void
 XmlUniformiserTest::check( const std::string &xml, 
                            const std::string &expectedStrippedXml )
 {
-  std::string actual = CppUnitTest::XmlUniformiser( xml ).stripped();
+  std::string actual = XmlUniformiser( xml ).stripped();
   CPPUNIT_ASSERT_EQUAL( expectedStrippedXml, actual );
 }