FCL/sf/os/textandloc: comparison textrendering/texthandling/ttext/TRICHOOM.CPP

equal deleted inserted replaced

-:601ab138ba0b
+:a7c938434754
 /*
-* Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #include <txtrich.h>
 #include "TSTCLIPB.H"
 #include <txtstyle.h>
-#include <e32test.h>
 #include <gdi.h>
 #include <conpics.h>
 #include <flddef.h>
 #include <fldbltin.h>
 #include <s32mem.h>
 #include <s32file.h>
 #include "../incp/T_PMLPAR.H"
+#include "T_RICHOOM.h"
+#define test(cond)											\
+	{														\
+	TBool __bb = (cond);									\
+	TEST(__bb);												\
+	if (!__bb)												\
+		{													\
+		ERR_PRINTF1(_L("ERROR: Test Failed"));				\
+		User::Leave(1);										\
+		}													\
+	}
 const TInt KTestCleanupStack=0x500;
-GLDEF_C RTest test(_L("TRICHOOM"));
 LOCAL_D RFs theFs;
 LOCAL_D CParaFormatLayer* GlobalParaFormatLayer;
 LOCAL_D CCharFormatLayer* GlobalCharFormatLayer;
 LOCAL_D MPictureFactory* GlobalPictureFactory;
 LOCAL_D CTrapCleanup* TheTrapCleanup;
 LOCAL_D CParser* TheParser;
 LOCAL_D RFs TheSession;
-LOCAL_C CRichText* LoadIntoTextL(TFileName& aFileName)
+CRichText* CT_RICHOOM::LoadIntoTextL(TFileName& aFileName)
 //
 	{
 	TRAPD(ret,
 	TheParser=CParser::NewL());
 	CRichText* text=NULL;
 	TheParser=NULL;
 	return text;
 	}
-LOCAL_D void ConstructOOM()
+void CT_RICHOOM::ConstructOOM()
 // Test CRichText construction, (and index), forcing a leave error at each
 // possible stage of the process.
 //
 	{
-	test.Start(_L("Construction under low memory conditions"));
+	INFO_PRINTF1(_L("Construction under low memory conditions"));
 	CParaFormatLayer* paraLayer=CParaFormatLayer::NewL();
 	CCharFormatLayer* charLayer=CCharFormatLayer::NewL();
 	TInt failRate=0;
 	CRichText* doc=NULL;
 	__UHEAP_RESET;
 	delete paraLayer;
 	delete charLayer;
 	TBuf<36> answer;
 	answer.Format(_L("        #allocs for full c'tion: %d\n"),failRate-1);
-	test.Printf(answer);
+	INFO_PRINTF1(answer);
 	}
-LOCAL_D void CopyPasteOOM()
+void CT_RICHOOM::CopyPasteOOM()
 	{
 // Set up the framework
-	test.Next(_L("Copy/Paste OOM"));
+	INFO_PRINTF1(_L("Copy/Paste OOM"));
 	CRichText* richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	TFileName file=_L("z:\\test\\app-framework\\etext\\climb.txt");
 	/*TInt count=*/richText1->ImportTextFileL(0,file,CPlainText::EOrganiseByParagraph);
 	//
 	// Insert some picture components
 	charFormat.iFontSpec.iFontStyle.SetStrokeWeight(EStrokeWeightBold);
 	charMask.SetAttrib(EAttFontStrokeWeight);
 	richText1->ApplyCharFormatL(charFormat,charMask,10,37);
 //
 // Copy to clipboard normally.
-	test.Start(_L("Copy Normally"));
+	INFO_PRINTF1(_L("Copy Normally"));
 	User::LeaveIfError(TheSession.Connect());
 	CClipboard* writeBoard=CClipboard::NewForWritingLC(TheSession);
 	richText1->CopyToStoreL(writeBoard->Store(),writeBoard->StreamDictionary(),0,richText1->DocumentLength()-1);  // forces virtual trailing phrase
 	writeBoard->CommitL();
 	CleanupStack::PopAndDestroy();  // writeboard
 	writeBoard=NULL;
 	delete richText1;
 	richText1=NULL;
 //
 // Paste from clipboard normally.
