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

equal deleted inserted replaced

-:748ec5531811
+:336bee5c2d35
 /*
-* Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 1997-2009 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 <txtstyle.h>
 #include "TXTMRTSR.H"
+#include <e32test.h>
 #include <gdi.h>
 #include <conpics.h>
 #include <s32mem.h>
 #include <s32file.h>
 #include <flddef.h>
 #include <fldbltin.h>
 #include <fldset.h>
-#include "TRTCUSTM.h"
+GLDEF_C RTest test(_L("TRTCUSTM"));
-#define test(cond)											\
-	{														\
-	TBool __bb = (cond);									\
-	TEST(__bb);												\
-	if (!__bb)												\
-		{													\
-		ERR_PRINTF1(_L("ERROR: Test Failed"));				\
-		User::Leave(1);										\
-		}													\
-	}
 LOCAL_D RFs theFs;
 LOCAL_D CFileStore* TheStore;
 LOCAL_D CParaFormatLayer* GlobalParaFormatLayer;
 LOCAL_D CCharFormatLayer* GlobalCharFormatLayer;
 LOCAL_D CTrapCleanup* TheTrapCleanup;
 	CStreamStore* iStore;
 	};
 ////////////////////////////////////////////////////////////////////////////////////////////
-class TTestFieldFactoryTRTCUSTM : public MTextFieldFactory
+class TTestFieldFactory : public MTextFieldFactory
 	{
 public:
 	// from MTextFieldFactory
 	virtual CTextField* NewFieldL(TUid aFieldType);
 	// Creates a field of the type specified
 	// Returns NULL if it does not recognise/support the field type
 	};
-CTextField* TTestFieldFactoryTRTCUSTM::NewFieldL(TUid aFieldType)
+CTextField* TTestFieldFactory::NewFieldL(TUid aFieldType)
 // Creates a field (in aHeader) of the type specified in aHeader
 //
 	{
 	CTextField* field=NULL;
 	if (aFieldType==KDateTimeFieldUid)
 		field = (CTextField*)new(ELeave) CDateTimeField();
 	return field;
 	}
 /////////////////////////////////////////////////////////////////////////////////////////////
-void CT_TRTCUSTM::WriteInlineL(RWriteStream& aStream,CRichText* aRichText)
+LOCAL_D void WriteInlineL(RWriteStream& aStream,CRichText* aRichText)
 	{
 	aRichText->CancelInsertCharFormat();
 	aRichText->ExternalizeFieldDataL(aStream);
 	aRichText->ExternalizeStyleDataL(aStream);
 	TBool hasMarkupData=aRichText->HasMarkupData();
 	if (hasMarkupData)
 		aRichText->ExternalizeMarkupDataL(aStream);
 	aRichText->ExternalizePlainTextL(aStream);
 	}
-void CT_TRTCUSTM::ReadInlineL(RReadStream& aStream,CRichText* aRichText)
+LOCAL_D void ReadInlineL(RReadStream& aStream,CRichText* aRichText)
 	{
 	aRichText->InternalizeFieldDataL(aStream);
 	aRichText->InternalizeStyleDataL(aStream);
 	TBool hasMarkupData=(TBool)aStream.ReadUint8L();
 	if (hasMarkupData)
 		aRichText->InternalizeMarkupDataL(aStream);
 	aRichText->InternalizePlainTextL(aStream);
 	}
-TStreamId CT_TRTCUSTM::PerformSaveL(CRichText* aRichText)
+LOCAL_D TStreamId PerformSaveL(CRichText* aRichText)
 //
 	{
 	RStoreWriteStream out;
 	TStreamId id1=out.CreateLC(*TheStore);
 	WriteInlineL(out,aRichText);
 	TheStore->CommitL();
 	return id1;
 	}
-CRichText* CT_TRTCUSTM::PerformLoadL(TStreamId aId)
+LOCAL_C CRichText* PerformLoadL(TStreamId aId)
 //
 	{
 	CRichText* text=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	RStoreReadStream in;
 	in.OpenLC(*TheStore,aId);
 	CleanupStack::PopAndDestroy();  // in
 	return text;
 	}
-CStyleList* CT_TRTCUSTM::CreatePopulatedStyleList()
+LOCAL_C CStyleList* CreatePopulatedStyleList()
 //
 	{
 	//
 	// Create style aswell.
 	CStyleList* list=CStyleList::NewL();
 	return list;
 	}
 _LIT(KTRtCustOutputFile,"c:\\etext\\TRTCUSTM.DAT");
-void CT_TRTCUSTM::CustomLoadSave()
+LOCAL_C void CustomLoadSave()
 	{
 // Set up the framework
 	theFs.Delete(KTRtCustOutputFile);
 	theFs.MkDirAll(KTRtCustOutputFile);
 	TheStore=CPermanentFileStore::CreateLC(theFs,KTRtCustOutputFile,EFileRead|EFileWrite);
 	TheStore->SetTypeL(TheStore->Layout());
 //
 // Case (1) Rich text with owned style list. - no markup data
 //
-	INFO_PRINTF1(_L("RT + no markup + style list owned"));
+	test.Start(_L("RT + no markup + style list owned"));
 	//
 	// Setup the rich text
 	CStyleList* list=CreatePopulatedStyleList();
 	CRichText* richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,*list);
 	TBool hasMarkupData=richText1->HasMarkupData();
 	delete empty;
 	empty=NULL;
 //
 // Case (2) Rich text with referenced style list. - no markup data
 //
-	INFO_PRINTF1(_L("RT + no markup + style list externally owned"));
+	test.Next(_L("RT + no markup + style list externally owned"));
 	//
 	// Setup the rich text
 	list=CreatePopulatedStyleList();
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,*list,CEditableText::ESegmentedStorage,2);
 	richText1->SetStyleListExternallyOwned(ETrue);
 	delete list;
 	empty=NULL;
 //
 // Case (3) Rich text with referenced style list. - with markup
 //
-	INFO_PRINTF1(_L("RT + markup + style list externally owned"));
+	test.Next(_L("RT + markup + style list externally owned"));
 	// Setup the rich text
 	list=CreatePopulatedStyleList();
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,*list);
 	richText1->SetStyleListExternallyOwned(ETrue);
 	hasMarkupData=richText1->HasMarkupData();
 	delete list;
 	empty=NULL;
 //
 // Case (4) Rich text with no style list. - no effective markup
 //
-	INFO_PRINTF1(_L("RT + delete picture + no style list"));
+	test.Next(_L("RT + delete picture + no style list"));
 	// Setup the rich text
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	hasMarkupData=richText1->HasMarkupData();
 	test(!hasMarkupData);
 	richText1->InsertL(0,_L("hello"));
 	delete empty;
 	empty=NULL;
 //
 // Case (5) Rich text with SetInsertCharFormat()
 //
-	INFO_PRINTF1(_L("RT + SetInsertCharFormatL()"));
+	test.Next(_L("RT + SetInsertCharFormatL()"));
 	// Setup the rich text
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	hasMarkupData=richText1->HasMarkupData();
 	test(!hasMarkupData);
 	richText1->InsertL(0,_L("hello"));
 	empty=NULL;
 //
 // Case (6) Rich text with components - default re/store used.
 //
-	INFO_PRINTF1(_L("RT + components"));
+	test.Next(_L("RT + components"));
 	// Setup the rich text
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	hasMarkupData=richText1->HasMarkupData();
 	test(!hasMarkupData);
 	richText1->InsertL(0,_L("hello"));
 	richText1->InsertL(richText1->DocumentLength(),CEditableText::EParagraphDelimiter);
 	richText1->InsertL(richText1->DocumentLength(),_L("there"));
 	richText1->InsertL(richText1->DocumentLength(),CEditableText::EParagraphDelimiter);
 	//
 	// Create & insert some fields
-	TTestFieldFactoryTRTCUSTM factory;
+	TTestFieldFactory factory;
 	richText1->SetFieldFactory(&factory);
 	CTextField* field=NULL;
 	CTextField* field2=NULL;
 	TRAP(ret,
 	field=factory.NewFieldL(KDateTimeFieldUid));	test(ret==KErrNone);
 	empty=NULL;
 	delete pictureFactory;
 //
 // Case (7) Rich text with fields with referenced style list with markup
 //
-	INFO_PRINTF1(_L("RT + fields + markup + style list"));
+	test.Next(_L("RT + fields + markup + style list"));
 	// Setup the rich text
 	list=CreatePopulatedStyleList();
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,*list);
 	hasMarkupData=richText1->HasMarkupData();
 	test(hasMarkupData);
 	delete empty;
 	empty=NULL;
 //
 // Case (8) Rich text with fields with referenced style list with markup - default store
 //
-	INFO_PRINTF1(_L("RT + fields + markup + style list - default store"));
+	test.Next(_L("RT + fields + markup + style list - default store"));
 	// Setup the rich text
 	list=CreatePopulatedStyleList();
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer,*list);
 	hasMarkupData=richText1->HasMarkupData();
 	test(hasMarkupData);
 	delete empty;
 	empty=NULL;	//
 //
 // Case (9) Rich text with no components whatsoever - default store
 //
-	INFO_PRINTF1(_L("RT + no markup whatsoever - default store"));
+	test.Next(_L("RT + no markup whatsoever - default store"));
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	hasMarkupData=richText1->HasMarkupData();
 	test(!hasMarkupData);
 	richText1->InsertL(0,_L("hello"));
 	richText1->InsertL(richText1->DocumentLength(),CEditableText::EParagraphDelimiter);
 	delete empty;
 	empty=NULL;
 	//
 	//
 	CleanupStack::PopAndDestroy();  // TheStore
+	test.End();
 	}
 /**
 @SYMTestCaseID 			SYSLIB-ETEXT-CT-3380
 @SYMTestCaseDesc  		Inserting and deleting rich text and verify behaviours of DeleteParagraph(), Delete() and NotifyDelete();
 						7. Insert plain text in between two fields to rich text object then delete plain text to merge two fields
 @SYMTestExpectedResults	CTextFieldSet, CPlainText, CRichText's APIs for performing various types of deletion function properly when
 dealing with paragraph delimiter and hidden characters in a paragraph
 @SYMDEF					PDEF101757
 */
