From: <phi...@us...> - 2007-12-29 21:59:54
|
Revision: 7430 http://armagetronad.svn.sourceforge.net/armagetronad/?rev=7430&view=rev Author: philippeqc Date: 2007-12-29 13:59:58 -0800 (Sat, 29 Dec 2007) Log Message: ----------- slowly getting closer to compiling the unittest Modified Paths: -------------- armagetronad/trunk/armagetronad/src/tools/unitTest/tPolynomialTest.cpp armagetronad/trunk/armagetronad/src/tools/unitTest/tToolUnitTest.cpp Added Paths: ----------- armagetronad/trunk/armagetronad/src/tools/unitTest/nMessageMock.cpp armagetronad/trunk/armagetronad/src/tools/unitTest/nMessageMock.h Added: armagetronad/trunk/armagetronad/src/tools/unitTest/nMessageMock.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/unitTest/nMessageMock.cpp (rev 0) +++ armagetronad/trunk/armagetronad/src/tools/unitTest/nMessageMock.cpp 2007-12-29 21:59:58 UTC (rev 7430) @@ -0,0 +1,19 @@ +#include "nMessageMock.h" + +nMessageMock::nMessageMock():out(in.rdbuf()) {} + +nMessageMock::~nMessageMock() {} + +nMessageMock& nMessageMock::operator<< (const float &x) { out << x; return *this; } +nMessageMock& nMessageMock::operator<< (const int &x) { out << x; return *this; } + +nMessageMock& nMessageMock::operator>> (float &x) { in >> x; return *this; } + +nMessageMock& nMessageMock::operator>> (int &x) { in >> x; return *this; } + +/* + nMessageMock& nMessageMock::operator<< (const unsigned short &x); + nMessageMock& nMessageMock::operator>> (unsigned short &x); +*/ + + Added: armagetronad/trunk/armagetronad/src/tools/unitTest/nMessageMock.h =================================================================== --- armagetronad/trunk/armagetronad/src/tools/unitTest/nMessageMock.h (rev 0) +++ armagetronad/trunk/armagetronad/src/tools/unitTest/nMessageMock.h 2007-12-29 21:59:58 UTC (rev 7430) @@ -0,0 +1,30 @@ +#include <iostream> +#include <sstream> +#include <ostream> + +#ifndef N_MESSAGE_MOCK +#define N_MESSAGE_MOCK + +class nMessageMock { +protected: + std::istringstream in; + // std::istringstream in(ios_base::in| std::ios_base::out); + std::ostream out; + +public: + nMessageMock(); + ~nMessageMock(); + + nMessageMock& operator<< (const float &x); + nMessageMock& operator>> (float &x); + + /* + nMessageMock& operator<< (const unsigned short &x); + nMessageMock& operator>> (unsigned short &x); + */ + + nMessageMock& operator<< (const int &x); + nMessageMock& operator>> (int &x); +}; + +#endif Modified: armagetronad/trunk/armagetronad/src/tools/unitTest/tPolynomialTest.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/unitTest/tPolynomialTest.cpp 2007-12-29 20:48:28 UTC (rev 7429) +++ armagetronad/trunk/armagetronad/src/tools/unitTest/tPolynomialTest.cpp 2007-12-29 21:59:58 UTC (rev 7430) @@ -1,18 +1,11 @@ -#include "nNetwork.h" +#include "nMessageMock.h" #include "tPolynomial.h" -#include <cppunit/ui/text/TestRunner.h> -#include <cppunit/TestRunner.h> -#include <cppunit/TestResult.h> -#include <cppunit/TestResultCollector.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/BriefTestProgressListener.h> #include <cppunit/extensions/TestFactoryRegistry.h> -#include <cppunit/extensions/HelperMacros.h> - -class tPolynomialTest : public CppUnit::TestFixture { +class tPolynomialTest : public CppUnit::TestFixture { private: - tPolynomial<nMessage> *tpEmpty, *tpOne, *tpZero, *tpTwo; + tPolynomial<nMessageMock> *tpEmpty, *tpOne, *tpZero, *tpTwo; public: CPPUNIT_TEST_SUITE( tPolynomialTest ); @@ -22,14 +15,15 @@ CPPUNIT_TEST_SUITE_REGISTRATION( tPolynomialTest ); - void setUp(void) { - tpEmpty = new tPolynomial<nMessage>(); - tpZero = new tPolynomial<nMessage>(0.0); - tpOne = new tPolynomial<nMessage>(1.0); - tpTwo = new tPolynomial<nMessage>(2.0); +public: + void setUp() { + tpEmpty = new tPolynomial<nMessageMock>(); + tpZero = new tPolynomial<nMessageMock>(0.0); + tpOne = new tPolynomial<nMessageMock>(1.0); + tpTwo = new tPolynomial<nMessageMock>(2.0); } - void tearDown(void) { + void tearDown() { delete tpEmpty; delete tpZero; delete tpOne; @@ -50,6 +44,7 @@ CPPUNIT_ASSERT( *tpOne == *tpZero + *tpOne ); // 2 = 1 + 1 CPPUNIT_ASSERT( *tpTwo == *tpOne + *tpOne ); - } + + }; Modified: armagetronad/trunk/armagetronad/src/tools/unitTest/tToolUnitTest.cpp =================================================================== --- armagetronad/trunk/armagetronad/src/tools/unitTest/tToolUnitTest.cpp 2007-12-29 20:48:28 UTC (rev 7429) +++ armagetronad/trunk/armagetronad/src/tools/unitTest/tToolUnitTest.cpp 2007-12-29 21:59:58 UTC (rev 7430) @@ -5,7 +5,6 @@ { CppUnit::TextUi::TestRunner runner; CppUnit::TestFactoryRegistry ®istry = CppUnit::TestFactoryRegistry::getRegistry(); - runner.addTest( registry.makeTest() ); bool wasSuccessful = runner.run( "", false ); return wasSuccessful; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |