FCL/sf/os/textandloc: comparison textrendering/texthandling/ttext/TTIMES1.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".
 * Description:
 *
 */
-#include <e32test.h>
 #include <e32svr.h>
 #include <s32mem.h>
 #include <txtrich.h>
 #include <txtglobl.h>
 #include "../incp/T_PMLPAR.H"
+#include "TTIMES1.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
 LOCAL_D CTrapCleanup* TheTrapCleanup;
-LOCAL_D RTest test(_L("CRichText Document"));
 LOCAL_D CParaFormatLayer* TheGlobalParaFormatLayer;
 LOCAL_D CCharFormatLayer* TheGlobalCharFormatLayer;
 LOCAL_D CParser* TheParser;
 LOCAL_D const TInt KTestCleanupStack=0x200;
 LOCAL_D const TInt KCreateRichTextCount=1000;
 LOCAL_D CRichText* TheText[KCreateRichTextCount];
-LOCAL_C void GenerateGlobalLayersL()
+void CT_TTIMES1::GenerateGlobalLayersL()
 // Provides the base layers for globl text and below
 //
 	{
 	TParaFormatMask paraMask;
 	TheGlobalParaFormatLayer=CParaFormatLayer::NewL((CParaFormat*)NULL,paraMask);
 	TCharFormatMask charMask;
 	TheGlobalCharFormatLayer=CCharFormatLayer::NewL(charFormat,charMask);
 	}
-LOCAL_C void KillGlobalLayers()
+void CT_TTIMES1::KillGlobalLayers()
 // Destroy the base layers for global text and below
 //
 	{
 	delete TheGlobalParaFormatLayer;
 	delete TheGlobalCharFormatLayer;
 	TheGlobalParaFormatLayer=NULL;
 	TheGlobalCharFormatLayer=NULL;
 	}
