1 files changed, 13 insertions, 15 deletions
diff --git a/examples/cppunittest/ExceptionTest.cpp b/examples/cppunittest/ExceptionTest.cpp
index ae4948c..ab60eed 100644
--- a/examples/cppunittest/ExceptionTest.cpp
+++ b/examples/cppunittest/ExceptionTest.cpp
@@ -35,14 +35,12 @@ void
 ExceptionTest::testConstructor()
 {
   const std::string message( "a message" );
-  const int lineNumber = 17;
-  const std::string fileName( "dir/afile.cpp" );
+  const CppUnit::SourceLine sourceLine( "dir/afile.cpp", 17 );
   
-  CppUnit::Exception e( message, lineNumber, fileName  );
+  CppUnit::Exception e( message, sourceLine );
 
   CPPUNIT_ASSERT_EQUAL( message, std::string( e.what() ) );
-  CPPUNIT_ASSERT_EQUAL( lineNumber, int(e.lineNumber()) );
-  CPPUNIT_ASSERT_EQUAL( fileName, e.fileName() );
+  CPPUNIT_ASSERT( sourceLine == e.sourceLine() );
 }
 
 
@@ -52,17 +50,15 @@ ExceptionTest::testDefaultConstructor()
   CppUnit::Exception e;
 
   CPPUNIT_ASSERT_EQUAL( std::string(""), std::string( e.what() ) );
-  CPPUNIT_ASSERT_EQUAL( CppUnit::Exception::UNKNOWNLINENUMBER, 
-                        e.lineNumber() );
-  CPPUNIT_ASSERT_EQUAL( CppUnit::Exception::UNKNOWNFILENAME, 
-                        e.fileName() );
+  CPPUNIT_ASSERT( !e.sourceLine().isValid() );
 }
 
 
 void 
 ExceptionTest::testCopyConstructor()
 {
-  CppUnit::Exception e( "message", 17, "fileName.cpp"  );
+  CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
+  CppUnit::Exception e( "message", sourceLine  );
   CppUnit::Exception other( e );
   checkIsSame( e, other );
 }
@@ -71,7 +67,8 @@ ExceptionTest::testCopyConstructor()
 void 
 ExceptionTest::testAssignment()
 {
-  CppUnit::Exception e( "message", 17, "fileName.cpp"  );
+  CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
+  CppUnit::Exception e( "message", sourceLine  );
   CppUnit::Exception other;
   other = e;
   checkIsSame( e, other );
@@ -81,7 +78,8 @@ ExceptionTest::testAssignment()
 void 
 ExceptionTest::testClone()
 {
-  CppUnit::Exception e( "message", 17, "fileName.cpp"  );
+  CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
+  CppUnit::Exception e( "message", sourceLine  );
   std::auto_ptr<CppUnit::Exception> other( e.clone() );
   checkIsSame( e, *other.get() );
 }
@@ -90,7 +88,8 @@ ExceptionTest::testClone()
 void 
 ExceptionTest::testIsInstanceOf()
 {
-  CppUnit::Exception e( "message", 17, "fileName.cpp"  );
+  CppUnit::SourceLine sourceLine( "fileName.cpp", 123 );
+  CppUnit::Exception e( "message", sourceLine  );
   CPPUNIT_ASSERT( e.isInstanceOf( CppUnit::Exception::type() ) );
   CPPUNIT_ASSERT( !e.isInstanceOf( CppUnit::NotEqualException::type() ) );
 }
@@ -103,6 +102,5 @@ ExceptionTest::checkIsSame( CppUnit::Exception &e,
   std::string eWhat( e.what() );
   std::string otherWhat( other.what() );
   CPPUNIT_ASSERT_EQUAL( eWhat, otherWhat );
-  CPPUNIT_ASSERT_EQUAL( e.lineNumber(), other.lineNumber() );
-  CPPUNIT_ASSERT_EQUAL( e.fileName(), other.fileName() );
+  CPPUNIT_ASSERT( e.sourceLine() == other.sourceLine() );
 }