From fbd454f554f13680fe62b36fb7a5829f6dc0c396 Mon Sep 17 00:00:00 2001
From: Baptiste Lepilleur <gaiacrtn@free.fr>
Date: Fri, 5 Oct 2001 21:27:15 +0000
Subject: Include/cppunit/Asserter.

include/cppunit/Asserter.h :
* src/cppunit/Asserter.cpp : added. Helper to create assertion macros.

* src/cppunit/cppunit.dsp :
* src/cppunit/Makefile.am :
* include/cppunit/Makefile.am : added Asserter.h and Asserter.cpp.

* include/cppunit/Exception.h :
* src/cppunit/Exception.cpp : added constructor that take a
SourceLine argument. Deprecated static constant and old constructor.
Fixed some constness issues.

* examples/cppunittest/ExceptionTest.cpp : Refactored.

* NEWS : partially updated (need to be more detailed)

* include/cppunit/NotEqualException.h :
* src/cppunit/NotEqualException.cpp : added constructor that take a
SourceLine argument. Deprecated old constructor. Added a third element
to compose message.

* examples/cppunittest/NotEqualExceptionTest.cpp : moved to "Core"
suite. Added test for SourceLine() and additionalMessage().
Refactored.

* include/cppunit/SourceLine.h :
* src/cppunit/SourceLine.cpp : added. Result of applying
IntroduceParameterObject refactoring on filename & line number...

* include/cppunit/TestAssert.h :
* src/cppunit/TestAssert.cpp : deprecated old assert functions.
added functions assertEquals() and assertDoubleEquals() which use
SourceLine.

* src/cppunit/TestCase.cpp : Modified for SourceLine.

* include/cppunit/TestFailure.h :
* src/cppunit/TestFailure.cpp : added failedTestName(), and
sourceLine().

* src/msvc6/testrunner/TestRunnerDlg.cpp : modified to use SourceLine.

* include/cppunit/TextTestResult.h :
* src/cppunit/TextTestResult.cpp : corrected include order and
switched to angled brackets. Refactored. Don't print failure location
if not available. Not equal failure dump additional message if
available.

* src/cppunit/TextTestRunner.cpp : run() now returns a boolean to
indicate if the run was sucessful.

* src/cppunit/XmlTestResultOutputter.cpp : replaced itoa() with
OStringStream. Refactored.

* examples/cppunittest/XmlUniformiser.h :
* examples/cppunittest/XmlUniformiser.cpp :
CPPUNITTEST_ASSERT_XML_EQUAL capture failure location. Refactored
checkXmlEqual().

* examples/cppunittest/XmlUniformiserTest.h :
* examples/cppunittest/XmlUniformiserTest.cpp : added test for
CPPUNITTEST_ASSERT_XML_EQUAL.

* include/cppunit/XmlTestResultOutputter.h :
* src/cppunit/XmlTestResultOutputter.cpp : updated to use SourceLine.
---
 examples/cppunittest/NotEqualExceptionTest.cpp | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'examples/cppunittest/NotEqualExceptionTest.cpp')

diff --git a/examples/cppunittest/NotEqualExceptionTest.cpp b/examples/cppunittest/NotEqualExceptionTest.cpp
index 539e853..43522fb 100644
--- a/examples/cppunittest/NotEqualExceptionTest.cpp
+++ b/examples/cppunittest/NotEqualExceptionTest.cpp
@@ -1,8 +1,10 @@
+#include "CoreSuite.h"
 #include "NotEqualExceptionTest.h"
 #include <cppunit/NotEqualException.h>
 
 
-CPPUNIT_TEST_SUITE_REGISTRATION( NotEqualExceptionTest );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( NotEqualExceptionTest,
+                                       CppUnitTest::coreSuiteName() );
 
 
 NotEqualExceptionTest::NotEqualExceptionTest()
@@ -33,12 +35,18 @@ NotEqualExceptionTest::testConstructor()
 {
   std::string expectedValue( "expectedValue" );
   std::string actualValue( "actualValue" );
-  CppUnit::NotEqualException e( expectedValue, actualValue );
+  std::string message( "message" );
+  CppUnit::NotEqualException e( expectedValue, 
+                                actualValue, 
+                                CppUnit::SourceLine( "f.cpp", 123), 
+                                message );
 
   CPPUNIT_ASSERT_EQUAL( expectedValue, e.expectedValue() );
   CPPUNIT_ASSERT_EQUAL( actualValue, e.actualValue() );
+  CPPUNIT_ASSERT_EQUAL( message, e.additionalMessage() );
+  CPPUNIT_ASSERT( CppUnit::SourceLine( "f.cpp", 123) == e.sourceLine() );
 
-  std::string expectedMessage( "Expected: expectedValue, but was: actualValue" );
+  std::string expectedMessage( "Expected: expectedValue, but was: actualValue.message" );
   std::string actualMessage( e.what() );
   CPPUNIT_ASSERT_EQUAL( expectedMessage, actualMessage );
 }
@@ -47,7 +55,10 @@ NotEqualExceptionTest::testConstructor()
 void 
 NotEqualExceptionTest::testClone()
 {
-  CppUnit::NotEqualException e( "expectedValue", "actualValue" );
+  CppUnit::NotEqualException e( "expectedValue", 
+                                "actualValue", 
+                                CppUnit::SourceLine("file.cpp", 2),
+                                "add-message" );
   std::auto_ptr<CppUnit::NotEqualException> 
       other( (CppUnit::NotEqualException *)e.clone() );
   CPPUNIT_ASSERT_EQUAL( std::string( e.what() ),
@@ -67,7 +78,10 @@ NotEqualExceptionTest::testIsInstanceOf()
 void 
 NotEqualExceptionTest::testAssignment()
 {
-  CppUnit::NotEqualException e( "expectedValue", "actualValue" );
+  CppUnit::NotEqualException e( "expectedValue", 
+                                "actualValue", 
+                                CppUnit::SourceLine("file.cpp", 2),
+                                "add-message" );
   CppUnit::NotEqualException other( "", "" );
   other = e;
   CPPUNIT_ASSERT_EQUAL( std::string( e.what() ),
-- 
cgit v1.2.1