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

equal deleted inserted replaced

-:d4d56f5e7c55
+:65456528cac2
 cpix_IdxSearcher_releaseDb(searcher_);
 searcher_ = NULL;
 }
 void testWritingWhenHitIterating(Itk::TestMgr* testMgr) {
-char *xml_file = (char *)__FUNCTION__;
-assert_failed = 0;
 testWritingWhenHitIterating(testMgr,
 idxUtil_->idxDb(),
 &cpix_IdxDb_search,
 3);
-testResultXml(xml_file);
 }
 void testWritingWhenHitIterating2(Itk::TestMgr* testMgr) {
-char *xml_file = (char *)__FUNCTION__;
-assert_failed = 0;
 testWritingWhenHitIterating(testMgr,
 searcher(testMgr),
 &cpix_IdxSearcher_search,
 3);
-testResultXml(xml_file);
 }
 void testInvalidation(Itk::TestMgr* testMgr)
 {
-char *xml_file = (char *)__FUNCTION__;
-assert_failed = 0;
 for (int i = 0; i < 25; i++)
 {
 idxUtil_->indexSms( i,
 testCorpus_.item(i).c_str(),
 analyzer_,
 cpix_IdxDb_search(idxUtil_->idxDb(), query );
 if ( cpix_Failed( idxUtil_->idxDb() ) ) {
 cpix_Query_destroy( query );
 ITK_PANIC( "Search failed" );
-assert_failed = 1;
 }
 printf("Accessing hits before closing... ");
 cpix_Hits_length( hits );
 ITK_ASSERT( testMgr, cpix_Succeeded( hits  ), "Accessing hit length failed" );
 }
 cpix_IdxDb_flush(idxUtil_->idxDb());
 ITK_EXPECT(testMgr,
 cpix_Succeeded(idxUtil_->idxDb()),
 "Flushing failed");
-if(cpix_Succeeded(idxUtil_->idxDb()))
-{
-assert_failed = 1;
-}
 cpix_IdxSearcher_releaseDb(searcher_);
 searcher_ = NULL;
 idxUtil_->close();
 printf("Accessing hits after closing... \n");
 cpix_Document
 **doc;
 ALLOC_DOC(doc, 1);
-printf("doc #0: ");
+printf("doc #0: \n");
 cpix_Hits_doc(hits,
 0,
 doc,
 1);
 if (doc[0]->ptr_ != NULL) {
 }
 FREE_DOC(doc, 1);
 ALLOC_DOC(doc, 1)
-printf("\ndoc #20: ");
+printf("doc #20: ");
 cpix_Hits_doc(hits,
 20,
 doc,
 1);
 if (doc[0]->ptr_ != NULL) {
 ITK_EXPECT( testMgr,
 cpix_Failed( hits ),
 "Accessing hit(20) should NOT succeeded for closed database (hits still holds a reference to its originator)." );
-if (cpix_Failed(hits))
-{
-wchar_t
-buf[256];
-cpix_Error_report(hits->err_,
-buf,
-sizeof(buf) / sizeof(wchar_t));
-printf("%S\n", buf);
-cpix_ClearError(hits);
-assert_failed = 1;
-}
 }
+if (cpix_Failed(hits))
+{
+wchar_t
+buf[256];
+cpix_Error_report(hits->err_,
+buf,
+sizeof(buf) / sizeof(wchar_t));
+printf("%S\n", buf);
+cpix_ClearError(hits);
+}
 FREE_DOC(doc, 1)
-testResultXml(xml_file);
 cpix_Hits_destroy( hits );
 cpix_Query_destroy( query );
 }
 * which occurs e.g. if we provide bad schema and the idxdb will react
 * by throwing an exception.
 */
 void testStackunwinding(Itk::TestMgr* testMgr)
 {
-char *xml_file = (char *)__FUNCTION__;
-assert_failed = 0;
 SchemaId wrongSchema = idxUtil_->schemaId();
 cpix_Result
 result;
 delete idxUtil_;
 // Open index without redefining schema
 if (cpix_Failed(&result))
 {
 ITK_PANIC("Index could not be opened");
-assert_failed = 1;
 }
 // Try to index things
 for (int i = 0; i < 5; i++)
 {
 succeeded = cpix_Succeeded(idxDb);
 ITK_ASSERT( testMgr, !succeeded, "Schema is persistent?" );
 }
-testResultXml(xml_file);
 cpix_IdxDb_releaseDb(idxDb);
 idxDb = NULL;
 idxUtil_ = new SmsIdxUtil;
 idxUtil_->init( true );
 {
 wprintf(L"Testing writing to index, while hit object is continuosly read.\n");
 // Index
 for (int i = 0; i < 25; i++) {
 idxUtil_->indexSms( i,
 testCorpus_.item(i).c_str(),
 analyzer_,
 testMgr,
 false );
 printf("1 item indexed. \n");
 cpix_Hits_length( hits );
 ITK_EXPECT( testMgr, cpix_Succeeded( hits  ), "Accessing hit of index 1 failed" );
-					if(!cpix_Succeeded( hits  ))
-					    {
-assert_failed = 1;
-					    }
 printf("Hits after adding 1 item.\n");
 idxUtil_->printHits( hits, testMgr );
 cpix_IdxDb_deleteDocuments(idxUtil_->idxDb(), GetItemId( 15 ).c_str() );
 ITK_EXPECT( testMgr, cpix_Succeeded( idxUtil_->idxDb() ), "Deleting document 15 failed" );
-					if(!cpix_Succeeded( idxUtil_->idxDb() ))
-	                       {
-	                        assert_failed = 1;
-	                        }
 printf("Line 16 deleted.\n");
 printf("Hits after deletion: \n");
 idxUtil_->printHits( hits, testMgr );
 cpix_IdxDb_flush(idxUtil_->idxDb() );
 ITK_EXPECT( testMgr, cpix_Succeeded( idxUtil_->idxDb() ), "Flushing failed" );
 printf("Flushed.\n");
-if(!cpix_Succeeded( idxUtil_->idxDb() ))
-{
-assert_failed = 1;
-}
 printf("Hits after flush:\n");
 idxUtil_->printHits( hits, testMgr, true );
 cpix_IdxDb_deleteDocuments(idxUtil_->idxDb(), GetItemId( 14 ).c_str() );
 ITK_EXPECT( testMgr, cpix_Succeeded( idxUtil_->idxDb() ), "Deleting document 14 failed" );
-if(!cpix_Succeeded( idxUtil_->idxDb() ))
-{
-assert_failed = 1;
-}
 printf("Line 15 deleted.\n");
 printf("Hits after deletion:\n");
 idxUtil_->printHits( hits, testMgr );
 cpix_IdxDb_deleteDocuments(idxUtil_->idxDb(), GetItemId( 9 ).c_str() );
 ITK_EXPECT( testMgr, cpix_Succeeded( idxUtil_->idxDb() ), "Deleting document 9 failed" );
-if(!cpix_Succeeded( idxUtil_->idxDb() ))
-{
-assert_failed = 1;
-}
 printf("Line 10 deleted.\n");
 printf("Hits after deletion:\n");
 idxUtil_->printHits( hits, testMgr );
 cpix_IdxDb_flush(idxUtil_->idxDb() );
 ITK_EXPECT( testMgr, cpix_Succeeded( idxUtil_->idxDb() ), "Flushing failed" );
 printf("Flushed.\n");
-if(!cpix_Succeeded( idxUtil_->idxDb() ))
-{
-assert_failed = 1;
-}
 printf("Hits after flush:\n");
 idxUtil_->printHits( hits, testMgr, true );
 ITK_EXPECT( testMgr, cpix_Succeeded( hits  ), "Accessing hit length failed" );
 ITK_EXPECT( testMgr, length == 0, "The items were not deleted." );
 cpix_Hits_destroy( hits );
 }
 else
 {
 ITK_PANIC("Hits was null");
-assert_failed = 1;
 }
 cpix_Query_destroy( query );
 } else  {
 ITK_PANIC("Could not create query");
-assert_failed = 1;
 }
 }

changeset 24	65456528cac2
parent 14	8bd192d47aaa