diff -r ae3f1779f6da -r a5fbfefd615f searchengine/cpix/tsrc/cpixunittest/src/analysis.cpp --- a/searchengine/cpix/tsrc/cpixunittest/src/analysis.cpp Thu May 27 13:59:44 2010 +0300 +++ b/searchengine/cpix/tsrc/cpixunittest/src/analysis.cpp Fri Jun 11 14:43:47 2010 +0300 @@ -31,6 +31,7 @@ #include "cpixdoc.h" #include "std_log_result.h" + const char * AnalysisTestDocsToIndex[5] = { FILE_TEST_CORPUS_PATH "\\en\\1.txt", FILE_TEST_CORPUS_PATH "\\en\\2.txt", @@ -83,14 +84,14 @@ // bad syntaxes TestAnalyzerParsing(testMgr, L"letter>>lowercase", 0 ); TestAnalyzerParsing(testMgr, L">letter>>lowercase lowercase", 0 ); TestAnalyzerParsing(testMgr, L"letter lowercase", 0 ); testResultXml(xml_file); } - void TestSwitchParsing(Itk::TestMgr * testMgr) { char *xml_file = (char*)__FUNCTION__; @@ -105,14 +106,13 @@ TestAnalyzerParsing(testMgr, L"switch{ case '_qnr': whitespace; default: standard; }>lowercase"); TestAnalyzerParsing(testMgr, L"switch{ default: standard; }"); TestAnalyzerParsing(testMgr, L"switch{ case '_qnr': switch{ case '_docuid': keyword; default: whitespace; }; default: standard; }"); + TestAnalyzerParsing(testMgr, L"switch{ case '_mimetype': standard; default: whitespace; }; default: standard; }"); testResultXml(xml_file); } void TestAnalyzerUsage(Itk::TestMgr * testMgr, const wchar_t* definition) { printf("Indexing and searching with %S\n", definition); - char *xml_file = (char*)__FUNCTION__; - assert_failed = 0; cpix_Result result; @@ -205,7 +205,7 @@ } cpix_QueryParser_destroy(queryParser); cpix_Analyzer_destroy( analyzer ); - testResultXml(xml_file); + } void TestAnalyzersUsage(Itk::TestMgr * testMgr)