MCL/sf/os/textandloc: comparison textrendering/textformatting/test/src/TFormBenchmark.cpp

equal deleted inserted replaced

-:748ec5531811
+:336bee5c2d35
 /*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-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".
 #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include "TAGMA_INTERNAL.H"
 #endif
-#include "tformbenchmark.h"
-namespace LocalToTFormBenchmark
-{
-CTFormBenchmarkStep* TestStep = NULL;
-#define TESTPOINT(p) TestStep->testpoint(p,(TText8*)__FILE__,__LINE__)
-#define TESTPRINT(p) TestStep->print(p,(TText8*)__FILE__,__LINE__)
-}
-using namespace LocalToTFormBenchmark;
 RFs fs;
 RFile fileTimeStamps;
-_LIT(KFormBenchmark, "TFormBenchmark");
 #if ((defined (__WINS__)) || (defined (__X86GCC__)))
 	_LIT(KLogTimeStampsName, "c:\\formtimestamps.csv");
 #else
 	_LIT(KLogTimeStampsName, "e:\\formtimestamps.csv");
 \x57FA\x790E\x3067\x3042\x308B\x306E\x3067\x3001 ");
 const TInt KJapaneseRepeats = 357;
 const TInt KDisplayWidth = 100;
 const TInt KDisplayHeight = 120;
+_LIT(KFormBenchmark, "TFormBenchmark");
+RTest test(KFormBenchmark);
 const TInt KInsertDisplayWidth = 200;
 const TInt KChangedDisplayWidth = 150;
 _LIT(KEnglishToInsert1, "Whereas recognition of the inherent dignity");
 _LIT(KEnglishToInsert2, " and of the equal and inalienable rights of all... and so on");
 */
 void RunScrollingTestL(TInt aRepeats, TInt aRepeatsPerParagraph,
 	RArray<TTFTimeStamp>& aTimeStampsDown, RArray<TTFTimeStamp>& aTimeStampsUp,
 	TDocInfo& aDocInfo)
 	{
-TESTPRINT(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1897 "));
+	test.Next(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1897 "));
 	TInt docLength = KEnglish().Length() * aRepeats;
 	TInt paragraphs = aRepeats/aRepeatsPerParagraph;
 	TFormattingObjects o;
 	CreateFormattingObjectsLC(o);
 	TTimeIntervalMicroSeconds opening = MeasureOpeningL(*(o.iView));
 	TInt64 slowest = 0;
 	MeasureCursorL(aTimeStampsDown, TCursorPosition::EFLineDown, o, slowest);
 	MeasureCursorL(aTimeStampsUp, TCursorPosition::EFLineUp, o, slowest);
-	TBuf<256> buf;
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_Scrolling_Slowest_Doc_with_%d_characters_%d_paragraphs;microseconds: %Ld", docLength, paragraphs, slowest);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_Scrolling_Slowest_Doc_with_%d_characters_%d_paragraphs;microseconds: %Ld"), docLength, paragraphs, slowest);
-	TESTPRINT(buf);
 	aDocInfo = GetSampleDocInfoL(o);
 	DestroyFormattingObjects(o);
 	}
 /**
 @SYMTestExpectedResults The test must not fail or panic .
 @SYMDEF DEF092140, DEF092139
 */
 void RunEnglishArabicJapaneseBenchmarksL(TFormattingObjects& aFormattingObjects)
 	{
-TESTPRINT(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1898 "));
+	test.Next(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1898 "));
 	SetTextL(*aFormattingObjects.iRichText, KEnglish, KEnglishRepeats, KEnglishRepeats);
 	TTimeIntervalMicroSeconds opening = MeasureOpeningL(*aFormattingObjects.iView);
 	TTimeIntervalMicroSeconds rmsCursorDown = MeasureRmsCursorDownL(*aFormattingObjects.iView);
 	TTimeIntervalMicroSeconds englishFormatting = MeasureFormattingL(*aFormattingObjects.iView);
 	TInt englishLines = NumberOfLines(*aFormattingObjects.iLayout);
 		minLines = japaneseLines;
 	else if (maxLines < japaneseLines)
 		maxLines = japaneseLines;
 	//Tests that the number of lines in each test is more or less balanced
-	TESTPOINT(maxLines * 100 <= minLines * 105);
+	test(maxLines * 100 <= minLines * 105);
-	TBuf<256> buf;
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_OpeningLargeParagraph;microseconds: %d",
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_OpeningLargeParagraph;microseconds: %d"),
 		static_cast<TInt>(opening.Int64()));
-	TESTPRINT(buf);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_RmsCursorDown;microseconds: %d",
-	buf.Zero();
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_RmsCursorDown;microseconds: %d"),
 		static_cast<TInt>(rmsCursorDown.Int64()));
-	TESTPRINT(buf);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormattingEnglish;microseconds: %d",
-	buf.Zero();
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormattingEnglish;microseconds: %d"),
 		static_cast<TInt>(englishFormatting.Int64()));
