diff -r d4d56f5e7c55 -r 65456528cac2 searchengine/cpix/tsrc/cpixunittest/src/heartbeattests.cpp --- a/searchengine/cpix/tsrc/cpixunittest/src/heartbeattests.cpp Tue Oct 05 13:15:12 2010 +0530 +++ b/searchengine/cpix/tsrc/cpixunittest/src/heartbeattests.cpp Fri Oct 15 12:09:28 2010 +0530 @@ -142,8 +142,6 @@ void testCreateFileIdxDb(Itk::TestMgr * testMgr) { using namespace std; - char *xml_file = (char *)__FUNCTION__; - assert_failed = 0; doCommonJobs(testMgr, false); @@ -152,15 +150,10 @@ fiu->init(true); fileIdxUtil_ = fiu.release(); - testResultXml(xml_file); - } - - - void testCreateSmsIdxDb(Itk::TestMgr * testMgr) +} + void testCreateSmsIdxDb(Itk::TestMgr * testMgr) { using namespace std; - char *xml_file = (char *)__FUNCTION__; - assert_failed = 0; doCommonJobs(testMgr); @@ -169,14 +162,12 @@ siu->init(true); smsIdxUtil_ = siu.release(); - testResultXml(xml_file); + } void testAddSomeSms(Itk::TestMgr * testMgr) { - char *xml_file = (char *)__FUNCTION__; - assert_failed = 0; using namespace std; doCommonJobs(testMgr); @@ -195,7 +186,7 @@ "."); } } - testResultXml(xml_file); + } @@ -207,8 +198,6 @@ void testUseMultiSearcher(Itk::TestMgr * testMgr) { - char *xml_file = (char *)__FUNCTION__; - assert_failed = 0; doCommonJobs(testMgr); if (searcher_ == NULL) @@ -235,7 +224,7 @@ "Could not search with multisearcher"); if( !cpix_Succeeded(query_)) { - assert_failed = 1; + } if (hits != NULL) { @@ -244,27 +233,23 @@ cpix_Hits_destroy(hits); } - testResultXml(xml_file); + } void testAddSomeFile(Itk::TestMgr * testMgr) { - char *xml_file = (char *)__FUNCTION__; - assert_failed = 0; doCommonJobs(testMgr); fileIdxUtil_->indexFile(FILE_TEST_CORPUS_PATH "\\en\\1.txt", analyzer_, testMgr); - testResultXml(xml_file); + } void testReleaseAll(Itk::TestMgr * testMgr) { - char *xml_file = (char *)__FUNCTION__; - assert_failed = 0; doCommonJobs(testMgr); delete fileIdxUtil_; @@ -275,7 +260,7 @@ cpix_IdxSearcher_releaseDb(searcher_); searcher_ = NULL; - testResultXml(xml_file); + }