-	test.Next(_L("Paste Normally"));
+	INFO_PRINTF1(_L("Paste Normally"));
 	__UHEAP_MARK;
 	CRichText* empty=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	MDemPictureFactory pictureFactory;
 	empty->SetPictureFactory(&pictureFactory,NULL);
 	CClipboard* readBoard=CClipboard::NewForReadingLC(TheSession);
 	CleanupStack::PopAndDestroy();  // readBoard
 	readBoard=NULL;
 	__UHEAP_MARKEND;
 //
 // Paste from clipboard with OOM
-	test.Next(_L("Paste with OOM"));
+	INFO_PRINTF1(_L("Paste with OOM"));
-	test.Next(_L("...please wait"));
+	INFO_PRINTF1(_L("...please wait"));
 	__UHEAP_MARK;
 	empty=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	for (TInt ii=1; ;ii++)
 		{
 		readBoard=CClipboard::NewForReadingLC(TheSession);
 	//
 	delete empty;
 	empty=NULL;
 	TheSession.Close();
 	__UHEAP_MARKEND;
-	test.End();
+	}
-	}
+void CT_RICHOOM::CopyPasteOOM2()
-LOCAL_D void CopyPasteOOM2()
 // Test case for defect HA-282 - simple case
 //
 	{
 	__UHEAP_MARK;
 // Set up the framework
-	test.Next(_L("Copy/Paste OOM 2"));
+	INFO_PRINTF1(_L("Copy/Paste OOM 2"));
 	CRichText* richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	richText1->InsertL(0,_L("HelloHello"));
 	richText1->InsertL(5,CEditableText::EParagraphDelimiter);
 	//
 	// Format the first paragraph
 	charFormat.iFontSpec.iFontStyle.SetStrokeWeight(EStrokeWeightBold);
 	charMask.SetAttrib(EAttFontStrokeWeight);
 	richText1->ApplyCharFormatL(charFormat,charMask,0,6);
 //
 // Copy to clipboard normally.
-	test.Start(_L("Copy Normally"));
+	INFO_PRINTF1(_L("Copy Normally"));
 	User::LeaveIfError(TheSession.Connect());
 	CClipboard* writeBoard=CClipboard::NewForWritingLC(TheSession);
 	richText1->CopyToStoreL(writeBoard->Store(),writeBoard->StreamDictionary(),2,6);  // forces virtual trailing phrase
 	writeBoard->CommitL();
 	CleanupStack::PopAndDestroy();  // writeboard
 	writeBoard=NULL;
 //
 // Paste from clipboard normally.
-	test.Next(_L("Paste Normally"));
+	INFO_PRINTF1(_L("Paste Normally"));
 //	__UHEAP_MARK;
 	CRichText* empty=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	empty->AppendTakingSolePictureOwnershipL(*richText1);
 	CClipboard* readBoard=CClipboard::NewForReadingLC(TheSession);
 	TRAPD(ret,
 	CleanupStack::PopAndDestroy();  // readBoard
 	readBoard=NULL;
 //	__UHEAP_MARKEND;
 //
 // Paste from clipboard with OOM
-	test.Next(_L("Paste with OOM"));
+	INFO_PRINTF1(_L("Paste with OOM"));
-	test.Next(_L("...please wait"));
+	INFO_PRINTF1(_L("...please wait"));
 	__UHEAP_MARK;
 	empty=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	empty->AppendTakingSolePictureOwnershipL(*richText1);
 	delete richText1;
 	richText1=NULL;
 	delete empty;
 	empty=NULL;
 	__UHEAP_MARKEND;
 	TheSession.Close();
 	__UHEAP_MARKEND;
-	test.End();
+	}
-	}
+void CT_RICHOOM::WriteInlineL(RWriteStream& aStream,CRichText* aRichText)
-LOCAL_D void WriteInlineL(RWriteStream& aStream,CRichText* aRichText)
 	{
 	aRichText->ExternalizeStyleDataL(aStream);
 	aRichText->ExternalizeMarkupDataL(aStream);
 	aRichText->ExternalizePlainTextL(aStream);
 	}
-LOCAL_D void ReadInlineL(RReadStream& aStream,CRichText* aRichText)
+void CT_RICHOOM::ReadInlineL(RReadStream& aStream,CRichText* aRichText)
 	{
 	aRichText->InternalizeStyleDataL(aStream);
 	aRichText->InternalizeMarkupDataL(aStream);
 	aRichText->InternalizePlainTextL(aStream);
 	}