-	TESTPRINT(buf);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormattingArabic;microseconds: %d",
-	buf.Zero();
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormattingArabic;microseconds: %d"),
 		static_cast<TInt>(arabicFormatting.Int64()));
-	TESTPRINT(buf);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormattingJapanese;microseconds: %d",
-	buf.Zero();
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormattingJapanese;microseconds: %d"),
 		static_cast<TInt>(japaneseFormatting.Int64()));
-	TESTPRINT(buf);
 	}
 /**
 @SYMTestCaseID SYSLIB-FORMA-UT-1896
 @SYMTestCaseDesc Benchmarks inserting text from the beginning of a paragraph
 @SYMDEF DEF092140, DEF092139
 */
 void RunInsertTextTestsL(TInt aRepeats, TInt aRepeatsPerParagraph,
 	RArray<TTFTimeStamp>& aTimeStamps, TDocInfo& aDocInfo)
 	{
-TESTPRINT(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1896 "));
+	test.Next(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1896 "));
 	TFormattingObjects o;
 	CreateFormattingObjectsLC(o);
 	TInt64 slowest = 0;
 	o.iLayout->SetWrapWidth(KInsertDisplayWidth);
 	o.iLayout->SetAmountToFormat(CTextLayout::EFFormatBand);
 	MeasureInsertTextAtStartL(aRepeats, aRepeatsPerParagraph, aTimeStamps, o, slowest);
 	aDocInfo = GetSampleDocInfoL(o);
-	TBuf<256> buf;
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_InsertText_Slowest;microseconds: %Ld", slowest);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_InsertText_Slowest;microseconds: %Ld"), slowest);
-	TESTPRINT(buf);
 	DestroyFormattingObjects(o);
 	}
 /**
 @SYMTestCaseID SYSLIB-FORMA-UT-1895
 @SYMTestExpectedResults The test must not fail or panic .
 @SYMDEF DEF092140, DEF092139
 */
 void RunDeleteTextFromStartTest(RArray<TTFTimeStamp>& aTimeStamps, TDocInfo& aDocInfo)
 	{
-TESTPRINT(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1895 "));
+	test.Next(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1895 "));
 	TFormattingObjects o;
 	CreateFormattingObjectsLC(o);
 	TInt64 slowest = 0;
 	o.iLayout->SetWrapWidth(KInsertDisplayWidth);
 	o.iLayout->SetAmountToFormat(CTextLayout::EFFormatBand);
 	TTimeIntervalMicroSeconds opening = MeasureOpeningL(*o.iView);
 	MeasureDeleteTextFromStartL(aTimeStamps, o, slowest);
 	aDocInfo = GetSampleDocInfoL(o);
-	TBuf<256> buf;
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_DeleteText_Slowest;microseconds: %Ld", slowest);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_DeleteText_Slowest;microseconds: %Ld"), slowest);
-	TESTPRINT(buf);
 	CleanupStack::PopAndDestroy();//bigbuf
 	DestroyFormattingObjects(o);
 	}
 void GetFormattingBenchmarkL(TInt aNumberOfIterations, TInt& aNumberOfCharacters, TInt64& aNormalisedBenchmark)
 	{
-TESTPRINT(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1895 "));
+	test.Next(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1895 "));
 	TFormattingObjects o;
 	CreateFormattingObjectsLC(o);
 	o.iLayout->SetWrapWidth(KInsertDisplayWidth);
 	o.iLayout->SetAmountToFormat(CTextLayout::EFFormatBand);
 roughly linear with the document size.
 @SYMDEF DEF095401
 */
 void RunFormattingBenchmarksL()
 	{
-TESTPRINT(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1894 "));
+	test.Next(_L(" @SYMTestCaseID:SYSLIB-FORMA-UT-1894 "));
 	TInt numberOfCharacters = 0;
 	TInt numberOfIterations;
 	TInt64 normalisedBenchmark = 0;
-	TBuf<256> buf;
 	numberOfIterations = 1;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
-	buf.Zero();
 	numberOfIterations = 5;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
-	buf.Zero();
 	numberOfIterations = 10;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
-	buf.Zero();
 	numberOfIterations = 50;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
-	buf.Zero();
 	numberOfIterations = 100;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
-	buf.Zero();
 	numberOfIterations = 250;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
-	buf.Zero();
 	numberOfIterations = 500;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
-	buf.Zero();
 	numberOfIterations = 750;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
-	buf.Zero();
 	numberOfIterations = 1000;
 	GetFormattingBenchmarkL(numberOfIterations, numberOfCharacters, normalisedBenchmark);
-	buf.AppendFormat(_L("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration"), numberOfCharacters, normalisedBenchmark);
+	RDebug::Printf("PERFORMANCE: Syslibs;Form_FormatText;document contains %d characters: %Ld microseconds per iteration", numberOfCharacters, normalisedBenchmark);
-	TESTPRINT(buf);
 	}
 void RunBenchmarksL()
 	{
 	CActiveScheduler* scheduler = new(ELeave) CActiveScheduler;
 	CleanupStack::PopAndDestroy(2);
 	CleanupStack::PopAndDestroy(scheduler);
 	}
-TVerdict CTFormBenchmarkStep::doTestStepL()
+TInt E32Main()
 	{
-SetTestStepResult(EPass);
+	test.Title();
-TestStep = this;
+	test.Start(_L("Start Font/Bitmap Server"));
+	static CTrapCleanup* TrapCleanup = CTrapCleanup::New();
-TESTPRINT(KFormBenchmark);
-TESTPRINT(_L("Start Font/Bitmap Server"));
 	TInt error = RFbsSession::Connect();
 	if (error == KErrNotFound)
 		{
 		FbsStartup();
 		error = RFbsSession::Connect();
 		}
 	// Tests that FBServ actually starts
-	TESTPOINT(error == KErrNone);
+	test(error == KErrNone);
 	error = fs.Connect();
-	TESTPOINT(error == KErrNone);
+	test(error == KErrNone);
 	error = fileTimeStamps.Replace(fs, KLogTimeStampsName, EFileWrite);
+	RDebug::Printf("> fileTimeStamps.Replace %d", error);
-	TBuf<256> buf;
+	test(error == KErrNone);
-	buf.AppendFormat(_L("> fileTimeStamps.Replace %d"), error);
-	TESTPRINT(buf);
+	test.Next(_L("Run Benchmarks"));
-	TESTPOINT(error == KErrNone);
-	TESTPRINT(_L("Run Benchmarks"));
 	TRAP(error, RunBenchmarksL());
 	// Tests that the Benchmarks did not run out of memory
 	// or otherwise leave
-	TESTPOINT(error == KErrNone);
+	test(error == KErrNone);
 	fileTimeStamps.Close();
 	fs.Close();
 	RFbsSession::Disconnect();
+	delete TrapCleanup;
-	return TestStepResult();
+	test.End();
-	}
+	test.Close();
+	return error;
+	}

branch	RCL_3
changeset 17	336bee5c2d35
parent 16	748ec5531811