FCL/sf/mw/searchsrv: comparison searchengine/cpix/tsrc/cpixunittest/src/randomtest.cpp

equal deleted inserted replaced

-:6c1a2771f4b7
+:ae3f1779f6da
 #include "randomtest.h"
 #include "CPixdoc.h"
 #include <sstream>
 #include <time.h>
+#include "std_log_result.h"
 using namespace std;
 using namespace Itk;
 SuiteTester* CreateSuiteTesterRandom()
 	{
 	// "all/random"
 	RandomTest * idxDbTest = new RandomTest;
 	ContextTester * random = new ContextTester("random", idxDbTest);
 	random->add( "AddingDeleting", idxDbTest,
-			    &RandomTest::testIndexAndDelete );
+			    &RandomTest::testIndexAndDelete,
+			    "AddingDeleting");
 	random->add( "AddingDeletingAll", idxDbTest,
-			    &RandomTest::testDeleteAll );
+			    &RandomTest::testDeleteAll,
+			    "AddingDeletingAll");
-	random->add( "AssertContent", idxDbTest, &RandomTest::testContent );
+	random->add( "AssertContent", idxDbTest,
+	            &RandomTest::testContent,
+	            "AssertContent");
 	random->add( "Persistence", idxDbTest,
-			     &RandomTest::testPersistence );
+			     &RandomTest::testPersistence,
+			     "Persistence");
-	random->add("Searches", idxDbTest, &RandomTest::testSearches );
+	random->add("Searches", idxDbTest,
-	random->add("CreatedIndex", idxDbTest, &RandomTest::testCreatedIndex );
+	        &RandomTest::testSearches,
+	        "Searches");
+	random->add("CreatedIndex", idxDbTest,
+	        &RandomTest::testCreatedIndex,
+	        "CreatedIndex");
 	return random;
 	}
 		{
 		ITK_ASSERT( testMgr,
 				    valid,
 				    "Removed item found" );
 		}
+	if(!valid)
+	    {
+assert_failed = 1;
+	    }
 	}
 void RandomTest::assertContent(Itk::TestMgr* testMgr, size_t item)
 {
 wstring content = testCorpus_.item(item);
 }
 }
 }
 if ( !found )
 {
+assert_failed = 1;
 ITK_MSG( testMgr, "Failed content %d", item );
 }
 // TODO should not assert here, because then
 // cpix_Hits instance leaks here. Use
 "Content check failed for %d" );
 }
 else
 {
+assert_failed = 1;
 ITK_MSG( testMgr, "Content asserting is unreliable for item not in index" );
 }
 cpix_Hits_destroy( hits );
 }
 cpix_Query_destroy( query );
 }
 else
 {
+assert_failed = 1;
 ITK_MSG( testMgr, "Creating query failed for %S", queryText.str().c_str() );
 }
 }
 void RandomTest::assertAllItemsState(Itk::TestMgr* testMgr)
 				matches == tracedTermsFreq_[i],
 				"Term %S frequence is %d. Expected %d",
 				tracedTerms_[i].c_str(),
 				matches,
 				tracedTermsFreq_[i] );
+		if(matches != tracedTermsFreq_[i])
+		    {
+assert_failed = 1;
+		    }
 		}
 	}
 void RandomTest::assertIndexedState(Itk::TestMgr* testMgr)
 	{
 	{
 ITK_REPORT(testMgr,
 "RandomSeed",
 "%d",
 randomSeed_);
+char *xml_file = (char*)__FUNCTION__;
+assert_failed = 0;
 	indexRandoms(testMgr, 50);
 	assertIndexedState(testMgr);
 	bool valid = true;
 	for (int i = 0; i < 5; i++)
 idxUtil_->flush();
 valid = valid && validState(testMgr,
 item);
 // OBS if ( !( valid &= validState( testMgr, item = indexRandom( testMgr ) ) ) )
 if (!valid)
-				{
+{
-				ITK_MSG( testMgr, "Indexing item %d had failed", item );
+assert_failed = 1;
-				goto mainloop_exit; // double break
+ITK_MSG( testMgr, "Indexing item %d had failed", item );
-				}
+goto mainloop_exit;
+// double break
+}
 			}
 		for (int i = 0; i < 10; i++)
 			{
 // OBS int item = -1;
 int
 valid = valid && validState(testMgr,
 item);
 // OBS if ( !( valid &= validState( testMgr, item = deleteRandom( testMgr ) ) ) )
 if (!valid)
 				{
+assert_failed = 1;
 				ITK_MSG( testMgr, "Deleting item %d had failed", item );
 				goto mainloop_exit; // double break
 				}
 			}
 		}
 	deleteRandoms(testMgr, 50);
 	mainloop_exit:
