FCL/sf/os/graphics: comparison windowing/windowserver/test/tauto/tmultiptrevent.cpp

equal deleted inserted replaced

-:6a1564a2f3e6
+:18f84489a694
 // Nokia Corporation - initial contribution.
 //
 // Contributors:
 //
 // Description:
-// Multi pointer and Z-coordinate test code
+// Multipointer and Z-coordinate test code
 //
 //
 /**
 @file
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0019
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677,REQ9683,
 @SYMTestPriority		High
-@SYMTestCaseDesc		Checks Wserv supports Capturing in case of multi pointer events.
+@SYMTestCaseDesc		Checks Wserv supports Capturing in case of multipointer events.
 @SYMTestStatus			Implemented
 @SYMTestActions			Create a window with group window as its parent.
 						Create another window with same parent and partially overlapping the first one.
 						SetPointerCapture for second window with TCaptureEnabled flag.
 						capturing even if events were simulated on a window from different group
 */
 void CTMultiPtrEventTest::CapturingMultiPointerEvents()
 	{
-	// Test Capturing of multi pointer events
+	// Test Capturing of multipointer events
-	// 1. Test Wserv supports Capturing in case of multi-pointer events
+	// 1. Test Wserv supports Capturing in case of multipointer events
 	// 2. Test pointer events are delivered correctly when Capturing is disabled.
 	TLogMessageText logText;
 	_LIT(KSet, "CapturingMultiPtrEvents SetOfEvents: %d of 3");
 	logText.AppendFormat(KSet, iEventSet);
 	LOG_MESSAGE(logText);
 				SimulatePointerEvent(TRawEvent::EPointer3DOutOfRange, 0, 0, 0, ptrNum);
 				AddExpectedPointerEvent(TPointerEvent::EOutOfRange, ptrPos, ptrNum);
 				}
 			break;
 		case 1:
-			INFO_PRINTF1(_L("Check Wserv supports Capturing in case of multi-pointer events, within window group"));
+			INFO_PRINTF1(_L("Check Wserv supports Capturing in case of multipointer events, within window group"));
 			iMultiPtrEventClient->ChildWin()->BaseWin()->SetPointerCapture(RWindowBase::TCaptureEnabled);
 			TestCapturingForMultiPointer(EFalse);
 			break;
 		case 2:
-			INFO_PRINTF1(_L("Check Wserv supports Capturing in case of multi-pointer events, from different window groups"));
+			INFO_PRINTF1(_L("Check Wserv supports Capturing in case of multipointer events, from different window groups"));
 			TRAPD(err, CreateGroupWinForCapturingL());	// it cannot leave so trap and fail
 			if (err != KErrNone)
 				{
 				Failed();
 				}
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0032
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677
 @SYMTestPriority		High
-@SYMTestCaseDesc		Checks Wserv supports Double click events for multi pointer events.
+@SYMTestCaseDesc		Checks Wserv supports Double click events for multipointer events.
 @SYMTestStatus			Implemented
 @SYMTestActions			Simulate double click events from different pointers
 @SYMTestExpectedResults The received events must match the simulated pointer events
 */
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0031
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677
 @SYMTestPriority		High
-@SYMTestCaseDesc		Checks Wserv supports Virtual keyboard for multi pointer events.
+@SYMTestCaseDesc		Checks Wserv supports Virtual keyboard for multipointer events.
 @SYMTestStatus			Implemented
 @SYMTestActions			Create virtual keyboard by AddKeyRect() to a window and simulate pointer events from all pointers
 @SYMTestExpectedResults The received events must match the simulated Key events
 */
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0021
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677,REQ9683,
 @SYMTestPriority		High