-void CT_TRTCUSTM::TestDEF101757()
+LOCAL_C void TestDEF101757()
 	{
 	TFindFieldInfo info;
-	TTestFieldFactoryTRTCUSTM factory;
+	TTestFieldFactory factory;
 	CTextField* field=NULL;
 	CTextField* field1=NULL;
 	CTextField* field2=NULL;
 	CTextField* field3=NULL;
 	CTextField* field4=NULL;
 	_LIT(KSample1, "Hello"); // length:5
 	_LIT(KSample2, "How are you"); // length:11
-	INFO_PRINTF1(_L(" @SYMTestCaseID:SYSLIB-ETEXT-CT-3380 Insertion and deletion to rich text object "));
+	test.Start(_L(" @SYMTestCaseID:SYSLIB-ETEXT-CT-3380 Insertion and deletion to rich text object "));
 	CRichText* richText=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	CleanupStack::PushL(richText);
 	// Case1
 	test(info.iFirstFieldLen==10);
 	test(info.iFirstFieldPos==10);
 	test(richText->FieldCount()==2);
 	CleanupStack::PopAndDestroy(richText);
+	test.End();
 	}
 //Testcode for INC054540
-void CT_TRTCUSTM::TestINC054540()
+LOCAL_C void TestINC054540()
 	{
 	theFs.Delete(KTRtCustOutputFile);
 	theFs.MkDirAll(KTRtCustOutputFile);
 	TheStore=CPermanentFileStore::CreateLC(theFs,KTRtCustOutputFile,EFileRead|EFileWrite);
 	TheStore->SetTypeL(TheStore->Layout());
 //
 //test 1: Test INC054540 fix for 255 fields
 //
-	INFO_PRINTF1(_L("test"));
+	test.Start(_L("test"));
 	CRichText* richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	//
 	// Now add a text field to this.
-	TTestFieldFactoryTRTCUSTM factory;
+	TTestFieldFactory factory;
 	richText1->SetFieldFactory(&factory);
 	CTextField* field=NULL;
 	TInt x=0;
 	//add 255 fields
 	while(x<255)
 	empty=NULL;
 //
 //test 2: Test INC054540 fix for more than 255 fields
 //
-	INFO_PRINTF1(_L("test for more than 255 fields"));
+	test.Next(_L("test for more than 255 fields"));
 	richText1=CRichText::NewL(GlobalParaFormatLayer,GlobalCharFormatLayer);
 	// Add the text fields
 	richText1->SetFieldFactory(&factory);
 	field=NULL;
 	x=0;
 	delete empty;
 	empty=NULL;
 	//
 	//
 	CleanupStack::PopAndDestroy();  // TheStore
-	}
+	test.End();
+	}
-void CT_TRTCUSTM::doMainL()
+LOCAL_C void doMainL()
 	{
 	GlobalParaFormatLayer=CParaFormatLayer::NewL();
 	GlobalCharFormatLayer=CCharFormatLayer::NewL();
 	theFs.Connect();
 	//
 	delete GlobalCharFormatLayer;
 	theFs.Close();
 	}