+	testResultXml(xml_file);
 	ITK_ASSERT( testMgr, valid, "Operations were not succesful" );
 	}
 void RandomTest::testDeleteAll(Itk::TestMgr* testMgr)
 	{
 	indexRandoms(testMgr, 50);
 	assertIndexedState(testMgr);
+	char *xml_file = (char*)__FUNCTION__;
+	assert_failed = 0;
 	vector<int> deleted;
 	for (int i = 0; i < 50; i++)
 		{
 		deleted.push_back( deleteRandom(testMgr) );
 		}
 		{
 // OBS if ( !( valid &= validState( testMgr, deleted[i] ) ) )
 	valid = valid && validState( testMgr, deleted[i] );
 if ( !( valid ) )
 			{
+assert_failed = 1;
 			ITK_MSG( testMgr, "Deleting item %d had failed", deleted[i] );
 			break;
 			}
 		}
+	testResultXml(xml_file);
 	ITK_ASSERT( testMgr, valid, "Deletes were not succesful" );
 	}
 void RandomTest::testContent(Itk::TestMgr* testMgr)
 	{
+char *xml_file = (char*)__FUNCTION__;
+assert_failed = 0;
 	for (int i = 0; i < 10; i++)
 		{
 		int item = indexRandom(testMgr);
 idxUtil_->flush();
 		assertContent(testMgr, item);
 		}
 	// clean  up
 	deleteRandoms( testMgr, 10 );
 idxUtil_->flush();
+testResultXml(xml_file);
 	}
 void RandomTest::testPersistence(Itk::TestMgr* testMgr)
 	{
 	indexRandoms(testMgr, 20);
 	assertIndexedState(testMgr);
+char *xml_file = (char*)__FUNCTION__;
+assert_failed = 0;
 	idxUtil_->reload();
 	assertIndexedState(testMgr);
 	vector<int> deleted;
 	for (int i = 0; i < 20; i++)
 		{
 // OBS if ( !( valid &= validState( testMgr, deleted[i] ) ) )
 valid = valid && validState( testMgr, deleted[i] );
 if ( !( valid ) )
 			{
+assert_failed = 1;
 			ITK_MSG( testMgr, "Deleting item %d had failed", deleted[i] );
 			break;
 			}
 		}
 	ITK_ASSERT( testMgr, valid, "Deletes were not succesful" );
+	testResultXml(xml_file);
 	}
 void RandomTest::testSearches(Itk::TestMgr* testMgr)
 {
+char *xml_file = (char*)__FUNCTION__;
+assert_failed = 0;
 	traceTerm(testMgr, L"happy");
 	traceTerm(testMgr, L"people");
 	traceTerm(testMgr, L"come");
 	traceTerm(testMgr, L"guy");
 	traceTerm(testMgr, L"done");
 	assertTracedTerms( testMgr );
 	deleteRandoms( testMgr, 20 );
 	assertTracedTerms( testMgr );
 	untraceTerms(testMgr);
+	testResultXml(xml_file);
 }
 void RandomTest::testCreatedIndex(Itk::TestMgr* testMgr) {
+char *xml_file = (char*)__FUNCTION__;
+assert_failed = 0;
 	int item = indexRandom( testMgr );
 idxUtil_->flush();
 	assertState( testMgr, item );
 	assertContent( testMgr, item );
 cpix_Succeeded(idxUtil_->idxDb()),
 "Trying to delete failed");
 ITK_EXPECT(testMgr,
 deleted == 0,
 "There should not have been an item to delete");
+if(!cpix_Succeeded(idxUtil_->idxDb()) || deleted != 0)
+{
+assert_failed = 1;
+}
+testResultXml(xml_file);
 }

changeset 3	ae3f1779f6da
parent 0	671dee74050a
child 14	8bd192d47aaa