[Mockpp-commits] mockpp/mockpp/tests NoException_test.cpp,1.4,1.5

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28774/mockpp/tests

Modified Files:
	NoException_test.cpp 
Log Message:
catch failure

Index: NoException_test.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/tests/NoException_test.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- NoException_test.cpp	23 Dec 2005 22:03:30 -0000	1.4
+++ NoException_test.cpp	24 Dec 2005 01:38:39 -0000	1.5
@@ -94,7 +94,9 @@
 #endif // frameworks
 
 
-mockpp::String bad_data;
+mockpp::String bad_data1;
+mockpp::String bad_data2;
+mockpp::String bad_data3;
 
 
 struct MyStruct {
@@ -118,24 +120,21 @@
 template <class T>
 void storeMalfunctionData(const T & /* dummy */)
 {
-  std::cout << "dummy\n";
-  bad_data = MOCKPP_PCHAR("unknown exception occured");
+  bad_data1 = MOCKPP_PCHAR("unknown exception occured");
 }
 
 
 template <>
 void storeMalfunctionData(const MyStruct &e)
 {
-  std::cout << "mystruct\n";
-  bad_data = MOCKPP_PCHAR("MyStruct");
+  bad_data2 = MOCKPP_PCHAR("MyStruct");
 }
 
 
 template <>
 void storeMalfunctionData(const mockpp::AssertionFailedError &e)
 {
-  std::cout << mockpp::getLatin1(e.getMessage()).c_str() << std::endl;
-  bad_data = e.getMessage();
+  bad_data3 = e.getMessage();
 }
 
 
@@ -156,11 +155,9 @@
   mockpp::ThrowableItem it;
   it.take(MyStruct());
   it.get()->throw_me();
-  MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("MyStruct")));
 
   it.take(OtherStruct());
   it.get()->throw_me();
-  MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("unknown exception occured")));
 
   mockpp::ExpectationValue<MyStruct> ec (MOCKPP_PCHAR("verifyValue"), 0);
   ec.setExpected(MyStruct(3));
@@ -168,7 +165,11 @@
 
   mockpp::setAssertionFailedForwarder(0);
 
-  MOCKPP_ASSERT_EQUALS(bad_data, mockpp::String(MOCKPP_PCHAR("unknown exception occured")));
+  std::cout <<  mockpp::getLatin1(bad_data3).c_str() << std::endl;
+
+  MOCKPP_ASSERT_EQUALS(bad_data1, mockpp::String(MOCKPP_PCHAR("unknown exception occured")));
+  MOCKPP_ASSERT_EQUALS(bad_data2, mockpp::String(MOCKPP_PCHAR("MyStruct")));
+  MOCKPP_ASSERT_TRUE(bad_data3.find(mockpp::String(MOCKPP_PCHAR("did not receive the expected value"))) != mockpp::String::npos);
 }