searchengine/cpix/tsrc/cpixunittest/src/geotests.cpp
changeset 3 ae3f1779f6da
parent 0 671dee74050a
child 24 65456528cac2
--- a/searchengine/cpix/tsrc/cpixunittest/src/geotests.cpp	Fri May 14 16:57:37 2010 +0300
+++ b/searchengine/cpix/tsrc/cpixunittest/src/geotests.cpp	Thu May 27 13:59:44 2010 +0300
@@ -33,6 +33,7 @@
 #include "testutils.h"
 #include "setupsentry.h"
 
+#include "std_log_result.h"
 
 #define VATTUNIEMENRANTA_2_GPS L"60.154023,24.887724"
 
@@ -282,15 +283,20 @@
 
     void testHarvestJpg(Itk::TestMgr * testMgr)
     {
+        char *xml_file = (char *)__FUNCTION__;
+        assert_failed = 0;
         testMgr_ = testMgr;
         Cpt::traverse(JPG_TEST_CORPUS_PATH,
                       this);
         util_->flush();
+        testResultXml(xml_file);
     }
 
 
     void testSearchJpg(Itk::TestMgr * testMgr)
     {
+        char *xml_file = (char *)__FUNCTION__;
+        assert_failed = 0;
         testMgr_ = testMgr;
 
         cpix_Hits
@@ -301,6 +307,7 @@
                             10);
 
         cpix_Hits_destroy(hits);
+        testResultXml(xml_file);
     }
 
 private:
@@ -430,6 +437,10 @@
                    cpix_Succeeded(queryParser_),
                    "Failed to parse: %S\n",
                    qryStr);
+        if(!cpix_Succeeded(queryParser_))
+            {
+                assert_failed = 1;
+            }
         
         cpix_Hits
             * hits = cpix_IdxDb_search(util_->idxDb(),
@@ -437,6 +448,10 @@
         ITK_ASSERT(testMgr_,
                    cpix_Succeeded(util_->idxDb()),
                    "Failed to search (geo)");
+        if(!cpix_Succeeded(util_->idxDb()))
+            {
+                assert_failed = 1;
+            }
         
         int32_t
             hitCount = cpix_Hits_length(hits);