-LOCAL_C void KillText()
+void CT_TTIMES1::KillText()
 	{
 	for (TInt ii=0; ii<KCreateRichTextCount;ii++)
 		{
 		delete TheText[ii];
 		TheText[ii]=NULL;
 struct TNow : public TTime
 	{
 	TNow() { HomeTime(); }
 	};
-LOCAL_C void CreationTestsL()
+void CT_TTIMES1::CreationTestsL()
 //
 	{
 	GenerateGlobalLayersL();
 	TNow start;
 	test(ii==KCreateRichTextCount);
 	//
 	// Display the metric
 	TBuf<60> context;
 	context.Format(_L("        Create rich text %d times: %d\n"),KCreateRichTextCount,finish.MicroSecondsFrom(start).Int64());
-	test.Printf(context);
+	INFO_PRINTF1(context);
 	//
 	// Tidy up
 	KillText();
 	KillGlobalLayers();
 	}
-LOCAL_C CRichText* LoadIntoTextL(TFileName& aFileName)
+CRichText* CT_TTIMES1::LoadIntoTextL(TFileName& aFileName)
 //
 	{
 	TRAPD(ret,
 	TheParser=CParser::NewL());
 	CRichText* text=NULL;
 	TheParser=NULL;
 	return text;
 	}
-LOCAL_C void GetAppendTestTimeL(const CRichText* aSource,TInt aTestLoopCount)
+void CT_TTIMES1::GetAppendTestTimeL(const CRichText* aSource,TInt aTestLoopCount)
 	{
 	CRichText* target=CRichText::NewL(TheGlobalParaFormatLayer,TheGlobalCharFormatLayer);
 	test(target->DocumentLength()==0);
 	test(!target->HasMarkupData());
 	//
 	// Calculate and display result
 	test(ii==aTestLoopCount);
 	TBuf<60> context;
 	context.Format(_L("        Append %d rich text's: %d\n"),aTestLoopCount,finish.MicroSecondsFrom(start).Int64());
-	test.Printf(context);
+	INFO_PRINTF1(context);
 	delete target;
 	}
-LOCAL_C void GetBenchmarkAppendTestTimeL(const CRichText* aSource,TInt aTestLoopCount)
+void CT_TTIMES1::GetBenchmarkAppendTestTimeL(const CRichText* aSource,TInt aTestLoopCount)
 	{
 	CRichText** target=new CRichText*[aTestLoopCount];
 	CBufStore** store=new CBufStore*[aTestLoopCount];
 	TInt ii = 0;
 	for (ii=0;ii<aTestLoopCount;ii++)
 	//
 	// Calculate and display result
 	test(ii==aTestLoopCount);
 	TBuf<70> context2;
 	context2.Format(_L("        Benchmark              : %d\n"),finish.MicroSecondsFrom(start).Int64());
-	test.Printf(context2);
+	INFO_PRINTF1(context2);
 	}
-LOCAL_C void AppendTest1L()
+void CT_TTIMES1::AppendTest1L()
 //
 	{
 	TInt testLoopCount=900;
 	CRichText* source=CRichText::NewL(TheGlobalParaFormatLayer,TheGlobalCharFormatLayer);
 	source->InsertL(source->DocumentLength(),_L("A bit of text that pretends to be an entry's title"));
 	// tidy up
 	delete source;
 	}
-LOCAL_C void AppendTest2L()
+void CT_TTIMES1::AppendTest2L()
 //
 	{
 	KillGlobalLayers();  // they are replaced by the ones read in from the PML file.
 	TInt testLoopCount=266;
 	TFileName file=_L("z:\\test\\app-framework\\etext\\ttimes1.pml");
 	// tidy up
 	delete source;
 	}
-LOCAL_C void AppendTestsL()
+void CT_TTIMES1::AppendTestsL()
 //
 	{
 	GenerateGlobalLayersL();
 	//
-	test.Start(_L("Plain Text Component Only"));
+	INFO_PRINTF1(_L("Plain Text Component Only"));
 	TRAPD(ret,
 	AppendTest1L());
 	test(ret==KErrNone);
 	//
-	test.Next(_L("Plain Text with limited Markup - no pictures"));
+	INFO_PRINTF1(_L("Plain Text with limited Markup - no pictures"));
 	TRAP(ret,
 	AppendTest2L());
 	test(ret==KErrNone);
 	//
 	KillGlobalLayers();
-	test.End();
 	}
-LOCAL_C void DoTestsL()
+void CT_TTIMES1::DoTestsL()
 //
 	{
-	test.Start(_L(" @SYMTestCaseID:SYSLIB-TTEXT-LEGACY-T_TTIMES1-0001 Creation Tests "));
+	INFO_PRINTF1(_L(" @SYMTestCaseID:SYSLIB-TTEXT-LEGACY-T_TTIMES1-0001 Creation Tests "));
 	CreationTestsL();
-	test.Next(_L("Appending Tests"));
+	INFO_PRINTF1(_L("Appending Tests"));
 	AppendTestsL();
 	//
 	}
-LOCAL_C void setupCleanup()
+void CT_TTIMES1::setupCleanup()
 //
 // Initialise the cleanup stack.
 //
 {
 		test(r==KErrNone);\
 		CleanupStack::Pop(KTestCleanupStack);\
 		});
 	}
+CT_TTIMES1::CT_TTIMES1()
-GLDEF_C TInt E32Main()
-//
-// Test the Document Model Services.
-//
 {
-	setupCleanup();
+SetTestStepName(KTestStep_T_TTIMES1);
-	test.Title();
-	__UHEAP_MARK;
-	TRAPD(ret,DoTestsL());
-test(ret == KErrNone);
-	test.End();
-	test.Close();
-	__UHEAP_MARKEND;
-	delete TheTrapCleanup;
-	return(0);
 }
+TVerdict CT_TTIMES1::doTestStepL()
+{
+SetTestStepResult(EFail);
+__UHEAP_MARK;
+setupCleanup();
+INFO_PRINTF1(_L("CRichText Document"));
+TRAPD(error1, DoTestsL());
+delete TheTrapCleanup;
+__UHEAP_MARKEND;
+if(error1 == KErrNone)
+{
+SetTestStepResult(EPass);
+}
+return TestStepResult();
+}

changeset 51	a7c938434754
parent 0	1fb32624e06b
child 55	336bee5c2d35