-void CT_TRTCUSTM::setupCleanup()
+LOCAL_C void setupCleanup()
 //
 // Initialise the cleanup stack.
 //
 {
 	TheTrapCleanup=CTrapCleanup::New();
 		});
 	test(r==KErrNone);
 	}
-void CT_TRTCUSTM::DeleteDataFile(const TDesC& aFullName)
+LOCAL_C void 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_TRTCUSTM::CT_TRTCUSTM()
+//
+// Test permanent file TheStore.
+//
 {
-SetTestStepName(KTestStep_T_TRTCUSTM);
+	test.Title();
+	setupCleanup();
+	__UHEAP_MARK;
+//
+	test.Start(_L("Testing custom save/load optimization"));
+	TRAPD(ret,doMainL());
+	test(ret==KErrNone);
+	::DeleteDataFile(KTRtCustOutputFile); 	//deletion of data files must be before call to End() - DEF047652
+	test.End();
+//
+	__UHEAP_MARKEND;
+	delete TheTrapCleanup;
+	test.Close();
+	return KErrNone;
 }
-TVerdict CT_TRTCUSTM::doTestStepL()
-{
-SetTestStepResult(EFail);
-setupCleanup();
-__UHEAP_MARK;
-INFO_PRINTF1(_L("TRTCUSTM"));
-INFO_PRINTF1(_L("Testing custom save/load optimization"));
-TRAPD(error1, doMainL());
-DeleteDataFile(KTRtCustOutputFile);   //deletion of data files must be before call to End() - DEF047652
-__UHEAP_MARKEND;
-delete TheTrapCleanup;
-if(error1 == KErrNone)
-{
-SetTestStepResult(EPass);
-}
-return TestStepResult();
-}

branch	RCL_3
changeset 55	336bee5c2d35
parent 54	748ec5531811