-LOCAL_C CStyleList* CreatePopulatedStyleList()
+CStyleList* CT_RICHOOM::CreatePopulatedStyleList()
 //
 	{
 	//
 	// Create style aswell.
 	CStyleList* list=CStyleList::NewL();
 	list->AppendL(&info3);
 	return list;
 	}
 _LIT(KTRichOutputFile,"c:\\etext\\TRICH.DAT");
-LOCAL_C void SaveLoadOOM()
+void CT_RICHOOM::SaveLoadOOM()
 	{
 // Set up the framework
 	theFs.Delete(KTRichOutputFile);
 	theFs.MkDirAll(KTRichOutputFile);
 	CFileStore* store = CPermanentFileStore::CreateLC(theFs,KTRichOutputFile,EFileRead|EFileWrite);
 	richText1->InsertL(richText1->DocumentLength(),_L("there"));
 	RStoreWriteStream out;
 	TStreamId id1 =  out.CreateLC(*store);
-	test.Next(_L("Store/Restore OOM"));
+	INFO_PRINTF1(_L("Store/Restore OOM"));
-	test.Start(_L("Writing Inline noramlly"));
+	INFO_PRINTF1(_L("Writing Inline noramlly"));
 // Write out inline normally
 	WriteInlineL(out,richText1);
 	delete richText1;
 	out.CommitL();
 	CleanupStack::PopAndDestroy();  // out
 	store->CommitL();
 	RStoreReadStream in;
 	in.OpenLC(*store,id1);
 	CRichText* empty = CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
-	test.Next(_L("Reading Inline noramlly"));
+	INFO_PRINTF1(_L("Reading Inline noramlly"));
 // Read in inline normally:
 	TRAPD(ret,ReadInlineL(in,empty));
 	test(ret==KErrNone);
 	CleanupStack::PopAndDestroy();  // in
 	delete empty;
 	empty=NULL;
-	test.Next(_L("Reading Inline with OOM"));
+	INFO_PRINTF1(_L("Reading Inline with OOM"));
 // Read in inline with OOM:
 	empty=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	for (TInt jj = 1; ;++jj)
 		{
 			test(empty->HasMarkupData());
 			break;
 			}
 		}
-	test.Next(_L("Writing Inline with OOM"));
+	INFO_PRINTF1(_L("Writing Inline with OOM"));
 // Write out inline with OOM:
 	CStyleList* list2=CreatePopulatedStyleList();
 	CRichText* richText2 = CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,*list2);
 	richText2->InsertL(0,_L("hello"));
 	TStreamId i = store->ExtendL();
 		else
 			CleanupStack::PopAndDestroy();  // out2
 		}
 	store->CommitL();
-	test.Next(_L("Reading Inline after OOM write"));
+	INFO_PRINTF1(_L("Reading Inline after OOM write"));
 // Read in inline normally following a write out with OOM
 	RStoreReadStream in3;
 	in3.OpenLC(*store,i);
 	empty->Reset();
 	TRAP(ret,ReadInlineL(in3,empty));	// unhandled exception
 	richText3->InsertL(0,hdr3);
 	richText3->InsertL(0,hdr2);
 	richText3->InsertL(0,hdr1);
 	richText3->InsertL(2,_L("hello"));
-	test.Next(_L("Writing Outline noramlly"));
+	INFO_PRINTF1(_L("Writing Outline noramlly"));
 // Write outline normally:
 	TStreamId id2 = richText3->StoreL(*store);
 	store->CommitL();
 	delete richText3;
-	test.Next(_L("Reading Outline noramlly"));
+	INFO_PRINTF1(_L("Reading Outline noramlly"));
 // Read outline normally:
 	empty->Reset();
 	TRAP(ret,empty->RestoreL(*store,id2));
 	test(ret==KErrNone);
 	empty->Reset();
