diff -r d4d56f5e7c55 -r 65456528cac2 searchengine/cpix/tsrc/cpixunittest/src/terms.cpp --- a/searchengine/cpix/tsrc/cpixunittest/src/terms.cpp Tue Oct 05 13:15:12 2010 +0530 +++ b/searchengine/cpix/tsrc/cpixunittest/src/terms.cpp Fri Oct 15 12:09:28 2010 +0530 @@ -74,7 +74,7 @@ "Could not get rid of all test qbac-idx pairs"); if(!cpix_Succeeded(&result)) { - assert_failed = 1; + } std::auto_ptr util( new FileIdxUtil ); @@ -85,7 +85,7 @@ if ( cpix_Failed( &result) ) ITK_PANIC("Analyzer could not be created"); if(!cpix_Succeeded(&result)) { - assert_failed = 1; + } for (int i = 0; TermTestDocsToIndex[i]; i++) @@ -109,7 +109,7 @@ if (queryParser == NULL) { cpix_Analyzer_destroy( analyzer ); - assert_failed = 1; + ITK_PANIC("Could not create query parser"); } @@ -125,7 +125,7 @@ if (cpix_Failed(queryParser) || query == NULL) { - assert_failed = 1; + cpix_Analyzer_destroy(analyzer); cpix_ClearError(queryParser); cpix_QueryParser_destroy(queryParser); @@ -160,7 +160,7 @@ if (queryParser_ == NULL) { - assert_failed = 1; + ITK_PANIC("Could not create query parser"); } @@ -174,7 +174,7 @@ if (cpix_Failed(queryParser_) || query == NULL) { - assert_failed = 1; + cpix_Analyzer_destroy(analyzer); cpix_ClearError(queryParser_); cpix_QueryParser_destroy(queryParser_); @@ -205,26 +205,20 @@ void TestAllTermSearch(Itk::TestMgr * testMgr) { - char *xml_file = (char*)__FUNCTION__; - assert_failed = 0; TestAppclassFilteredTermSearch(testMgr, 0); - testResultXml(xml_file); + } void TestMp3TermSearch(Itk::TestMgr * testMgr) { - char *xml_file = (char*)__FUNCTION__; - assert_failed = 0; TestAppclassFilteredTermSearch(testMgr, LMP3APPCLASS); - testResultXml(xml_file); + } void TestTextTermSearch(Itk::TestMgr * testMgr) { - char *xml_file = (char*)__FUNCTION__; - assert_failed = 0; TestAppclassFilteredTermSearch(testMgr, LTEXTAPPCLASS); - testResultXml(xml_file); + } Itk::TesterBase * CreateTermSearchTests()