FCL/sf/os/textandloc: comparison textrendering/texthandling/ttext/T

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 <txtfmlyr.h>
 #include <s32mem.h>
 #include <s32file.h>
 #include <flddef.h>
 #include <fldbltin.h>
-#include <e32test.h>
 #include "../incp/T_PMLPAR.H"
+#include "T_CONVRT.h"
+#define test(cond)											\
+	{														\
+	TBool __bb = (cond);									\
+	TEST(__bb);												\
+	if (!__bb)												\
+		{													\
+		ERR_PRINTF1(_L("ERROR: Test Failed"));				\
+		User::Leave(1);										\
+		}													\
+	}
 #define UNUSED_VAR(a) a = a
 const TInt KTestCleanupStack=0x20;
 LOCAL_D CTrapCleanup* TheTrapCleanup;
-LOCAL_D RTest test(_L("T_CONVRT - Rich Text Persistence"));
 //
 LOCAL_D CRichText* TheText=NULL;
 LOCAL_D CParaFormatLayer* TheGlobalParaLayer=NULL;
 LOCAL_D CCharFormatLayer* TheGlobalCharLayer=NULL;
 ////////////////////////////////////////////////////////////////////////////////////////////
-class TTestFieldFactory : public MTextFieldFactory
+class TTestFieldFactoryCONVRT : 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* TTestFieldFactory::NewFieldL(TUid aFieldType)
+CTextField* TTestFieldFactoryCONVRT::NewFieldL(TUid aFieldType)
 // Creates a field (in aHeader) of the type specified in aHeader
 //
 	{
 	CTextField* field=NULL;
 	if (aFieldType==KDateTimeFieldUid)
 	}
 /////////////////////////////////////////////////////////////////////////////////////////////
 _LIT(KOutputFile, "c:\\etext\\t_convrt.tst");
 template <class T>
-void testStoreRestoreL(T& aCopy,const T& aOriginal)
+void CT_CONVRT::testStoreRestoreL(T& aCopy,const T& aOriginal)
 // Test document persistance.
 //
 {
 	// set up the store
 	RFs	theFs;
 	CleanupStack::PopAndDestroy();  // theStore
 	theFs.Close();
 }
-LOCAL_C TInt IsEqual(const CEditableText* aCopy,const CEditableText* aOriginal)
+TInt CT_CONVRT::IsEqual(const CEditableText* aCopy,const CEditableText* aOriginal)
 //
 // Returns true if aCopy contents matches aOriginal contents.
 // Takes account of multiple segments of a segmented text component.
 //
 	{
 	test(lengthRead==lengthOfOriginal+1);
 	return 1;
 	}
-LOCAL_C void DoTestRichTextL()
+void CT_CONVRT::DoTestRichTextL()
 //
 // Test streaming CRichText.
 //
 	{// Create the global text components.
 	const TInt KSmallestTextBuffer=1;
 	gText=CGlobalText::NewL(paraLayer,charLayer,CEditableText::ESegmentedStorage,KSmallestTextBuffer));
 	newsize=User::Available(biggest);
 	TInt globalPrint=size-newsize;
 	TBuf<50> buf;
 	buf.Format(_L("Empty rich text takes: %d bytes\n"),footprint);
-	test.Printf(buf);
+	INFO_PRINTF1(buf);
 	buf.Format(_L("Empty global text takes: %d bytes\n"),globalPrint);
-	test.Printf(buf);
+	INFO_PRINTF1(buf);
 //	test.Getch();
 	delete gText;
 	//
 	// Now add a text field to this.
-	TTestFieldFactory factory;
+	TTestFieldFactoryCONVRT factory;
 	TheText->SetFieldFactory(&factory);
 	theCopy->SetFieldFactory(&factory);
 	CTextField* field=NULL;
 	TRAP(ret,
 	field=factory.NewFieldL(KDateTimeFieldUid));
 	delete paraLayer;
 	delete charLayer;
 	}
-LOCAL_C void LoadIntoText(TFileName& aFileName)
+void CT_CONVRT::LoadIntoText(TFileName& aFileName)
 //
 	{
 	CParser* myParser=NULL;
 	TRAPD(ret,
 	myParser=CParser::NewL());
 	TheGlobalCharLayer=(CCharFormatLayer*)TheText->GlobalCharFormatLayer();
 	delete myParser;
 	}
-LOCAL_C void KillText()
+void CT_CONVRT::KillText()
 //
 	{
 	delete TheText;
 	}
-LOCAL_C void KillLayers()
+void CT_CONVRT::KillLayers()
 	{
 	delete TheGlobalParaLayer;
 	delete TheGlobalCharLayer;
 	}
-LOCAL_C void Reset()
+void CT_CONVRT::Reset()
 //
 	{
 	KillText();
 	KillLayers();
 	}
-LOCAL_C void GoL()
+void CT_CONVRT::GoL()
 //
 	{
-	test.Start(_L("Rich Text of Shared Para Formats Only"));
+	INFO_PRINTF1(_L("Rich Text of Shared Para Formats Only"));
 	TFileName fileName=_L("z:\\test\\app-framework\\etext\\shared.pml");
 	LoadIntoText(fileName);
 	TBool hasMarkupData=TheText->HasMarkupData();
 	test(hasMarkupData);
 	DoTestRichTextL();
 	Reset();
 	//
-	test.Next(_L("Rich Text with specific character formatting"));
+	INFO_PRINTF1(_L("Rich Text with specific character formatting"));
 	fileName=_L("z:\\test\\app-framework\\etext\\test1.pml");
 	LoadIntoText(fileName);
 	hasMarkupData=TheText->HasMarkupData();
 	test(hasMarkupData);
 	DoTestRichTextL();
 	Reset();
-	//
+	}
-	test.End();
-	}
+void CT_CONVRT::setupCleanup()
-LOCAL_C void setupCleanup()
 //
 // Initialise the cleanup stack.
 //
 {
 		CleanupStack::Pop(KTestCleanupStack);\
 		});
 	}
-LOCAL_C void DeleteDataFile(const TDesC& aFullName)
+void CT_CONVRT::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_CONVRT::CT_CONVRT()
-//
-// Test streaming conversions.
-//
 {
-	setupCleanup();
+SetTestStepName(KTestStep_T_CONVRT);
-	test.Title();
-	test.Start(_L("Persisting Rich Text"));
-	test.Next(_L(" @SYMTestCaseID:SYSLIB-ETEXT-LEGACY-T_CONVRT-0001 "));
-	__UHEAP_MARK;
-	TRAPD(ret, GoL());
-	__UHEAP_MARKEND;
-test(ret == KErrNone);
-	//deletion of data files must be before call to End() - DEF047652
-	::DeleteDataFile(KOutputFile);
-	test.End();
-	test.Close();
-	delete TheTrapCleanup;
-	return 0;
 }
+TVerdict CT_CONVRT::doTestStepL()
+{
+SetTestStepResult(EFail);
+setupCleanup();
+__UHEAP_MARK;
+INFO_PRINTF1(_L("T_CONVRT - Rich Text Persistence"));
+INFO_PRINTF1(_L("Persisting Rich Text"));
+INFO_PRINTF1(_L(" @SYMTestCaseID:SYSLIB-ETEXT-LEGACY-T_CONVRT-0001 "));
+TRAPD(error1, GoL());
+__UHEAP_MARKEND;
+delete TheTrapCleanup;
+if(error1 == KErrNone)
+{
+SetTestStepResult(EPass);
+}
+return TestStepResult();
+}

changeset 51	a7c938434754
parent 0	1fb32624e06b
child 55	336bee5c2d35