-	test.Next(_L("Reading Outline with OOM"));
+	INFO_PRINTF1(_L("Reading Outline with OOM"));
 // Read outline with OOM:
 	CRichText* inText2=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	for (TInt kk = 1; ;++kk)
 		{
 		__UHEAP_SETFAIL(RHeap::EDeterministic,kk);
 	richText4->InsertL(0,hdr4);
 	richText4->InsertL(0,hdr5);
 	richText4->InsertL(0,hdr6);
 	richText4->InsertL(1,_L("hello"));
-	test.Next(_L("Writing Outline with OOM"));
+	INFO_PRINTF1(_L("Writing Outline with OOM"));
 // Wtite outline with OOM:
 	TStreamId id3(0);
 	for (TInt mm=1; ;++mm)
 		{
 		__UHEAP_SETFAIL(RHeap::EDeterministic,mm);
 			store->CommitL();
 			break;
 			}
 		}
-	test.Next(_L("Reading Outline after OOM write"));
+	INFO_PRINTF1(_L("Reading Outline after OOM write"));
 // Read outline normally folliwng a write with OOM:
 	empty->Reset();
 	TRAP(ret,empty->RestoreL(*store,id3));
 	test(ret==KErrNone);
 	CleanupStack::PopAndDestroy();  // store
 	delete empty;
-	test.End();
+	}
-	}
+void CT_RICHOOM::CheckTextIntegrity(const CRichText* aText)
-LOCAL_C void CheckTextIntegrity(const CRichText* aText)
 // Simply invokes a method to run the text (& component's) onvariants.
 //
 	{
 	__UHEAP_RESET;
 	CParaFormat* paraFormat=CParaFormat::NewLC();
 	aText->GetParagraphFormatL(paraFormat,0);  // forces CRichTextIndex::__DbgTextInvariant() to run.
 	CleanupStack::PopAndDestroy();  // paraFormat
 	}
-LOCAL_C void BasicEditOOM()
+void CT_RICHOOM::BasicEditOOM()
 // Tests basic editing functions under OOM conditions.
 //
 	{
-	test.Next(_L("Basic Editing methods under OOM"));
+	INFO_PRINTF1(_L("Basic Editing methods under OOM"));
-	test.Start(_L("InsertL(TChar)"));
+	INFO_PRINTF1(_L("InsertL(TChar)"));
 //
 //	Insert a single character
 	const TInt insertCharLoop=10;
 	const TInt KSmallTextBufferSize=1;
 	CRichText* richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,CEditableText::ESegmentedStorage,KSmallTextBufferSize);
 		}
 	__UHEAP_RESET;
 	delete richText1;
 //
 //
-	test.Next(_L("InsertL(TDesC&)"));
+	INFO_PRINTF1(_L("InsertL(TDesC&)"));
 //
 //	Insert a descriptor
 	const TInt insertDescriptorLoop=10;
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,CEditableText::ESegmentedStorage,KSmallTextBufferSize);
 	richText1->SetPictureFactory(NULL,NULL);  // forces index generation
 	for (TInt nn=1;nn<=insertDescriptorLoop+1;nn++)
 		{
 		__UHEAP_SETFAIL(RHeap::EDeterministic,nn);
 		TRAPD(ret,richText1->InsertL(richText1->DocumentLength(),buf));
 		if (ret!=KErrNone)
+			{
 			test(richText1->DocumentLength()==0);
-		else
+			}
+		else
+			{
 			test(richText1->DocumentLength()==buf.Length());
+			}
 		CheckTextIntegrity(richText1);
 		richText1->Reset();
 		}
 	__UHEAP_RESET;
 	delete richText1;
 //
 //
-	test.Next(_L("InsertL(TPictureHeader&)"));
+	INFO_PRINTF1(_L("InsertL(TPictureHeader&)"));
 //
 //	Insert a picture header
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,CEditableText::ESegmentedStorage,KSmallTextBufferSize);
 	//
 	for (TInt ii=18; ;ii++)
 			break;
 			}
 		}
 	__UHEAP_RESET;
 	delete richText1;
-	test.End();
 	__UHEAP_RESET;
 //	delete richText1;
 	}