-@SYMTestCaseDesc		Checks Wserv supports Grabbing in case of multi pointer events.
+@SYMTestCaseDesc		Checks Wserv supports Grabbing in case of multipointer events.
 @SYMTestStatus			Implemented
 @SYMTestActions			Simulate EButton1Down events on iParentWin. Simulate Drag and Button1Up events on iChildWin.
 						SetPointerGrab is called on iParentWin for first test and disabled for the second.
 @SYMTestExpectedResults The Drag and Button1Up events contain a handle to iParentWin when Grabbing active.
 						The Drag and Button1Up events contain a handle to iChildWin when Grabbing disabled.
 */
 void CTMultiPtrEventTest::GrabbingMultiPointerEvents()
 	{
-	// Test Grabbing of multi pointer events
+	// Test Grabbing of multipointer events
-	// 1. Test Wserv supports Grabbing in case of multi-pointer events
+	// 1. Test Wserv supports Grabbing in case of multipointer events
 	// 2. Test pointer events are delivered correctly when Grabbing is disabled.
 	TLogMessageText logText;
 	_LIT(KSet, "GrabbingMultiPtrEvents SetOfEvents: %d of 2");
 	logText.AppendFormat(KSet, iEventSet);
 	LOG_MESSAGE(logText);
 	TPoint ptrPos;
 	switch(iEventSet++)
 		{
 		case 0:
-			INFO_PRINTF1(_L("Check Wserv supports Grabbing in case of multi-pointer events"));
+			INFO_PRINTF1(_L("Check Wserv supports Grabbing in case of multipointer events"));
 			// Check pointer events are delivered to the window where the EButton1Down event occured,
 			// even if subsequent events are simulated outside this window.
 			AddExpectedWsEvent(EEventFocusGained);
 			iMultiPtrEventClient->ParentWin()->BaseWin()->PointerFilter(EPointerFilterDrag, 0);
 			iMultiPtrEventClient->ParentWin()->BaseWin()->SetPointerGrab(ETrue);
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0025
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677,REQ9683,
 @SYMTestPriority		High
-@SYMTestCaseDesc		Checks Wserv supports Filtering in case of multi pointer events.
+@SYMTestCaseDesc		Checks Wserv supports Filtering in case of multipointer events.
 @SYMTestStatus			Implemented
 @SYMTestActions			Simulate Move and Drag events. Add only Button1Up and Button1Down to TWsEvent buffer.
 						Disable Filtering and repeat test with the addition of Move and Drag events to TWsEvent buffer.
 @SYMTestExpectedResults The received events must match the expected simulated raw events
 						The received events must match the simulated raw events
 */
 void CTMultiPtrEventTest::FilteringMultiPointerEvents()
 	{
-	// Test Filtering of multi pointer events
+	// Test Filtering of multipointer events
 	// 1. Test pointer move and drag events are filtered correctly by Wserv
 	// 2. Test pointer events are delivered correctly when Filtered is disabled.
 	TLogMessageText logText;
 	_LIT(KSet, "FilteringMultiPtrEvents SetOfEvents: %d of 2");
 	logText.AppendFormat(KSet, iEventSet);
 	TPoint ptrPos;
 	switch(iEventSet++)
 		{
 		case 0:
-			INFO_PRINTF1(_L("Check pointer move and drag events are filtered with multi-pointer events"));
+			INFO_PRINTF1(_L("Check pointer move and drag events are filtered with multipointer events"));
 			// Check pointer move and drag events are filtered by Wserv
 			AddExpectedWsEvent(EEventFocusGained);
 			// Ensure default values are set i.e. Drag and Move events are filtered out and not delivered to the client.
 			iMultiPtrEventClient->ParentWin()->BaseWin()->PointerFilter(EPointerFilterDrag|EPointerFilterMove,
 																		EPointerFilterDrag|EPointerFilterMove);
 			TestFilteringForMultiPointer(ETrue);
 			break;
 		case 1:
-			INFO_PRINTF1(_L("Check pointer move and drag events are not filtered, with multi-pointer events, when filtering is disabled"));
+			INFO_PRINTF1(_L("Check pointer move and drag events are not filtered, with multipointer events, when filtering is disabled"));
 			// Check move and drag events are not filtered by Wserv when filtering is disabled
 			// Enable Drag and Move events
 			iMultiPtrEventClient->ParentWin()->BaseWin()->PointerFilter(EPointerFilterDrag|EPointerFilterMove, 0);
 			TestFilteringForMultiPointer(EFalse);
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0028
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677, REQ9683
 @SYMTestPriority		High
-@SYMTestCaseDesc		To check Wserv sends multi pointer events in Different screen modes
+@SYMTestCaseDesc		To check Wserv sends multipointer events in Different screen modes
 @SYMTestStatus			Implemented
-@SYMTestActions			Simulate multi pointer events in Different screenmodes
+@SYMTestActions			Simulate multipointer events in Different screenmodes
 @SYMTestExpectedResults The received events must match the simulated raw events
 */
 void CTMultiPtrEventTest::MultiPointerEventsInDiffScreenModes()
 	{
 	// Logic inloved, For a particular screen mode check pointer down/up, moves and drags
 	// for different pointers and for different co-ordinates.
 	// For each screen mode check these events on diffferent rotation that screen mode supports
 	// During the last switch case increment the screenmode
 	TLogMessageText logText;
-	_LIT(KSet, "Multi pointer events in screenmode(%d): %d of 2");
+	_LIT(KSet, "Multipointer events in screenmode(%d): %d of 2");
 	logText.AppendFormat(KSet, iCurrentScreenMode+1, iEventSet);
 	LOG_MESSAGE(logText);
 	TInt numScrMode = iMultiPtrEventClient->iScreen->NumScreenModes();
 	iMultiPtrEventClient->EventBuffer()->SetEventCount(0);
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0027
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677, REQ9683
 @SYMTestPriority		High
-@SYMTestCaseDesc		To check Wserv sends multi pointer events to PointerClickPlugin
+@SYMTestCaseDesc		To check Wserv sends multipointer events to PointerClickPlugin
 @SYMTestStatus			Implemented
-@SYMTestActions			Simulate multi pointer events for PointerClickPlugin
+@SYMTestActions			Simulate multipointer events for PointerClickPlugin
 @SYMTestExpectedResults The received events must match the simulated raw events
 */
 void CTMultiPtrEventTest::MultiPointerEventsForPointerClickL()
 	{
 	TLogMessageText logText;
-	_LIT(KSet, "Multi pointer events for PointerClickPlugin: %d of 4");
+	_LIT(KSet, "Multipointer events for PointerClickPlugin: %d of 4");
 	logText.AppendFormat(KSet, iEventSet);
 	LOG_MESSAGE(logText);
 	iMultiPtrEventClient->EventBuffer()->SetEventCount(0);
 	if (!iEventSet)
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0011
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677,REQ9674,
 @SYMTestPriority		High
-@SYMTestCaseDesc		To check Wserv sends Multi Pointer events to correct clients
+@SYMTestCaseDesc		To check Wserv sends multipointer events to correct clients
 @SYMTestStatus			Implemented
-@SYMTestActions			Simulate multi pointer events on windows from different client.
+@SYMTestActions			Simulate multipointer events on windows from different client.
 @SYMTestExpectedResults The received events must match the simulated raw events
 */
 void CTMultiPtrEventTest::MultiClientMultiPointerEvents()
 	{
 	// Logic for this test code
 	// Simulate events for both main client and secondary simulataneously
 	// Get events from DoRunL() of event buffer class
 	// Before running next set of events, get all the events from secondary client
 	// If test fails on any client make sure both active scheduler are stopped
 	TLogMessageText logText;
-	_LIT(KSet, "Multi pointer events for Multi client: %d of 5");
+	_LIT(KSet, "Multipointer events for Multi client: %d of 5");
 	logText.AppendFormat(KSet, iEventSet);
 	LOG_MESSAGE(logText);
 	iMultiPtrEventClient->EventBuffer()->SetEventCount(0);
 	iSecMultiPtrEventClient->EventBuffer()->SetEventCount(0);
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0013
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677,REQ9683,
 @SYMTestPriority		High
-@SYMTestCaseDesc		To check Wserv sends Multi Pointer events to Anims
+@SYMTestCaseDesc		To check Wserv sends multipointer events to Anims
 @SYMTestStatus			Implemented
-@SYMTestActions			Simulate multi pointer events for anims
+@SYMTestActions			Simulate multipointer events for anims
 @SYMTestExpectedResults The received events must match the simulated raw events
 */
 void CTMultiPtrEventTest::MultiPointerEventsForAnimsL()
 	{
 	// The logic behind these tests is
 	// Create an anim, which creates animation at server side(which swicthes raw event handling on)
 	// Add the required events to the animtaion at server side buffer
 	// Simulate those events and check simulated events are same as required at server side
 	// If any test fail, error description is got from server and displayed in the log file
 	TLogMessageText logText;
-	_LIT(KSet, "Multi pointer events for Anims: %d of 3");
+	_LIT(KSet, "Multipointer events for Anims: %d of 3");
 	logText.AppendFormat(KSet, iEventSet);
 	LOG_MESSAGE(logText);
 	_LIT(KEventsChecked, "Events checked at server side = %d");
 	iMultiPtrEventClient->EventBuffer()->SetEventCount(0);
 /**
 @SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0014
 @SYMPREQ				PREQ1226
 @SYMREQ					REQ9677,REQ9683,
 @SYMTestPriority		High
-@SYMTestCaseDesc		To check Wserv purges multi pointer events with standard rules
+@SYMTestCaseDesc		To check Wserv purges multipointer events with standard rules
 @SYMTestStatus			Implemented
 @SYMTestActions			Simulate raw events to be purged
 @SYMTestExpectedResults The purged events should not be delivered to client
 */
 void CTMultiPtrEventTest::PurgingMultiPointerEvents()
 	{
-	// Test purging of multi pointer events
+	// Test purging of multipointer events
 	// 1. Test down/up pairs are purged
 	// 2. Test moves events are purged
 	// 3. Test drag events are purged
 	// 4. Test lone down events are purged
 	// 5. And finally test lone up events are also purged
 	TLogMessageText logText;
-	_LIT(KSet, "Purging of multi pointer events: %d of 6");
+	_LIT(KSet, "Purging of multipointer events: %d of 6");
 	logText.AppendFormat(KSet, iEventSet);
 	LOG_MESSAGE(logText);
 	iMultiPtrEventClient->EventBuffer()->SetEventCount(0);
 	TInt xInc = iPhysicalScreenSize.iWidth/KMaxQueueSize;
 					AddExpectedPointerEvent(TPointerEvent::EButton1Up, ptrPos, 0, 0, 0);
 					}
 				}
 			break;
 		case 5:
-			// Check PurgePointerEvents works with multi pointer events
+			// Check PurgePointerEvents works with multipointer events
 			ptrPos.iX = xInc;
 			ptrPos.iY = yInc;
 			for (ptrNum = 0; ptrNum < iMaxDevPointers; ptrNum++)
 				{
 				SimulatePointerEvent(TRawEvent::EButton1Up, ptrPos.iX, ptrPos.iY, 0, ptrNum);
 			/**
 			@SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0001
 			@SYMPREQ				PREQ1226
 			@SYMREQ					REQ9674,REQ9687,
 			@SYMTestPriority		High
-			@SYMTestCaseDesc		Checks Wserv sends multi touch pointer events received by it
+			@SYMTestCaseDesc		Checks Wserv sends multipointer pointer events received by it
 			@SYMTestStatus			Implemented
 			@SYMTestActions			Simulate raw events from different pointers
 			@SYMTestExpectedResults The received events must match the simulated raw events
 			*/
 			/**
 			@SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0003
 			@SYMPREQ				PREQ1226
 			@SYMREQ					REQ9674,REQ9687,
 			@SYMTestPriority		High
-			@SYMTestCaseDesc		To check Wserv sends simultaneous multi touch pointer events
+			@SYMTestCaseDesc		To check Wserv sends simultaneous multipointer pointer events
 			@SYMTestStatus			Implemented
 			@SYMTestActions			Simulate simultaneous raw events from different pointers
 			@SYMTestExpectedResults The received events must match the simulated raw events
 			*/
 			/**
 			@SYMTestCaseID			GRAPHICS-WSERV-ADVANCEDPOINTER-0005
 			@SYMPREQ				PREQ1226
 			@SYMREQ					REQ9676
 			@SYMTestPriority		High
-			@SYMTestCaseDesc		To check Wserv sends the multi touch pointer events received
+			@SYMTestCaseDesc		To check Wserv sends the multipointer pointer events received
 									by it along with the Pressure or Proximity
 			@SYMTestStatus			Implemented
 			@SYMTestActions			Simulate raw events with pressure and proximity from different pointers
 			@SYMTestExpectedResults The received events must match the simulated raw events

changeset 194	18f84489a694
parent 110	7f25ef56562d