diff -r d4d56f5e7c55 -r 65456528cac2 searchengine/cpix/tsrc/cpixunittest/src/mapstests.cpp --- a/searchengine/cpix/tsrc/cpixunittest/src/mapstests.cpp Tue Oct 05 13:15:12 2010 +0530 +++ b/searchengine/cpix/tsrc/cpixunittest/src/mapstests.cpp Fri Oct 15 12:09:28 2010 +0530 @@ -212,8 +212,6 @@ void testLoadMaps(Itk::TestMgr * testMgr) { - char *xml_file = (char *)__FUNCTION__; - assert_failed = 0; cpix_Result result; @@ -222,10 +220,7 @@ ITK_ASSERT(testMgr, cpix_Succeeded(&result), "Could not reset qbac-path registry"); - if(!cpix_Succeeded(&result)) - { - assert_failed = 1; - } + const Volume *p = Volumes; @@ -240,10 +235,6 @@ cpix_Succeeded(&result), "Could not define volume '%s'", p->qbac_); - if(!cpix_Succeeded(&result)) - { - assert_failed = 1; - } } idxSearcher_ = cpix_IdxSearcher_openDb(&result, @@ -252,19 +243,13 @@ ITK_ASSERT(testMgr, cpix_Succeeded(&result), "Could not create searcher for 'root maps'"); - if(!cpix_Succeeded(&result)) - { - assert_failed = 1; - } - testResultXml(xml_file); + + } - void testSearchMaps(Itk::TestMgr * testMgr) { printf("Testing searching maps index\n"); - char *xml_file = (char *)__FUNCTION__; - assert_failed = 0; const wchar_t ** p = MapsSearchTerms; for (; *p != NULL; ++p) @@ -307,12 +292,12 @@ ITK_EXPECT(testMgr, false, "Failed to do address search"); - assert_failed = 1; + } cpix_Query_destroy(query); } - testResultXml(xml_file); + }