-LOCAL_C void AppendTest1L()
+void CT_RICHOOM::AppendTest1L()
 	{
 //	Insert a single character
 	const TInt insertDescriptorLoop=10;
 	const TInt KSmallTextBufferSize=1;
 	CRichText* source=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,CEditableText::ESegmentedStorage,KSmallTextBufferSize);
 	for (TInt nn=1;nn<=insertDescriptorLoop+2;nn++) // +1 for the last para delim, +1 to force a suceed
 		{
 		__UHEAP_SETFAIL(RHeap::EDeterministic,nn);
 		TRAPD(ret,target->AppendTakingSolePictureOwnershipL(*source));
 		if (ret!=KErrNone)
+			{
 			test(target->DocumentLength()==targetStartLength);
+			}
 		else
 			{
 			TInt targetLength=target->DocumentLength();
 			test(targetLength==targetStartLength+source->DocumentLength()+1);
 			break;
 		CheckTextIntegrity(target);
 		}
 	__UHEAP_RESET;
 	delete target;
 	delete source;
-//	test.End();
+	}
-	}
+void CT_RICHOOM::AppendTest2L(CRichText* aTarget)
-LOCAL_C void AppendTest2L(CRichText* aTarget)
 	{
 	__UHEAP_RESET;
 	const TInt KSmallTextBufferSize=1;
 	TFileName filename=_L("z:\\test\\app-framework\\etext\\richoom1.pml");
 	CRichText* source=LoadIntoTextL(filename);
 		__UHEAP_SETFAIL(RHeap::EDeterministic,ii);
 		TRAPD(ret,
 			aTarget->AppendTakingSolePictureOwnershipL(*source));
 		__UHEAP_RESET;
 		if (ret!=KErrNone)
+			{
 			test(aTarget->DocumentLength()==targetStartLength);
+			}
 		else
 			{// We have succeeded in appending the document.
 			TInt paraDelimiter=(targetStartLength>0) ? 1 : 0;
 			test(aTarget->DocumentLength()==targetStartLength+paraDelimiter+source->DocumentLength());
 			break;
 	delete source;
 	delete aTarget;
 	}
-LOCAL_C void AppendTestNewL(CRichText* aTarget)
+void CT_RICHOOM::AppendTestNewL(CRichText* aTarget)
 	{
 	const TInt KSmallTextBufferSize=4;
 	TFileName filename=_L("z:\\test\\app-framework\\etext\\richoom2.pml");
 	CRichText* source=LoadIntoTextL(filename);
 	if (!aTarget)
 		__UHEAP_SETFAIL(RHeap::EDeterministic,ii);
 		TRAPD(ret,
 			aTarget->AppendTakingSolePictureOwnershipL(*source));
 		__UHEAP_RESET;
 		if (ret!=KErrNone)
+			{
 			test(aTarget->DocumentLength()==targetStartLength);
+			}
 		else
 			{// We have succeeded in appending the document.
 			TInt paraDelimiter=(targetStartLength>0) ? 1 : 0;
 			test(aTarget->DocumentLength()==targetStartLength+paraDelimiter+source->DocumentLength());
 			break;
 	delete source;
 	delete aTarget;
 	}
-LOCAL_C void AppendTest3L(CRichText* aTarget)
+void CT_RICHOOM::AppendTest3L(CRichText* aTarget)
 	{
 	const TInt KSmallTextBufferSize=31;
 	TFileName filename=_L("z:\\test\\app-framework\\etext\\richoom2.pml");
 	CRichText* source=LoadIntoTextL(filename);
 	if (!aTarget)
 		__UHEAP_SETFAIL(RHeap::EDeterministic,ii);
 		TRAPD(ret,
 			aTarget->AppendTakingSolePictureOwnershipL(*source));
 		__UHEAP_RESET;
 		if (ret!=KErrNone)
+			{
 			test(aTarget->DocumentLength()==targetStartLength);
+			}
 		else
 			{// We have succeeded in appending the document.
 			TInt paraDelimiter=(targetStartLength>0) ? 1 : 0;
 			test(aTarget->DocumentLength()==targetStartLength+paraDelimiter+source->DocumentLength());
 			break;
 	delete source;
 	delete aTarget;
 	}
-LOCAL_C void AppendTakingSolePictureOwnershipOOM()
+void CT_RICHOOM::AppendTakingSolePictureOwnershipOOM()
 //
 	{
-	test.Next(_L("AppendTakingSolePictureOwnershipL() under OOM"));
+	INFO_PRINTF1(_L("AppendTakingSolePictureOwnershipL() under OOM"));
 	//
-	test.Start(_L("Plain text only"));
+	INFO_PRINTF1(_L("Plain text only"));
 	TRAPD(ret,
 	AppendTest1L());
 	test(ret==KErrNone);
 	//
-	test.Next(_L("Plain text + phrase markup, with empty target"));
+	INFO_PRINTF1(_L("Plain text + phrase markup, with empty target"));
 	TRAP(ret,
 	AppendTest2L(STATIC_CAST(CRichText*,NULL)));
 	test(ret==KErrNone);
 	//
-	test.Next(_L("Plain text + phrase markup, with non-empty target"));
+	INFO_PRINTF1(_L("Plain text + phrase markup, with non-empty target"));
 	TFileName filename=_L("z:\\test\\app-framework\\etext\\richoom1.pml");
 	CRichText* target=LoadIntoTextL(filename);
 	TRAP(ret,
 	AppendTest2L(target));
 	test(ret==KErrNone);
 	//
-//	test.Next(_L("Plain text + shared markup, with empty target"));
+//	INFO_PRINTF1(_L("Plain text + shared markup, with empty target"));
 //	TRAP(ret,
 //	AppendTest3L(STATIC_CAST(CRichText*,NULL)));
 //	test(ret==KErrNone);
 	//
-	test.Next(_L("Plain text + shared markup, non-empty target"));
+	INFO_PRINTF1(_L("Plain text + shared markup, non-empty target"));
 	TRAP(ret,
 	AppendTestNewL(STATIC_CAST(CRichText*,NULL)));
 	test(ret==KErrNone);
 	//
-	test.Next(_L("Plain text + shared markup, with non-empty target"));
+	INFO_PRINTF1(_L("Plain text + shared markup, with non-empty target"));
 	filename=_L("z:\\test\\app-framework\\etext\\richoom2.pml");
 	target=LoadIntoTextL(filename);
 	TRAP(ret,
 	AppendTest3L(target));
 	test(ret==KErrNone);
-	//
+	}
-	test.End();
-	}
+void CT_RICHOOM::DoAppendParagraphOOM(CRichText* aRichText,TBool aUnderOOM,TInt aReplicas)
-LOCAL_C void DoAppendParagraphOOM(CRichText* aRichText,TBool aUnderOOM,TInt aReplicas)
 	{
 	if (!aUnderOOM)
 		{
 		aRichText->AppendParagraphL(aReplicas);
 		return;
 			{
 			test(newCharCount==charCount+aReplicas);
 			test(newParaCount==paraCount+aReplicas);
 			TBuf<30> buf;
 			buf.Format(_L("   allocs=%d\n"),jj);
-			test.Printf(buf);
+			INFO_PRINTF1(buf);
 			break;
 			}
 		}
 	}
-LOCAL_C void AppendParagraphOOM()
+void CT_RICHOOM::AppendParagraphOOM()
 //
 	{
 	TInt manyParas=5;
 	TInt singlePara=1;
-	test.Next(_L("AppendParagraphL() under OOM"));
+	INFO_PRINTF1(_L("AppendParagraphL() under OOM"));
 //
-	test.Start(_L("appending normally - text has markup - single para"));
+	INFO_PRINTF1(_L("appending normally - text has markup - single para"));
 	TFileName filename=_L("z:\\test\\app-framework\\etext\\richoom1.pml");
 	CRichText* text=LoadIntoTextL(filename);
 	DoAppendParagraphOOM(text,EFalse,singlePara);
 	delete text;
 	text=NULL;
-	test.Next(_L("appending with OOM - text has markup - single para"));
+	INFO_PRINTF1(_L("appending with OOM - text has markup - single para"));
 	text=LoadIntoTextL(filename);
 	DoAppendParagraphOOM(text,ETrue,singlePara);
 	delete text;
 	text=NULL;
-	test.Next(_L("appending normally - text has markup - many paras"));
+	INFO_PRINTF1(_L("appending normally - text has markup - many paras"));
 	text=LoadIntoTextL(filename);
 	DoAppendParagraphOOM(text,EFalse,manyParas);
 	delete text;
 	text=NULL;
-	test.Next(_L("appending with OOM - text has markup - many paras"));
+	INFO_PRINTF1(_L("appending with OOM - text has markup - many paras"));
 	text=LoadIntoTextL(filename);
 	DoAppendParagraphOOM(text,ETrue,manyParas);
 	delete text;
 	text=NULL;
+	}
-	test.End();
-	}
+void CT_RICHOOM::ApplyCharFormatOOM1()
-LOCAL_C void ApplyCharFormatOOM1()
 	{
 // Set up the framework
-	test.Next(_L("ApplyCharFormatL() OOM - no markup"));
+	INFO_PRINTF1(_L("ApplyCharFormatL() OOM - no markup"));
 	CRichText* richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	richText1->InsertL(0,_L("SOME VERY FINE TEXT"));
 // Apply some random formatting
 	TCharFormat charFormat; TCharFormatMask charMask;
 	delete richText1;
 	richText1=NULL;
 	}
-LOCAL_C void ApplyCharFormatOOM2()
+void CT_RICHOOM::ApplyCharFormatOOM2()
 	{
 // Set up the framework
-	test.Next(_L("ApplyCharFormatL() OOM - with markup"));
+	INFO_PRINTF1(_L("ApplyCharFormatL() OOM - with markup"));
 	CRichText* richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	richText1->InsertL(0,_L("SOME TEXT"));
 // Generate some markup
 	TCharFormat cF;
 	delete richText1;
 	richText1=NULL;
 	}
-LOCAL_C void doMainL()
+void CT_RICHOOM::doMainL()
 	{
 	GlobalPictureFactory=new(ELeave) MDemPictureFactory;
 	GlobalParaFormatLayer=CParaFormatLayer::NewL();
 	GlobalCharFormatLayer=CCharFormatLayer::NewL();
 		test(ret==KErrNone);
 	TRAP(ret,ApplyCharFormatOOM1());
 		test(ret==KErrNone);
 	TRAP(ret,ApplyCharFormatOOM2());
 		test(ret==KErrNone);
-	test.End();
 	//
 	delete GlobalPictureFactory;
 	delete GlobalParaFormatLayer;
 	delete GlobalCharFormatLayer;
 	theFs.Close();
 	}
-LOCAL_C void setupCleanup()
+void CT_RICHOOM::setupCleanup()
 //
 // Initialise the cleanup stack.
 //
 {
 	TheTrapCleanup=CTrapCleanup::New();
 		});
 	test(r==KErrNone);
 	}
