diff -r 6c1a2771f4b7 -r ae3f1779f6da searchengine/cpix/tsrc/cpixunittest/src/prematureqrytests.cpp --- a/searchengine/cpix/tsrc/cpixunittest/src/prematureqrytests.cpp Fri May 14 16:57:37 2010 +0300 +++ b/searchengine/cpix/tsrc/cpixunittest/src/prematureqrytests.cpp Thu May 27 13:59:44 2010 +0300 @@ -19,6 +19,7 @@ #include "config.h" #include "itk.h" #include "setupsentry.h" +#include "std_log_result.h" #include @@ -168,16 +169,21 @@ // void testBeforeVolDefs(Itk::TestMgr * mgr) { + char *xml_file = (char*)__FUNCTION__; + assert_failed = 0; printf("Before volume definitions\n"); qry(mgr, false); + testResultXml(xml_file); } void testBeforeContentDefs(Itk::TestMgr * mgr) { printf("Defining volumes\n"); + char *xml_file = (char*)__FUNCTION__; + assert_failed = 0; cpix_Result result; @@ -200,13 +206,15 @@ qry(mgr, true); + testResultXml(xml_file); } void testReady(Itk::TestMgr * mgr) { printf("Defining contents\n"); - + char *xml_file = (char*)__FUNCTION__; + assert_failed = 0; const MVFTest * mvfTest = FilesAndVols; @@ -234,6 +242,7 @@ qry(mgr, true); + testResultXml(xml_file); } @@ -304,6 +313,7 @@ "Querying idx should %s have succeeded and it did %s", shouldSucceed ? "" : "not", succeeded ? "" : "not"); + assert_failed = 1; } @@ -353,6 +363,7 @@ "Querying searcher should %s have succeeded and it did %s", shouldSucceed ? "" : "not", succeeded ? "" : "not"); + assert_failed = 1; }