--- a/searchengine/cpix/tsrc/cpixunittest/src/asynctests.cpp Tue Oct 05 13:15:12 2010 +0530
+++ b/searchengine/cpix/tsrc/cpixunittest/src/asynctests.cpp Fri Oct 15 12:09:28 2010 +0530
@@ -1223,8 +1223,6 @@
void testSingleThreadIdx(Itk::TestMgr * testMgr)
{
- char *xml_file = (char*)__FUNCTION__;
- assert_failed = 0;
testMgr_ = testMgr;
// cpix_setLogLevel(CPIX_LL_DEBUG);
@@ -1254,12 +1252,7 @@
ITK_EXPECT(testMgr,
result == 0,
"Could not join indexer thread");
- if(result != 0)
- {
- assert_failed = 1;
- }
- testResultXml(xml_file);
- // cpix_setLogLevel(CPIX_LL_TRACE);
+
printStatistics();
}
@@ -1268,8 +1261,6 @@
void testSingleThreadQry(Itk::TestMgr * testMgr)
{
- char *xml_file = (char*)__FUNCTION__;
- assert_failed = 0;
testMgr_ = testMgr;
// cpix_setLogLevel(CPIX_LL_DEBUG);
@@ -1299,22 +1290,15 @@
ITK_EXPECT(testMgr,
result == 0,
"Could not join searcher thread");
- if(result != 0)
- {
- assert_failed = 1;
- }
- testResultXml(xml_file);
- // cpix_setLogLevel(CPIX_LL_TRACE);
- printStatistics();
+
+ // cpix_setLogL printStatistics();
}
void testMultiThreads(Itk::TestMgr * testMgr)
{
- char *xml_file = (char*)__FUNCTION__;
- assert_failed = 0;
cleanup();
setup();
@@ -1370,10 +1354,7 @@
ITK_EXPECT(testMgr,
result == 0,
"Could not join indexer thread");
- if(result != 0)
- {
- assert_failed = 1;
- }
+
result = pthread_join(searcherThreadHndl,
&rv);
@@ -1381,14 +1362,11 @@
ITK_EXPECT(testMgr,
result == 0,
"Could not join searcher thread");
- if(result != 0)
- {
- assert_failed = 1;
- }
- testResultXml(xml_file);
+
+
// cpix_setLogLevel(CPIX_LL_TRACE);
- printStatistics();
+
}
@@ -1564,7 +1542,7 @@
}
catch (...)
{
- assert_failed = 1;
+
ITK_EXPECT(testMgr_,
false,
"INDEXER: Failed indexing\n");
@@ -1639,7 +1617,7 @@
}
catch (...)
{
- assert_failed = 1;
+
ITK_EXPECT(testMgr_,
false,
"SEARCHER: Failed searching\n");