-LOCAL_C void DeleteDataFile(const TDesC& aFullName)
+void CT_RICHOOM::DeleteDataFile(const TDesC& aFullName)
 	{
 	RFs fsSession;
 	TInt err = fsSession.Connect();
 	if(err == KErrNone)
 		{
 		{
 		RDebug::Print(_L("Error %d connecting file session. File: %S.\n"), err, &aFullName);
 		}
 	}
-GLDEF_C TInt E32Main()
+CT_RICHOOM::CT_RICHOOM()
-//
-// Test permanent file store.
-//
 {
-	test.Title();
+SetTestStepName(KTestStep_T_RICHOOM);
+}
+TVerdict CT_RICHOOM::doTestStepL()
+{
+SetTestStepResult(EFail);
+__UHEAP_MARK;
 	setupCleanup();
-	__UHEAP_MARK;
+	INFO_PRINTF1(_L(" @SYMTestCaseID:SYSLIB-TTEXT-LEGACY-T_TRICHOOM-0001 RichText OOM Testing "));
-//
+TRAPD(error1, doMainL());
-	test.Start(_L(" @SYMTestCaseID:SYSLIB-TTEXT-LEGACY-T_TRICHOOM-0001 RichText OOM Testing "));
-	TRAPD(ret,doMainL());
-	test(ret==KErrNone);
-	::DeleteDataFile(KTRichOutputFile);	//deletion of data files must be before call to End() - DEF047652
-	test.End();
-//
-	__UHEAP_MARKEND;
 	delete TheTrapCleanup;
-	test.Close();
+__UHEAP_MARKEND;
-	return KErrNone;
+if(error1 == KErrNone)
+{
+SetTestStepResult(EPass);
+}
+return TestStepResult();
 }

changeset 51	a7c938434754
parent 0	1fb32624e06b
child 55	336bee5c2d35