From f1bf3276752a10a2cdf4e3cf3087399d199c4566 Mon Sep 17 00:00:00 2001 From: Baptiste Lepilleur Date: Sat, 13 Jul 2002 09:33:50 +0000 Subject: Include/cppunit/ui/text/TestRunner. include/cppunit/ui/text/TestRunner.h: * src/cppunit/TextTestRunner.cpp: Renamed TextUi::TestRunner TextTestRunner and moved it to the CppUnit namespace. Added a deprecated typedef for compatibility with previous version. * include/cppunit/ui/text/TextTestRunner.h: added. * include/cppunit/ui/mfc/TestRunner.h: * src/cppunit/msvc6/testrunner/TestRunner.cpp: Renamed MfcUi::TestRunner MfcTestRunner. Added deprecated typedef for compatibility. Renamed TestRunner.cpp to MfcTestRunner.cpp. * include/cppunit/ui/mfc/MfcTestRunner.h: added. * include/cppunit/ui/qt/TestRunner.h: * src/qttestrunner/TestRunner.cpp: renamed QtUi::TestRunner QtTestRunner and moved it to CppUnit namespace. Added a deprecated typedef for compatibility. Renamed TestRunner.cpp to QtTestRunner.cpp. * include/cppunit/ui/qt/TestRunner.h: * src/qttestrunner/TestRunner.h: Moved TestRunner to CppUnit namespace and renamed it QtTestRunner. Added deprecated typedef for compatibility. * include/cppunit/Asserter.h: * src/cppunit/Asserter.cpp: changed namespace Asserter to a struct and made all methods static. * include/cppunit/extensions/HelperMacros.h: * include/cppunit/extensions/SourceLine.h: * include/cppunit/extensions/TestAssert.h: * include/cppunit/extensions/TestPlugIn.h: * include/cppunit/Portability.h: changed CPPUNIT_NS(symbol) to a symbol macro that expand either to CppUnit or nothing. The symbol is no longer a parameter. * include/cppunit/portability/CppUnitVector.h: * include/cppunit/portability/CppUnitDeque.h: * include/cppunit/portability/CppUnitMap.h: added. STL Wrapper for compilers that do not support template default argumenent and need the allocator to be passed when instantiating STL container. * examples/cppunittest/*.h: * examples/cppunittest/*.cpp: * src/msvc6/testrunner/*.h: * src/msvc6/testrunner/*.cpp: * src/msvc6/testpluginrunner/*.h: * src/msvc6/testpluginrunner/*.cpp: * src/qttestrunner/*.h: * src/qttestrunner/*.cpp: replaced occurence of CppUnit:: by CPPUNIT_NS. * src/cppunit/TestSuite.h: replaced occurence of std::vector by CppUnitVector. --- examples/cppunittest/XmlElementTest.cpp | 58 ++++++++++++++++----------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'examples/cppunittest/XmlElementTest.cpp') diff --git a/examples/cppunittest/XmlElementTest.cpp b/examples/cppunittest/XmlElementTest.cpp index 585b0ba..02ffee7 100644 --- a/examples/cppunittest/XmlElementTest.cpp +++ b/examples/cppunittest/XmlElementTest.cpp @@ -33,7 +33,7 @@ XmlElementTest::tearDown() void XmlElementTest::testStringContentConstructor() { - CppUnit::XmlElement element( "aName", "someContent" ); + CPPUNIT_NS::XmlElement element( "aName", "someContent" ); CPPUNIT_ASSERT_EQUAL( std::string("aName"), element.name() ); CPPUNIT_ASSERT_EQUAL( std::string("someContent"), element.content() ); } @@ -42,7 +42,7 @@ XmlElementTest::testStringContentConstructor() void XmlElementTest::testNumericContentConstructor() { - CppUnit::XmlElement element( "numericName", 123456789 ); + CPPUNIT_NS::XmlElement element( "numericName", 123456789 ); CPPUNIT_ASSERT_EQUAL( std::string("numericName"), element.name() ); CPPUNIT_ASSERT_EQUAL( std::string("123456789"), element.content() ); } @@ -51,7 +51,7 @@ XmlElementTest::testNumericContentConstructor() void XmlElementTest::testSetName() { - CppUnit::XmlElement element( "aName" ); + CPPUNIT_NS::XmlElement element( "aName" ); element.setName( "anotherName" ); CPPUNIT_ASSERT_EQUAL( std::string("anotherName"), element.name() ); } @@ -60,7 +60,7 @@ XmlElementTest::testSetName() void XmlElementTest::testSetStringContent() { - CppUnit::XmlElement element( "aName", "someContent" ); + CPPUNIT_NS::XmlElement element( "aName", "someContent" ); element.setContent( "other" ); CPPUNIT_ASSERT_EQUAL( std::string("other"), element.content() ); } @@ -69,7 +69,7 @@ XmlElementTest::testSetStringContent() void XmlElementTest::testSetNumericContent() { - CppUnit::XmlElement element( "aName", "someContent" ); + CPPUNIT_NS::XmlElement element( "aName", "someContent" ); element.setContent( 87654321 ); CPPUNIT_ASSERT_EQUAL( std::string("87654321"), element.content() ); } @@ -78,11 +78,11 @@ XmlElementTest::testSetNumericContent() void XmlElementTest::testElementCount() { - CppUnit::XmlElement node( "element", "content" ); + CPPUNIT_NS::XmlElement node( "element", "content" ); CPPUNIT_ASSERT_EQUAL( 0, node.elementCount() ); - node.addElement( new CppUnit::XmlElement( "child1" ) ); - node.addElement( new CppUnit::XmlElement( "child2" ) ); + node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) ); + node.addElement( new CPPUNIT_NS::XmlElement( "child2" ) ); CPPUNIT_ASSERT_EQUAL( 2, node.elementCount() ); } @@ -90,7 +90,7 @@ XmlElementTest::testElementCount() void XmlElementTest::testElementAtNegativeIndexThrow() { - CppUnit::XmlElement node( "element" ); + CPPUNIT_NS::XmlElement node( "element" ); node.elementAt( -1 ); } @@ -98,7 +98,7 @@ XmlElementTest::testElementAtNegativeIndexThrow() void XmlElementTest::testElementAtTooLargeIndexThrow() { - CppUnit::XmlElement node( "element" ); + CPPUNIT_NS::XmlElement node( "element" ); node.elementAt( 0 ); } @@ -106,9 +106,9 @@ XmlElementTest::testElementAtTooLargeIndexThrow() void XmlElementTest::testElementAt() { - CppUnit::XmlElement node( "element" ); - CppUnit::XmlElement *element1 = new CppUnit::XmlElement( "element1" ); - CppUnit::XmlElement *element2 = new CppUnit::XmlElement( "element2" ); + CPPUNIT_NS::XmlElement node( "element" ); + CPPUNIT_NS::XmlElement *element1 = new CPPUNIT_NS::XmlElement( "element1" ); + CPPUNIT_NS::XmlElement *element2 = new CPPUNIT_NS::XmlElement( "element2" ); node.addElement( element1 ); node.addElement( element2 ); @@ -120,8 +120,8 @@ XmlElementTest::testElementAt() void XmlElementTest::testElementForThrow() { - CppUnit::XmlElement node( "element" ); - node.addElement( new CppUnit::XmlElement( "element1" ) ); + CPPUNIT_NS::XmlElement node( "element" ); + node.addElement( new CPPUNIT_NS::XmlElement( "element1" ) ); node.elementFor( "name2" ); } @@ -129,9 +129,9 @@ XmlElementTest::testElementForThrow() void XmlElementTest::testElementFor() { - CppUnit::XmlElement node( "element" ); - CppUnit::XmlElement *element1 = new CppUnit::XmlElement( "element1" ); - CppUnit::XmlElement *element2 = new CppUnit::XmlElement( "element2" ); + CPPUNIT_NS::XmlElement node( "element" ); + CPPUNIT_NS::XmlElement *element1 = new CPPUNIT_NS::XmlElement( "element1" ); + CPPUNIT_NS::XmlElement *element2 = new CPPUNIT_NS::XmlElement( "element2" ); node.addElement( element1 ); node.addElement( element2 ); @@ -143,7 +143,7 @@ XmlElementTest::testElementFor() void XmlElementTest::testEmptyNodeToString() { - CppUnit::XmlElement node( "element" ); + CPPUNIT_NS::XmlElement node( "element" ); std::string expectedXml = ""; CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); } @@ -152,7 +152,7 @@ XmlElementTest::testEmptyNodeToString() void XmlElementTest::testElementWithAttributesToString() { - CppUnit::XmlElement node( "element" ); + CPPUNIT_NS::XmlElement node( "element" ); node.addAttribute( "id", 17 ); node.addAttribute( "date-format", "iso-8901" ); std::string expectedXml = "\"'" ); std::string expectedXml = "" ); + CPPUNIT_NS::XmlElement node( "element", "ChessTest" ); std::string expectedXml = "" "ChessTest<class Chess>" ""; @@ -188,9 +188,9 @@ XmlElementTest::testElementToStringEscapeContent() void XmlElementTest::testElementWithChildrenToString() { - CppUnit::XmlElement node( "element" ); - node.addElement( new CppUnit::XmlElement( "child1" ) ); - node.addElement( new CppUnit::XmlElement( "child2" ) ); + CPPUNIT_NS::XmlElement node( "element" ); + node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) ); + node.addElement( new CPPUNIT_NS::XmlElement( "child2" ) ); std::string expectedXml = "" ""; CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); @@ -200,7 +200,7 @@ XmlElementTest::testElementWithChildrenToString() void XmlElementTest::testElementWithContentToString() { - CppUnit::XmlElement node( "element", "content\nline2" ); + CPPUNIT_NS::XmlElement node( "element", "content\nline2" ); std::string expectedXml = "content\nline2"; CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); } @@ -209,7 +209,7 @@ XmlElementTest::testElementWithContentToString() void XmlElementTest::testElementWithNumericContentToString() { - CppUnit::XmlElement node( "element", 123456789 ); + CPPUNIT_NS::XmlElement node( "element", 123456789 ); std::string expectedXml = "123456789"; CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); } @@ -218,8 +218,8 @@ XmlElementTest::testElementWithNumericContentToString() void XmlElementTest::testElementWithContentAndChildToString() { - CppUnit::XmlElement node( "element", "content" ); - node.addElement( new CppUnit::XmlElement( "child1" ) ); + CPPUNIT_NS::XmlElement node( "element", "content" ); + node.addElement( new CPPUNIT_NS::XmlElement( "child1" ) ); std::string expectedXml = "content"; CPPUNITTEST_ASSERT_XML_EQUAL( expectedXml, node.toString() ); } -- cgit v1.2.1