--- a/windowing/windowserver/test/tauto/tmultiptrevent.cpp Fri Sep 17 08:36:49 2010 +0300
+++ b/windowing/windowserver/test/tauto/tmultiptrevent.cpp Mon Oct 04 02:31:51 2010 +0300
@@ -11,7 +11,7 @@
// Contributors:
//
// Description:
-// Multi pointer and Z-coordinate test code
+// Multipointer and Z-coordinate test code
//
//
@@ -1463,7 +1463,7 @@
@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.
@@ -1482,8 +1482,8 @@
*/
void CTMultiPtrEventTest::CapturingMultiPointerEvents()
{
- // Test Capturing of multi pointer events
- // 1. Test Wserv supports Capturing in case of multi-pointer events
+ // Test Capturing of multipointer 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");
@@ -1513,12 +1513,12 @@
}
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)
{
@@ -2864,7 +2864,7 @@
@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
@@ -2913,7 +2913,7 @@
@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
@@ -2972,7 +2972,7 @@
@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.
@@ -2982,8 +2982,8 @@
*/
void CTMultiPtrEventTest::GrabbingMultiPointerEvents()
{
- // Test Grabbing of multi pointer events
- // 1. Test Wserv supports Grabbing in case of multi-pointer events
+ // Test Grabbing of multipointer 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");
@@ -3002,7 +3002,7 @@
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);
@@ -3028,7 +3028,7 @@
@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.
@@ -3038,7 +3038,7 @@
*/
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;
@@ -3058,7 +3058,7 @@
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);
@@ -3068,7 +3068,7 @@
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
@@ -3123,10 +3123,10 @@
@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()
@@ -3136,7 +3136,7 @@
// 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);
@@ -3508,16 +3508,16 @@
@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);
@@ -3646,10 +3646,10 @@
@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()
@@ -3661,7 +3661,7 @@
// 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);
@@ -3937,10 +3937,10 @@
@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()
@@ -3951,7 +3951,7 @@
// 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");
@@ -4051,7 +4051,7 @@
@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
@@ -4059,14 +4059,14 @@
*/
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);
@@ -4205,7 +4205,7 @@
}
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++)
@@ -4255,7 +4255,7 @@
@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
@@ -4279,7 +4279,7 @@
@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
@@ -4311,7 +4311,7 @@
@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