|
From: <syn...@us...> - 2009-04-12 12:53:22
|
Revision: 2984
http://clucene.svn.sourceforge.net/clucene/?rev=2984&view=rev
Author: synhershko
Date: 2009-04-12 12:53:18 +0000 (Sun, 12 Apr 2009)
Log Message:
-----------
Tweaking CuAssertStrEquals
Modified Paths:
--------------
branches/lucene2_3_2/src/test/CuTest.cpp
branches/lucene2_3_2/src/test/CuTest.h
Modified: branches/lucene2_3_2/src/test/CuTest.cpp
===================================================================
--- branches/lucene2_3_2/src/test/CuTest.cpp 2009-04-08 11:32:26 UTC (rev 2983)
+++ branches/lucene2_3_2/src/test/CuTest.cpp 2009-04-12 12:53:18 UTC (rev 2984)
@@ -245,10 +245,13 @@
CuFail(tc, _T("assert failed"));
}
-void CuAssertStrEquals(CuTest* tc, const TCHAR* preMessage, const TCHAR* expected, const TCHAR* actual)
+void CuAssertStrEquals(CuTest* tc, const TCHAR* preMessage, const TCHAR* expected, const TCHAR* actual, bool bDelActual)
{
CuString* message;
- if (_tcscmp(expected, actual) == 0) return;
+ if (_tcscmp(expected, actual) == 0) {
+ if (bDelActual) _CLDELETE_LCARRAY(actual);
+ return;
+ }
message = CuStringNew();
if (preMessage) {
CuStringAppend(message, preMessage);
@@ -258,6 +261,7 @@
CuStringAppend(message, expected);
CuStringAppend(message, _T("\n<----\nbut saw\n---->\n"));
CuStringAppend(message, actual);
+ if (bDelActual) _CLDELETE_LCARRAY(actual);
CuStringAppend(message, _T("\n<----"));
CuFail(tc, message->buffer);
CuStringFree(message);
Modified: branches/lucene2_3_2/src/test/CuTest.h
===================================================================
--- branches/lucene2_3_2/src/test/CuTest.h 2009-04-08 11:32:26 UTC (rev 2983)
+++ branches/lucene2_3_2/src/test/CuTest.h 2009-04-12 12:53:18 UTC (rev 2984)
@@ -66,7 +66,7 @@
void CuNotImpl(CuTest* tc, const TCHAR* message);
void CuAssert(CuTest* tc, const TCHAR* message, int condition);
void CuAssertTrue(CuTest* tc, int condition);
-void CuAssertStrEquals(CuTest* tc, const TCHAR* preMessage, const TCHAR* expected, const TCHAR* actual);
+void CuAssertStrEquals(CuTest* tc, const TCHAR* preMessage, const TCHAR* expected, const TCHAR* actual, bool bDelActual = false);
void CuAssertIntEquals(CuTest* tc, const TCHAR* preMessage, int expected, int actual);
void CuAssertPtrEquals(CuTest* tc, const TCHAR* preMessage, const void* expected, const void* actual);
void CuAssertPtrNotNull(CuTest* tc, const TCHAR* preMessage, const void* pointer);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|