FCL/sf/os/graphics: comparison fbs/fontandbitmapserver/tfbs/TFBS.CPP

equal deleted inserted replaced

-:2717213c588a
+:9f66f99ee56f
-// Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1995-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".
 	}
 void CTFbs::ConstructL()
 	{
 	ExpandCleanupStackL();
+	User::LeaveIfError(Logger().ShareAuto());
 	TestConstruction();
 	AllocScanLineBuf();
 	INFO_PRINTF1(_L("FBSERV testing"));
 	}
 	case 19:
 		((CTFbsStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0508"));
 		TestSingletonServer();
 		break;
 	case 21:
-		((CTFbsStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0620"));
+		((CTFbsStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0623"));
 		TestFontSessionCacheLookupL();
 		break;
 	case 22:
 		((CTFbsStep*)iStep)->SetTestStepID(_L("GRAPHICS-FBSERV-0650"));
 		TestInvalidHandlesInIpcCallsL();
 	iResourceCount--;
 	TEST(w==font3->TextWidthInPixels(_L(" ")));
 	CheckResourceCount();
 	TEST(fbsalt->ResourceCount()==iResourceCount);
 	font3->Reset();
-	User::Free(font3);
+	delete font3;
 	iResourceCount--;
 	CheckResourceCount();
 	TEST(fbsalt->ResourceCount()==iResourceCount);
 	User::Heap().Check();
 	}
 	TEST(exitReason == EFbsPanicStartupFailed);
 	fbs.Close();
 	}
 /**
-@SYMTestCaseID      GRAPHICS-FBSERV-0620
+@SYMTestCaseID      GRAPHICS-FBSERV-0623
 @SYMTestPriority    High
 @SYMTestStatus      Implemented
 @SYMDEF             DEF140138
 @SYMTestCaseDesc
 	session cache becomes used, client-side CFbsFont calls that query the session cache
 	successfully find the glyph, proving that the session handles used client-side and server-side
 	are the same, thereby avoiding any unneccessary IPC calls.
 @SYMTestActions
+	Try to open a global semaphore called "FBSSessionCacheSemaphore" (this is a temporary measure to
+		ensure successful propagation of ou1cimx1#250526).
 	Create a large font which consumes a lot of memory.
 	Create a CFbsBitGc and a CFbsBitmap target.
 	Use the CFbsBitGc to render some text, thereby filling the font glyph cache.
 		Renders enough glyphs to fill up the font glyph cache, so that the session cache is used
 		for later characters.
 	Call CBitmapFont::CharacterNeedsToBeRasterized() with the RFbsSession handle.
 	Call CFbsFont::GetCharacterData() to retrieve a pointer to the bitmap data. Compare this with the data
 		returned from CBitmapFont::GetCharacterData().
 @SYMTestExpectedResults
+	No global semaphore called "FBSSessionCacheSemaphore" should exist.
 	When using KNullHandle, CharacterNeedsToBeRasterized() with the first character, is expected to pass
 		proving that the font cache is working as expected when glyphs can fit into it.
 	When using KNullHandle, CharacterNeedsToBeRasterized() with the last character, it expected to fail,
 		proving that the glyph has not been cached in the font glyph cache. (If it had, it would find a
 		match regardless of the	session handle as it looks in the font cache before the session cache).
 */
 void CTFbs::TestFontSessionCacheLookupL()
 	{
 	INFO_PRINTF1(_L("Test Font Session-cache Lookup"));
+	// Make sure the global semaphore is gone for good
+	_LIT(KSessionCacheSemaphoreName, "FBSSessionCacheSemaphore");
+	RSemaphore sem;
+	TEST(sem.OpenGlobal(KSessionCacheSemaphoreName) == KErrNotFound);
 	User::LeaveIfError(RFbsSession::Connect());
 	RFbsSession* fbsSession = RFbsSession::GetSession();
 	CFbsTypefaceStore* ts = CFbsTypefaceStore::NewL(NULL);
 	CleanupStack::PushL(ts);
 	// Send a IPC command to set the font's height with the font's handle
 	TEST(KErrNone == iFbs->SendCommand(EFbsMessSetTwipsHeight, fontHandle, 49));
 	// In a second thread, send a IPC command to set the font's height with the
 	// bitmap's handle.  Should panic with FBServ -6.
-	TFbsTestThreadInfo threadInfo = {EFbsSecondThreadInvalidHandleInIpcCall};
-	TExitCategoryName exitCategoryName(KFbsPanicCategory);
 	_LIT(KTestName, "TestInvalidHandlesInIpcCall");
-	CreateSecondThreadAndCheckPanicL(threadInfo, -6, exitCategoryName, KTestName);
+	CreateSecondThreadAndCheckPanicL(SecondThreadPanicInvalidHandleInIpcCallL, KErrArgument, KFbsPanicCategory, KTestName);
 	iTs->ReleaseFont(font);
 	delete bmp;
 	}
 /**
-Creates a second thread and do some panic tests in it.
+Second thread function for test GRAPHICS-FBSERV-0650. It should panic with FBSERV -6 if the test is successful.
-@param aTestInfo The information for the tests
+*/
-@param aPanicCode The expected panic code
+void CTFbs::SecondThreadPanicInvalidHandleInIpcCallL()
-@param aExitCategory The expected panic category
+	{
-@param aThreadName The name of the new thread
+	User::LeaveIfError(RFbsSession::Connect());
-@leave Gets system wide error code
+	RFbsSession* fbs = RFbsSession::GetSession();
-*/
+	CFbsBitmapEx* bmp = new(ELeave) CFbsBitmapEx();
-void CTFbs::CreateSecondThreadAndCheckPanicL(TFbsTestThreadInfo& aTestInfo, TInt aPanicCode, TExitCategoryName aExitCategory, const TDesC &aThreadName)
+	CleanupStack::PushL(bmp);
+	User::LeaveIfError(bmp->Create(TSize(1,1), EGray2));
+	CFbsTypefaceStore* ts = CFbsTypefaceStore::NewL(NULL);
+	CleanupStack::PushL(ts);
+	CFbsFont* font=NULL;
+	User::LeaveIfError(ts->GetNearestFontToDesignHeightInPixels((CFont*&)font, TFontSpec(KTypefaceName, 15)));
+	TInt bitmapHandle = bmp->BitmapHandle();
+	// Send a IPC command to set twips height of font with a bitmap handle
+	(void)fbs->SendCommand(EFbsMessSetTwipsHeight, bitmapHandle, 49);
+	ts->ReleaseFont(font);
+	CleanupStack::PopAndDestroy(2);
+	RFbsSession::Disconnect();
+	}
+struct TFbsTestDelegator
+	{
+	CTFbs* iTestBase;
+	void (CTFbs::*iMethodPtr)();
+	};
+/**
+Creates a second thread and checks that it panics.
+@param aMethodL The leaving method of CTFbs that the second thread is going to execute.
+@param aPanicCode The expected panic code.
+@param aPanicCategory The expected panic category.
+@param aThreadName The name of the new thread.
+*/
+void CTFbs::CreateSecondThreadAndCheckPanicL(void (CTFbs::*aMethodL)(), TInt aPanicCode, const TDesC& aPanicCategory, const TDesC& aThreadName)
 	{
 	RThread secondThread;
-	User::LeaveIfError(secondThread.Create(aThreadName, SecondThreadStart, KDefaultStackSize, 0x1000, 0x1000, &aTestInfo));
+	TFbsTestDelegator delegator;
+	delegator.iTestBase = this;
+	delegator.iMethodPtr = aMethodL;
+	User::LeaveIfError(secondThread.Create(aThreadName, MethodDelegatorThreadFunction, KDefaultStackSize, 0x1000, 0x1000, &delegator));
 	// Launch second thread
 	TRequestStatus statusSecondThread;
 	secondThread.Logon(statusSecondThread);
-	secondThread.SetPriority(EPriorityLess);
+	secondThread.Resume();
-	secondThread.Resume();
+	// Wait until second thread is finished
 	User::WaitForRequest(statusSecondThread);
+	// Check results
-	if(EExitPanic != secondThread.ExitType())
+	if (EExitPanic != secondThread.ExitType())
 		{
-		ERR_PRINTF3(_L("Expected exit type: %d, Actual exit type: %d"), EExitPanic, secondThread.ExitType());
+		ERR_PRINTF2(_L("Expected exit type: EExitPanic, actual exit type: %d"), secondThread.ExitType());
 		TEST(EFalse);
 		}
+	if (aPanicCode != secondThread.ExitReason())
-	if(aPanicCode != secondThread.ExitReason())
 		{
-		ERR_PRINTF3(_L("Expected panic code: %d, Actual panic code: %d"), aPanicCode, secondThread.ExitReason());
+		ERR_PRINTF3(_L("Expected exit reason: %d, actual exit reason: %d"), aPanicCode, secondThread.ExitReason());
 TEST(EFalse);
 		}
 	TExitCategoryName secondThreadExitCategory = secondThread.ExitCategory();
-	if(aExitCategory != secondThreadExitCategory)
+	if (aPanicCategory != secondThreadExitCategory)
 		{
-		ERR_PRINTF3(_L("Expected panic category: %S, Actual panic category: %S"), &aExitCategory, &secondThreadExitCategory);
+		ERR_PRINTF3(_L("Expected exit category: %S, actual exit category: %S"), &aPanicCategory, &secondThreadExitCategory);
 TEST(EFalse);
 		}
+	// Dispose of the remains of the second thread
-	//Close the handle
 	secondThread.Close();
 	}
-/**
+TInt CTFbs::MethodDelegatorThreadFunction(TAny* aDelegator)
-Second thread entry function.
+	{
-*/
-TInt CTFbs::SecondThreadStart(TAny* aTestInfo)
-	{
-	__UHEAP_MARK;
-TInt procHandles1  =0;
-TInt threadHandles1=0;
-RThread().HandleCount(procHandles1, threadHandles1);
 	CTrapCleanup* cleanupStack = CTrapCleanup::New();
 	if (!cleanupStack)
 	    {
-	    __UHEAP_MARKEND;
 	    return KErrNoMemory;
 	    }
+	TFbsTestDelegator* delegator = static_cast<TFbsTestDelegator*>(aDelegator);
-	TInt result = KErrNone;
+	TRAPD(err, (delegator->iTestBase->*delegator->iMethodPtr)());
-	TRAP(result, SecondThreadMainL(static_cast<TFbsTestThreadInfo*>(aTestInfo)));
 	delete cleanupStack;
+	return err;
-TInt procHandles2  =0;
-TInt threadHandles2=0;
-RThread().HandleCount(procHandles2,threadHandles2);
-if (threadHandles1 != threadHandles2)
-{
-result = KErrGeneral;  // Thread-owned handles not closed
-}
-	__UHEAP_MARKEND;
-	return result;
-	}
-/**
-Run the test contained within the TFbsTestThreadInfo object. A new thread is
-created for each test and only one of the cases in the switch statements
-below will be used.
-@param aTestInfo The parameters for the test
-@return One of the system wide error codes or an enumeration of passed tests.
-*/
-TInt CTFbs::SecondThreadMainL(TFbsTestThreadInfo* aTestInfo)
-{
-TInt result = 0;
-TFbsMultiThreadTestCase testcase = aTestInfo->iTestCase;
-//test cases without the need of an initialised driver
-switch (testcase)
-	{
-case EFbsSecondThreadInvalidHandleInIpcCall:
-	result = SecondThreadPanicInvalidHandleInIpcCall();
-break;
-	}
-return result;
-}
-/**
-Implementation of SecondThread test EFbsSecondThreadInvalidHandleInIpcCall
-@panic FBSERV -6 If the test is successful
-@return One of the system wide error codes.
-*/
-TInt CTFbs::SecondThreadPanicInvalidHandleInIpcCall()
-	{
-	TInt result = RFbsSession::Connect();
-	if (KErrNone != result)
-		{
-		return result;
-		}
-	RFbsSession* fbs = RFbsSession::GetSession();
-	CFbsBitmapEx* bmp = new CFbsBitmapEx();
-	if (!bmp)
-		{
-		return KErrGeneral;
-		}
-	result = bmp->Create(TSize(1,1),EGray2);
-	if(KErrNone != result)
-		{
-		delete bmp;
-		return KErrGeneral;
-		}
-	CFbsTypefaceStore* ts = NULL;
-	ts = (CFbsTypefaceStore*)CFbsTypefaceStore::NewL(NULL);
-	if (!ts)
-		{
-		delete bmp;
-		return KErrGeneral;
-		}
-	CFbsFontEx* font=NULL;
-	result = ts->GetNearestFontToDesignHeightInPixels((CFont*&)font, TFontSpec(KTypefaceName, 15));
-	if (!font)
-		{
-		delete bmp;
-		delete ts;
-		return KErrGeneral;
-		}
-	TInt fontHandle = font->FontHandle();
-	TInt bitmapHandle = bmp->BitmapHandle();
-	// Send a IPC command to set twips height of font with a bitmap handle
-	result = fbs->SendCommand(EFbsMessSetTwipsHeight, bitmapHandle, 49);
-	ts->ReleaseFont(font);
-	delete bmp;
-	delete ts;
-	return result;
 	}
 /**
 @SYMTestCaseID		GRAPHICS-FBSERV-0619
 @SYMTestPriority	High

changeset 187	9f66f99ee56f
parent 0	5d03bc08d59c
child 178	89bd4cfee505