contacts_plat/predictivesearch_client_api/tsrc/PsClientTestSuite/conf/PsClientTestSuite.cfg
branchRCL_3
changeset 6 e8e3147d53eb
parent 0 e686773b3f54
child 13 a6539d1e8e43
--- a/contacts_plat/predictivesearch_client_api/tsrc/PsClientTestSuite/conf/PsClientTestSuite.cfg	Fri Mar 12 15:41:25 2010 +0200
+++ b/contacts_plat/predictivesearch_client_api/tsrc/PsClientTestSuite/conf/PsClientTestSuite.cfg	Mon Mar 15 12:39:26 2010 +0200
@@ -8,26 +8,40 @@
 //#                                                                            #
 //# TC_ITU: Test Case for ITUT keyboard.                                       #
 //# TC_N97: Test Case for N97 3x11 keyboard.                                   #
+//# TC_N00: Test Case for XXX 4x10 keyboard. (Phone model name not known yet)  #
+//# TC_DEA: Test Case Deactivated. Use in comments only.                       #
 //#                                                                            #
 //# NOTES:                                                                     #
 //#                                                                            #
-//# - In the ITUT keyboard the "0" and the " " are on the same key.            #
-//#   Therefore if some clients deliver a "0" in Itut (or predictive) mode,    #
+//# - In ITUT keyboard "0" and " " are on the same key.                        #
+//#   Therefore if some clients deliver a "0" in Itut predictive mode,         #
 //#   then the "0" has the double nature of a "0" and of a " " (separator).    #
 //#                                                                            #
-//# - In the N97 3x11 keyboard the "0" and the " " are different keys.         #
-//#   Therefore if some clients deliver a "0" in Itut (or predictive) mode,    #
+//# - In N97-3x11 and N00-4x10 keyboards "0" and " " are on different keys.    #
+//#   Therefore if some clients deliver a "0" in Qwerty predictive mode,       #
 //#   then the "0" has the single nature of a "0" (not a separator).           #
 //#                                                                            #
-//# - The test driver for SearchOnInputString, TC_ITU_SearchOnInputString      #
-//#   and TC_N97_SearchOnInputString is identical.                             #
-//#   The naming is different in order to comment/uncomment the test cases     #
-//#   more easily.                                                             #
+//# - The SearchOnInputString and TC_<XXX>_SearchOnInputString test            #
+//#   drivers are identical. The naming is different in order to               #
+//#   comment/uncomment the test cases more easily.                            #
+//#   XXX = [ITU, N97, N00].                                                   #
+//#                                                                            #
+//# - The SearchLookupMatchString and TC_<XXX>_SearchLookupMatchString test    #
+//#   drivers are identical. The naming is different in order to               #
+//#   comment/uncomment the test cases more easily.                            #
+//#   XXX = [ITU, N97, N00].                                                   #
 //#                                                                            #
-//# - The test driver for TestSearchingInCache, TC_ITU_TestSearchingInCache    #
-//#   and TC_N97_TestSearchingInCache is identical.                            #
-//#   The naming is different in order to comment/uncomment the test cases     #
-//#   more easily.                                                             #
+//# - The TestSearchingInCache and TC_<XXX>_TestSearchingInCache test          #
+//#   drivers are identical. The naming is different in order to               #
+//#   comment/uncomment the test cases more easily.                            #
+//#   XXX = [ITU, N97, N00].                                                   #
+//#                                                                            #
+//# - The test:                                                                #
+//#       api TC_N<XX>_SearchOnInputString "IPSTR[Fake_Test]"                  #
+//#           "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]"              #
+//#           "MATCHLOC[0:1]"                                                  #
+//#   is a fake test that succeeds always. It can be used temporarily when for #
+//#   a certain keyboard there is not KeyMap available yet.                    #
 //#                                                                            #
 //##############################################################################
 
@@ -45,7 +59,7 @@
 title SU: Start Up the Server
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[6,EItut,EAlphaSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[6,EPredictiveItuT,EAlphaSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
@@ -182,116 +196,182 @@
 
 //******************************************************************************
 [Test]
-title IS: Single word (Itut)
+title IS: Single word (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchOnInputString "IPSTR[Adam]" "SQ[23,EItut,EPatternSort,5]" "RES[1,(-1:AD)]" "MATCHLOC[0:2]"
-//api TC_N97_SearchOnInputString "IPSTR[Adam]" "SQ[@-,EItut,EPatternSort,5]" "RES[1,(-1:AD)]" "MATCHLOC[0:2]"
+api TC_ITU_SearchOnInputString "IPSTR[Adam]" "SQ[23,EPredictiveItuT,EPatternSort,5]" "RES[1,(-1:AD)]" "MATCHLOC[0:2]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Multi Search (Itut)
+title IS: Single word (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchOnInputString "IPSTR[Adam Dory Dusk]" "SQ[20303,EItut,EPatternSort,5]" "RES[1,(-1:A,-1:D)]" "MATCHLOC[0:1,5:1,10:1]"
-//api TC_N97_SearchOnInputString "IPSTR[Adam Dory Dusk]" "SQ[@ D -,EItut,EPatternSort,5]" "RES[1,(-1:A,-1:D)]" "MATCHLOC[0:1,5:1,10:1]"
+//api TC_N97_SearchOnInputString "IPSTR[Adam]" "SQ[@-,EPredictiveQwerty,EPatternSort,5]" "RES[1,(-1:AD)]" "MATCHLOC[0:2]"
+//api TC_DEA_SearchOnInputString "IPSTR[Just]" "SQ[+7,EPredictiveQwerty,EPatternSort,5]" "RES[1,(-1:JU)]" "MATCHLOC[0:2]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title IS: Multi Search (Predictive ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_SearchOnInputString "IPSTR[Adam Dory Dusk]" "SQ[20303,EPredictiveItuT,EPatternSort,5]" "RES[1,(-1:A,-1:D)]" "MATCHLOC[0:1,5:1,10:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Single word (Qwerty)
+title IS: Multi Search (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api SearchOnInputString "IPSTR[Hull]" "SQ[hu,EQwerty,EPatternSort,5]" "RES[1,(-1:HU)]" "MATCHLOC[0:2]"
+//api TC_N97_SearchOnInputString "IPSTR[Adam Dory Dusk]" "SQ[@ D -,EPredictiveQwerty,EPatternSort,5]" "RES[1,(-1:A,-1:D)]" "MATCHLOC[0:1,5:1,10:1]"
+//api TC_DEA_SearchOnInputString "IPSTR[Just Luke Last]" "SQ[+ L *,EPredictiveQwerty,EPatternSort,5]" "RES[1,(-1:J,-1:L)]" "MATCHLOC[0:1,5:1,10:1]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title IS: Single word (Non-predictive)
+create PsClientTestSuite api
+api WriteTitleToLog
+api SearchOnInputString "IPSTR[Hull]" "SQ[hu,ENonPredictive,EPatternSort,5]" "RES[1,(-1:HU)]" "MATCHLOC[0:2]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Multi Search (Qwerty)
+title IS: Multi Search (Non-predictive)
 create PsClientTestSuite api
 api WriteTitleToLog
-api SearchOnInputString "IPSTR[Gill Monk]" "SQ[m g,EQwerty,EAlphaSort,5]" "RES[1,(-1:G,-1:M)]" "MATCHLOC[0:1,5:1]"
+api SearchOnInputString "IPSTR[Gill Monk]" "SQ[m g,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:G,-1:M)]" "MATCHLOC[0:1,5:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Single word (Mixed)
+title IS: Single word (Mixed ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchOnInputString "IPSTR[Xen]" "SQ[9e,iq,EPatternSort,5]" "RES[1,(-1:XE)]" "MATCHLOC[0:2]"
-//api TC_N97_SearchOnInputString "IPSTR[Xen]" "SQ[)e,iq,EPatternSort,5]" "RES[1,(-1:XE)]" "MATCHLOC[0:2]"
+api TC_ITU_SearchOnInputString "IPSTR[Xen]" "SQ[9e,in,EPatternSort,5]" "RES[1,(-1:XE)]" "MATCHLOC[0:2]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title IS: Single word (Mixed QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_SearchOnInputString "IPSTR[Xen]" "SQ[)e,qn,EPatternSort,5]" "RES[1,(-1:XE)]" "MATCHLOC[0:2]"
+//api TC_DEA_SearchOnInputString "IPSTR[Hen]" "SQ[-e,qn,EPatternSort,5]" "RES[1,(-1:HE)]" "MATCHLOC[0:2]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Multi Search (Mixed)
+title IS: Multi Search (Mixed ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchOnInputString "IPSTR[Tim Monk]" "SQ[80m6,iiqi,EAlphaSort,5]" "RES[1,(-1:MO,-1:T)]" "MATCHLOC[0:1,4:2]"
-//api TC_N97_SearchOnInputString "IPSTR[Tim Monk]" "SQ[5 m9,iiqi,EAlphaSort,5]" "RES[1,(-1:MO,-1:T)]" "MATCHLOC[0:1,4:2]"
+api TC_ITU_SearchOnInputString "IPSTR[Tim Monk]" "SQ[80m6,iini,EAlphaSort,5]" "RES[1,(-1:MO,-1:T)]" "MATCHLOC[0:1,4:2]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Single word (Itut) -> No result
+title IS: Multi Search (Mixed QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api SearchOnInputString "IPSTR[Adam]" "SQ[93,EItut,EPatternSort,5]" "RES[0,]" "MATCHLOC[]"
+//api TC_N97_SearchOnInputString "IPSTR[Tim Monk]" "SQ[5 m9,qqnq,EAlphaSort,5]" "RES[1,(-1:MO,-1:T)]" "MATCHLOC[0:1,4:2]"
+//api TC_DEA_SearchOnInputString "IPSTR[Tim Monk]" "SQ[5 m9,qqnq,EAlphaSort,5]" "RES[1,(-1:MO,-1:T)]" "MATCHLOC[0:1,4:2]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title IS: Single word (Predictive ITU-T) -> No result
+create PsClientTestSuite api
+api WriteTitleToLog
+api SearchOnInputString "IPSTR[Adam]" "SQ[93,EPredictiveItuT,EPatternSort,5]" "RES[0,]" "MATCHLOC[]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title IS: Multi Search (Predictive ITU-T) -> Partial match (1)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_SearchOnInputString "IPSTR[Adam Dory Dusk]" "SQ[202,EPredictiveItuT,EAlphaSort,5]" "RES[1,(-1:A)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Multi Search (Itut) -> Partial match (1)
+title IS: Multi Search (Predictive QWERTY) -> Partial match (1)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchOnInputString "IPSTR[Adam Dory Dusk]" "SQ[202,EItut,EAlphaSort,5]" "RES[1,(-1:A)]" "MATCHLOC[0:1]"
-//api TC_N97_SearchOnInputString "IPSTR[Adam Dory Dusk]" "SQ[@ @,EItut,EAlphaSort,5]" "RES[1,(-1:A)]" "MATCHLOC[0:1]"
+//api TC_N97_SearchOnInputString "IPSTR[Adam Dory Dusk]" "SQ[@ @,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(-1:A)]" "MATCHLOC[0:1]"
+//api TC_DEA_SearchOnInputString "IPSTR[Just Luke Last]" "SQ[+ +,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(-1:J)]" "MATCHLOC[0:1]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title IS: Multi Search (Predictive ITU-T) -> Partial match (2)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_SearchOnInputString "IPSTR[Tim Monk]" "SQ[808,EPredictiveItuT,EAlphaSort,5]" "RES[1,(-1:T)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Multi Search (Itut) -> Partial match (2)
+title IS: Multi Search (Predictive QWERTY) -> Partial match (2)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchOnInputString "IPSTR[Tim Monk]" "SQ[808,EItut,EAlphaSort,5]" "RES[1,(-1:T)]" "MATCHLOC[0:1]"
-//api TC_N97_SearchOnInputString "IPSTR[Tim Monk]" "SQ[5 5,EItut,EAlphaSort,5]" "RES[1,(-1:T)]" "MATCHLOC[0:1]"
+//api TC_N97_SearchOnInputString "IPSTR[Tim Monk]" "SQ[5 5,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(-1:T)]" "MATCHLOC[0:1]"
+//api TC_DEA_SearchOnInputString "IPSTR[Tim Monk]" "SQ[5 5,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(-1:T)]" "MATCHLOC[0:1]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Empty String (Itut) -> No result
+title IS: Empty String (Predictive ITU-T) -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api SearchOnInputString "IPSTR[]" "SQ[23,EItut,EPatternSort,5]" "RES[0,]" "MATCHLOC[]"
+api SearchOnInputString "IPSTR[]" "SQ[23,EPredictiveItuT,EPatternSort,5]" "RES[0,]" "MATCHLOC[]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title IS: Only spaces string (Itut)- No result
+title IS: Only spaces string (Predictive ITU-T)- No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api SearchOnInputString "IPSTR[   ]" "SQ[23,EItut,EPatternSort,5]" "RES[0,]" "MATCHLOC[]"
+api SearchOnInputString "IPSTR[   ]" "SQ[23,EPredictiveItuT,EPatternSort,5]" "RES[0,]" "MATCHLOC[]"
 delete api
 [Endtest]
 
@@ -302,51 +382,101 @@
 
 //******************************************************************************
 [Test]
-title LM: Trivial
+title LM: Trivial (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[222022,EItut,EPatternSort,5]" "RESSTR[Abc Bc]"
-//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[aaa aa,EItut,EPatternSort,5]" "RESSTR[Aa@ @A]"
+api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[222022,EPredictiveItuT,EPatternSort,5]" "RESSTR[Abc Bc]"
 delete api
 [Endtest]
 
 //******************************************************************************
 [Test]
-title LM: Single backtrack
+title LM: Trivial (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[220222,EItut,EPatternSort,5]" "RESSTR[Bc Abc]"
-//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[aa aaa,EItut,EPatternSort,5]" "RESSTR[@A Aa@]"
+//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[aaa aa,EPredictiveQwerty,EPatternSort,5]" "RESSTR[Aa@ @A]"
+//api TC_DEA_SearchLookupMatchString "IPSTR[Ll* *L 123 l]" "SQ[lll ll,EPredictiveQwerty,EPatternSort,5]" "RESSTR[Ll* *L]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+//******************************************************************************
+[Test]
+title LM: Single backtrack (Predictive ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[220222,EPredictiveItuT,EPatternSort,5]" "RESSTR[Bc Abc]"
+delete api
+[Endtest]
+
+//******************************************************************************
+[Test]
+title LM: Single backtrack (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[aa aaa,EPredictiveQwerty,EPatternSort,5]" "RESSTR[@A Aa@]"
+//api TC_DEA_SearchLookupMatchString "IPSTR[Ll* *L 123 l]" "SQ[ll lll,EPredictiveQwerty,EPatternSort,5]" "RESSTR[*L Ll*]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 //******************************************************************************
 [Test]
-title LM: Double backtrack
+title LM: Double backtrack (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[20220222,EItut,EPatternSort,5]" "RESSTR[c Bc Abc]"
-//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[a aa aaa,EItut,EPatternSort,5]" "RESSTR[a @A Aa@]"
+api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[20220222,EPredictiveItuT,EPatternSort,5]" "RESSTR[c Bc Abc]"
+delete api
+[Endtest]
+
+//******************************************************************************
+[Test]
+title LM: Double backtrack (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[a aa aaa,EPredictiveQwerty,EPatternSort,5]" "RESSTR[a @A Aa@]"
+//api TC_DEA_SearchLookupMatchString   "IPSTR[Ll* *L 123 l]" "SQ[l ll lll,EPredictiveQwerty,EPatternSort,5]" "RESSTR[l *L Ll*]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 //******************************************************************************
 [Test]
-title LM: Spaces in query and in result
+title LM: Spaces in query and in result (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[ 22 1 2 ,EItut,EPatternSort,5]" "RESSTR[ Ab 1 B ]"
-//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[ aa q a ,EItut,EPatternSort,5]" "RESSTR[ Aa 1 @ ]"
+api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[ 22 1 2 ,EPredictiveItuT,EPatternSort,5]" "RESSTR[ Ab 1 B ]"
 delete api
 [Endtest]
 
 //******************************************************************************
 [Test]
-title LM: Not matched
+title LM: Spaces in query and in result (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[2222,EItut,EPatternSort,5]" "RESSTR[]"
-//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[aaaa,EItut,EPatternSort,5]" "RESSTR[]"
+//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[ aa q a ,EPredictiveQwerty,EPatternSort,5]" "RESSTR[ Aa 1 @ ]"
+//api TC_DEA_SearchLookupMatchString "IPSTR[Ll* *L 123 l]" "SQ[ ll q l ,EPredictiveQwerty,EPatternSort,5]" "RESSTR[ Ll 1 * ]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+//******************************************************************************
+[Test]
+title LM: Not matched (Predictive ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_SearchLookupMatchString "IPSTR[Abc Bc 123 c]" "SQ[2222,EPredictiveItuT,EPatternSort,5]" "RESSTR[]"
+delete api
+[Endtest]
+
+//******************************************************************************
+[Test]
+title LM: Not matched (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_SearchLookupMatchString "IPSTR[Aa@ @A 123 a]" "SQ[aaaa,EPredictiveQwerty,EPatternSort,5]" "RESSTR[]"
+//api TC_DEA_SearchLookupMatchString "IPSTR[Ll* *L 123 l]" "SQ[llll,EPredictiveQwerty,EPatternSort,5]" "RESSTR[]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
@@ -382,485 +512,787 @@
 
 //******************************************************************************
 [Test]
-title CS: Search by FirstName (Itut)
+title CS: Search by FirstName (Predictive Default)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[624374,EItut,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!@H3/#,EItut,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+// 5.0: 3x11 Qwerty is default keyboard for N97
+// 9.2: ITU-T is default keyboard if physical keyboard is not present
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!@H3/#,EPredictiveDefaultKeyboard,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[)aH3s-,EPredictiveDefaultKeyboard,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api TC_N00_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[624374,EPredictiveDefaultKeyboard,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search by FirstName (Predictive ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[624374,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search by FirstName (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!@H3/#,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[)aH3s-,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search by FirstName (Qwerty)
+title CS: Search by FirstName (Non-predictive)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[mahesh,EQwerty,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[mahesh,ENonPredictive,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search by FirstName (Mixed)
+title CS: Search by FirstName (Mixed Default)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[62h3,iiqi,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!@h3,iiqi,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+// 5.0: 3x11 Qwerty is default keyboard for N97
+// 9.2: ITU-T is default keyboard if physical keyboard is not present
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!@h3,ddnd,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[)ah3,ddnd,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api TC_N00_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[62h3,ddnd,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search by LastName (Itut)
+title CS: Search by FirstName (Mixed ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[3672479,EItut,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[-94@8/2,EItut,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[62h3,iini,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search by FirstName (Mixed QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!@h3,qqnq,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[)ah3,qqnq,EPatternSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search by LastName (Qwerty)
+title CS: Search by FirstName (Predictive ITU-T and QWERTY) - Double Keyboard
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[doraiswamy,EQwerty,EPatternSort,8]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!2H37#,qiqiiq,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[)2H37-,qiqiiq,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
-//****************************************************************************
+//******************************************************************************
 [Test]
-title CS: Search by LastName (Mixed)
+title CS: Search by LastName (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[ve558,qqiii,EAlphaSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[ve:;7,qqiii,EAlphaSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[3672479,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search by LastName (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[-94@8/2,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[d94a8s2,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search by CompanyName (Itut)
+title CS: Search by LastName (Non-predictive)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[doraiswamy,ENonPredictive,EPatternSort,8]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//****************************************************************************
+[Test]
+title CS: Search by LastName (Mixed ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[66867,EItut,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!9594,EItut,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[ve558,nniii,EAlphaSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+[Test]
+title CS: Search by LastName (Mixed QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[ve:;7,nnqqq,EAlphaSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[ve*#7,nnqqq,EAlphaSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search by CompanyName (Qwerty)
+title CS: Search by CompanyName (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[motor,EQwerty,EPatternSort,8]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
-delete api
-[Endtest]
-
-
-//****************************************************************************
-[Test]
-title CS: Search by CompanyName (Mixed)
-create PsClientTestSuite api
-api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[mo867,qqiii,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[mo594,qqiii,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[66867,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multiple words contact (Itut)
+title CS: Search by CompanyName (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5472,EItut,EPatternSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[;84@,EItut,EPatternSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[!9594,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[)9594,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multiple (very many) words contact (Itut)
+title CS: Search by CompanyName (Non-predictive)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[motor,ENonPredictive,EPatternSort,8]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
+delete api
+[Endtest]
+
+
+//****************************************************************************
+[Test]
+title CS: Search by CompanyName (Mixed ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[529,EItut,EAlphaSort,5]" "RES[1,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[*@6,EItut,EAlphaSort,5]" "RES[1,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[mo867,nniii,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
+delete api
+[Endtest]
+
+
+//****************************************************************************
+[Test]
+title CS: Search by CompanyName (Mixed QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[mo594,nnqqq,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[mo594,nnqqq,EAlphaSort,5]" "RES[1,(FN:chiru,LN:devi,CN:motorola)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multiple words contact with same initials (Itut)
+title CS: Multiple words contact (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5727,EItut,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[:0%/,EItut,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5472,EPredictiveItuT,EPatternSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multiple words contact with same initials (Qwerty)
+title CS: Multiple words contact (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[lpcs,EQwerty,EAlphaSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[;84@,EPredictiveQwerty,EPatternSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[#84a,EPredictiveQwerty,EPatternSort,5]" "RES[1,(FN:ravi kiran,LN:velkud,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multiple (very many) words contact (Predictive ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[529,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multiple words contact with same initials (Mixed)
+title CS: Multiple (very many) words contact (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[l7c7,qiqi,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[l0c/,qiqi,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[*@6,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+a6,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut)
+title CS: Multiple words contact with same initials (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[44055,EItut,EAlphaSort,5]" "RES[1,(FN:ghi,LN:jkl,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[=# *;,EItut,EAlphaSort,5]" "RES[1,(FN:ghi,LN:jkl,CN:Nokia)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5727,EPredictiveItuT,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multiple words contact with same initials (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[:0%/,EPredictiveQwerty,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[*0cs,EPredictiveQwerty,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut) - Space as sep
+title CS: Multiple words contact with same initials (Non-predictive)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[8 56,EItut,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5 *9,EItut,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[lpcs,ENonPredictive,EAlphaSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multiple words contact with same initials (Mixed ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[l7c7,nini,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut) - 0 as sep
+title CS: Multiple words contact with same initials (Mixed QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[8056,EItut,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[50*9,EItut,EAlphaSort,5]" "RES[0,]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[l0c/,nqnq,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[l0cs,nqnq,EPatternSort,5]" "RES[1,(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut) - 0 and space as sep
+title CS: Multi Search (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[80 56,EItut,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[50 *9,EItut,EAlphaSort,5]" "RES[0,]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[44055,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:ghi,LN:jkl,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[=# *;,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:ghi,LN:jkl,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[G- +#,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:ghi,LN:jkl,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Qwerty) - Space as sep
+title CS: Multi Search (Predictive ITU-T) - Space as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j t,EQwerty,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[8 56,EPredictiveItuT,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Predictive QWERTY) - Space as sep
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5 *9,EPredictiveQwerty,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5 +9,EPredictiveQwerty,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Qwerty) - 0 as NON sep (Qwerty 0)
+title CS: Multi Search (Predictive ITU-T) - 0 as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j0t,EQwerty,EAlphaSort,5]" "RES[0,]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j0t,EQwerty,EAlphaSort,5]" "RES[0,]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[8056,EPredictiveItuT,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Mixed) mode - Space as sep
+title CS: Multi Search (Predictive QWERTY) - 0 as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j6 8i,qiqiq,EPatternSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j9 5i,qiqiq,EPatternSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[50*9,EPredictiveQwerty,EAlphaSort,5]" "RES[0,]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[50+9,EPredictiveQwerty,EAlphaSort,5]" "RES[0,]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Mixed) - 0 as sep
+title CS: Multi Search (Predictive ITU-T) - 0 and space as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j608i,qiiiq,EAlphaSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j905i,qiiiq,EAlphaSort,5]" "RES[0,]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[80 56,EPredictiveItuT,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Predictive QWERTY) - 0 and space as sep
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[50 *9,EPredictiveQwerty,EAlphaSort,5]" "RES[0,]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[50 +9,EPredictiveQwerty,EAlphaSort,5]" "RES[0,]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Mixed) - 0 as NON sep (Qwerty 0)
+title CS: Multi Search (Non-predictive) - Space as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j608i,qiqiq,EAlphaSort,5]" "RES[0,]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j905i,qiqiq,EAlphaSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j t,ENonPredictive,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Mixed) - 0 and space as sep
+title CS: Multi Search (Non-predictive) - 0 as NON sep (Qwerty 0)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j60 8i,qiiiiq,EAlphaSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j90 5i,qiiiiq,EAlphaSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j0t,ENonPredictive,EAlphaSort,5]" "RES[0,]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Mixed ITU-T) - Space as sep
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j6 8i,ninin,EPatternSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut) -> more than one result
+title CS: Multi Search (Mixed QWERTY) - Space as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[807,EItut,EPatternSort,5]" "RES[2,(FN:ravi kiran,LN:velkud,CN:Nokia)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[& 4,EItut,EPatternSort,5]" "RES[2,(FN:ravi kiran,LN:velkud,CN:Nokia)(FN:4four,LN:&ampli,CN:Nokia)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j9 5i,nqnqn,EPatternSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j9 5i,nqnqn,EPatternSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Mixed ITU-T) - 0 as sep
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j608i,niiin,EAlphaSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search Contact starting with + (Itut)
+title CS: Multi Search (Mixed QWERTY) - 0 as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+25536,EItut,EAlphaSort,5]" "RES[1,(FN:+allen,LN:good,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+@::3?,EItut,EAlphaSort,5]" "RES[1,(FN:+allen,LN:good,CN:Nokia)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j905i,nqqqn,EAlphaSort,5]" "RES[0,]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j905i,nqqqn,EAlphaSort,5]" "RES[0,]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search contact starting with + (Qwerty)
+title CS: Multi Search (Mixed ITU-T) - 0 as NON sep (Qwerty 0)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+allen,EQwerty,EPatternSort,5]" "RES[1,(FN:+allen,LN:good,CN:Nokia)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j608i,ninin,EAlphaSort,5]" "RES[0,]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Mixed QWERTY) - 0 as NON sep (Qwerty 0)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j905i,nqnqn,EAlphaSort,5]" "RES[0,]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j905i,nqnqn,EAlphaSort,5]" "RES[0,]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search with + (Itut)
+title CS: Multi Search (Mixed ITU-T) - 0 and space as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+0+,EItut,EAlphaSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+ +,EItut,EAlphaSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j60 8i,niiiin,EAlphaSort,5]" "RES[1,(FN:Tim,LN:Jones,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut) -> No result
+title CS: Multi Search (Mixed QWERTY) - 0 and space as sep
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[209,EItut,EAlphaSort,5]" "RES[0,]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j90 5i,nqqqqn,EAlphaSort,5]" "RES[0,]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[j90 5i,nqqqqn,EAlphaSort,5]" "RES[0,]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Predictive ITU-T) -> more than one result
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[807,EPredictiveItuT,EPatternSort,5]" "RES[2,(FN:ravi kiran,LN:velkud,CN:Nokia)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Predictive QWERTY) -> more than one result
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[& 4,EPredictiveQwerty,EPatternSort,5]" "RES[2,(FN:ravi kiran,LN:velkud,CN:Nokia)(FN:4four,LN:&ampli,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[( 4,EPredictiveQwerty,EPatternSort,5]" "RES[2,(FN:ravi kiran,LN:velkud,CN:Nokia)(FN:4four,LN:&ampli,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut) - Query with more than 2 words
+title CS: Search Contact starting with + (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[805606,EItut,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5 *9 ?,EItut,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+25536,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:+allen,LN:good,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search Contact starting with + (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+@::3?,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:+allen,LN:good,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+a**3(,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:+allen,LN:good,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search (Itut) -> No result
+title CS: Search contact starting with + (Non-predictive)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[42423262374,EItut,EAlphaSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+allen,ENonPredictive,EPatternSort,5]" "RES[1,(FN:+allen,LN:good,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search (Qwerty) -> No result
+title CS: Multi Search with + (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[deepakrsrs,EQwerty,EPatternSort,5]" "RES[0,]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+0+,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search (Mixed) -> No result
+title CS: Multi Search with + (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[dee789srs,qqqiiiqqq,EAlphaSort,5]" "RES[0,]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+ +,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+ 5,EPredictiveQwerty,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Predictive ITU-T) -> No result
+create PsClientTestSuite api
+api WriteTitleToLog
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[209,EPredictiveItuT,EAlphaSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut) -> No result
+title CS: Multi Search (Predictive ITU-T) - Query with more than 2 words
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[4242 3262374,EItut,EPatternSort,5]" "RES[0,]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[805606,EPredictiveItuT,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Qwerty) -> No result
+title CS: Multi Search (Predictive QWERTY) - Query with more than 2 words
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[deepa krsrs,EQwerty,EAlphaSort,5]" "RES[0,]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5 *9 ?,EPredictiveQwerty,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5 +9 (,EPredictiveQwerty,EAlphaSort,5]" "RES[2,(FN:Tim,LN:Jones,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search (Predictive ITU-T) -> No result
+create PsClientTestSuite api
+api WriteTitleToLog
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[42423262374,EPredictiveItuT,EAlphaSort,5]" "RES[0,]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search (Non-predictive) -> No result
+create PsClientTestSuite api
+api WriteTitleToLog
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[deepakrsrs,ENonPredictive,EPatternSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Mixed) -> No result
+title CS: Search (Mixed ITU-T) -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[dee78 9srs,qqqiiiiqqq,EPatternSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[dee789srs,nnniiinnn,EAlphaSort,5]" "RES[0,]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Predictive ITU-T) -> No result
+create PsClientTestSuite api
+api WriteTitleToLog
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[4242 3262374,EPredictiveItuT,EPatternSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Wrong URI (Itut) -> No result
+title CS: Multi Search (Non-predictive) -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:Wronguricontacts.cdb]" "SQ[5,EItut,EAlphaSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[deepa krsrs,ENonPredictive,EAlphaSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Wrong URI (Itut) -> No result
+title CS: Multi Search (Mixed ITU-T) -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:Wronguricontacts.cdb]" "SQ[t,EQwerty,EAlphaSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[dee78 9srs,nnniiiinnn,EPatternSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Wrong URI (Mixed) -> No result
+title CS: Wrong URI (Predictive ITU-T) -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:Wronguricontacts.cdb]" "SQ[dee7809srs,qqqiiiiqqq,EPatternSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:Wronguricontacts.cdb]" "SQ[5,EPredictiveItuT,EAlphaSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Filter Display Fields (Itut)
+title CS: Wrong URI (Non-predictive) -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "DISP[28]" "SQ[624374,EItut,EPatternSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:Wronguricontacts.cdb]" "SQ[t,ENonPredictive,EAlphaSort,5]" "RES[0,]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Wrong URI (Mixed ITU-T) -> No result
+create PsClientTestSuite api
+api WriteTitleToLog
+api TestSearchingInCache "URI[cntdb:\/\/c:Wronguricontacts.cdb]" "SQ[dee7809srs,nnniiiinnn,EPatternSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Filter Display Fields (Qwerty)
+title CS: Filter Display Fields (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "DISP[28]" "SQ[mahesh,EQwerty,EPatternSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "DISP[28]" "SQ[624374,EPredictiveItuT,EPatternSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Filter Display Fields (Mixed)
+title CS: Filter Display Fields (Non-predictive)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "DISP[28]" "SQ[ma43sh,qqiiqq,EPatternSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "DISP[28]" "SQ[mahesh,ENonPredictive,EPatternSort,5]" "RES[0,]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Filter Display Fields (Mixed ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "DISP[28]" "SQ[ma43sh,nniinn,EPatternSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Qwerty) - Filter Display Fields
+title CS: Multi Search (Non-predictive) - Filter Display Fields
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "DISP[28]" "SQ[ravi velkud,EQwerty,EAlphaSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "DISP[28]" "SQ[ravi velkud,ENonPredictive,EAlphaSort,5]" "RES[0,]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Groups Search (Predictive ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[8434768,EPredictiveItuT,EPatternSort,5]" "RES[1,(FN:TheGroup)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Groups Search (Itut)
+title CS: Groups Search (Predictive QWERTY)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[8434768,EItut,EPatternSort,5]" "RES[1,(FN:TheGroup)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[5#3=497,EItut,EPatternSort,5]" "RES[1,(FN:TheGroup)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[5#3=497,EPredictiveQwerty,EPatternSort,5]" "RES[1,(FN:TheGroup)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[5-3G497,EPredictiveQwerty,EPatternSort,5]" "RES[1,(FN:TheGroup)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Groups Search (Qwerty)
+title CS: Groups Search (Non-predictive)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[TheGrou,EQwerty,EPatternSort,5]" "RES[1,(FN:TheGroup)]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[TheGrou,ENonPredictive,EPatternSort,5]" "RES[1,(FN:TheGroup)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Groups Search (Mixed)
+title CS: Groups Search (Mixed ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[843g7o8,iiiqiqi,EAlphaSort,5]" "RES[1,(FN:TheGroup)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[5#3g4o7,iiiqiqi,EAlphaSort,5]" "RES[1,(FN:TheGroup)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[843g7o8,iiinini,EAlphaSort,5]" "RES[1,(FN:TheGroup)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Groups Search (Mixed QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[5#3g4o7,qqqnqnq,EAlphaSort,5]" "RES[1,(FN:TheGroup)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb]" "SQ[5-3g4o7,qqqnqnq,EAlphaSort,5]" "RES[1,(FN:TheGroup)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
@@ -870,7 +1302,7 @@
 title CS: Search in more than one group -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb?id=3221,cntdb:\/\/c:contacts.gdb?id=1132]" "SQ[624374,EItut,EPatternSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb?id=3221,cntdb:\/\/c:contacts.gdb?id=1132]" "SQ[624374,EPredictiveItuT,EPatternSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
@@ -880,18 +1312,39 @@
 title CS: Search in non-existing group ID -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb?id=3221]" "SQ[624374,EItut,EPatternSort,5]" "RES[0,]"
+api TestSearchingInCache "URI[cntdb:\/\/c:contacts.gdb?id=3221]" "SQ[624374,EPredictiveItuT,EPatternSort,5]" "RES[0,]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Multi Search (Predictive ITU-T) Scandinavian chars - space as sep 
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[Ä78 Ö,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:Ästrid,LN:Öhlm,CN:Åppres)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Multi Search (Itut) Scandinavian chars - space as sep 
+title CS: Multi Search (Predictive QWERTY) Scandinavian chars - space as sep 
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[Ä78 Ö,EItut,EAlphaSort,5]" "RES[1,(FN:Ästrid,LN:Öhlm,CN:Åppres)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[Ä/5 Ö,EItut,EAlphaSort,5]" "RES[1,(FN:Ästrid,LN:Öhlm,CN:Åppres)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[Ä/5 Ö,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:Ästrid,LN:Öhlm,CN:Åppres)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[ÄS5 Ö,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:Ästrid,LN:Öhlm,CN:Åppres)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search special chars - Pattern Sort
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[1,EPredictiveItuT,EPatternSort,5]" "RES[4,(FN:@ravi four,LN:!belkud five)(FN:yz,LN:123,CN:Nokia)(FN:+allen,LN:good,CN:Nokia)(FN:4four,LN:&ampli,CN:Nokia)]"
 delete api
 [Endtest]
 
@@ -902,63 +1355,120 @@
 create PsClientTestSuite api
 api WriteTitleToLog
 // The following test is not really applicable test for non-ITUT keyboard
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[1,EItut,EPatternSort,5]" "RES[4,(FN:@ravi four,LN:!belkud five)(FN:yz,LN:123,CN:Nokia)(FN:+allen,LN:good,CN:Nokia)(FN:4four,LN:&ampli,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[! @,EItut,EPatternSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[! @,EPredictiveQwerty,EPatternSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[! @,EPredictiveQwerty,EPatternSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search special chars (Predictive ITU-T) - Alpha Sort
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[1,EPredictiveItuT,EAlphaSort,5]" "RES[4,(FN:yz,LN:123,CN:Nokia)(FN:@ravi four,LN:!belkud five)(FN:+allen,LN:good,CN:Nokia)(FN:4four,LN:&ampli,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search special chars - Alpha Sort
+title CS: Search special chars (Predictive QWERTY) - Alpha Sort
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[1,EItut,EAlphaSort,5]" "RES[4,(FN:yz,LN:123,CN:Nokia)(FN:@ravi four,LN:!belkud five)(FN:+allen,LN:good,CN:Nokia)(FN:4four,LN:&ampli,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[! @,EItut,EAlphaSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
+// The following test is not really applicable test for non-ITUT keyboard
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[! @,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[! @,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:@ravi four,LN:!belkud five)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search contact starting with 0 (Predictive ITU-T)
+create PsClientTestSuite api
+api WriteTitleToLog
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[0642,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:0Nick,LN:0Jack,CN:0Sam)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search contact starting with 0 (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[0?8%,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:0Nick,LN:0Jack,CN:0Sam)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[0(8c,EPredictiveQwerty,EAlphaSort,5]" "RES[1,(FN:0Nick,LN:0Jack,CN:0Sam)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search contact starting with 0
+title CS: Search in multiple data stores (Predictive ITU-T)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[0642,EItut,EAlphaSort,5]" "RES[1,(FN:0Nick,LN:0Jack,CN:0Sam)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[0?8%,EItut,EAlphaSort,5]" "RES[1,(FN:0Nick,LN:0Jack,CN:0Sam)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb,cntdb:\/\/c:contacts.gdb]" "SQ[8434,EPredictiveItuT,EAlphaSort,5]" "RES[2,(FN:TheGroup)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search in multiple data stores (Predictive QWERTY)
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb,cntdb:\/\/c:contacts.gdb]" "SQ[5#3=,EPredictiveQwerty,EAlphaSort,5]" "RES[2,(FN:TheGroup)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb,cntdb:\/\/c:contacts.gdb]" "SQ[5-3G,EPredictiveQwerty,EAlphaSort,5]" "RES[2,(FN:TheGroup)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search in multiple data stores
+title CS: Search (Predictive ITU-T) - Alpha Sort -> Truncate result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb,cntdb:\/\/c:contacts.gdb]" "SQ[8434,EItut,EAlphaSort,5]" "RES[2,(FN:TheGroup)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb,cntdb:\/\/c:contacts.gdb]" "SQ[5#3=,EItut,EAlphaSort,5]" "RES[2,(FN:TheGroup)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5,EPredictiveItuT,EAlphaSort,3]" "RES[3,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search (Itut) - Alpha Sort -> Truncate result
+title CS: Search (Predictive QWERTY) - Alpha Sort -> Truncate result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5,EItut,EAlphaSort,3]" "RES[3,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[*,EItut,EAlphaSort,3]" "RES[3,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[*,EPredictiveQwerty,EAlphaSort,3]" "RES[3,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+,EPredictiveQwerty,EAlphaSort,3]" "RES[3,(FN:+allen,LN:good,CN:Nokia)(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title CS: Search (Itut) - Pattern Sort -> Truncate result
+title CS: Search (Predictive ITU-T) - Pattern Sort -> Truncate result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5,EItut,EPatternSort,3]" "RES[3,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
-//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[*,EItut,EPatternSort,3]" "RES[3,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+api TC_ITU_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[5,EPredictiveItuT,EPatternSort,3]" "RES[3,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+delete api
+[Endtest]
+
+
+//******************************************************************************
+[Test]
+title CS: Search (Predictive QWERTY) - Pattern Sort -> Truncate result
+create PsClientTestSuite api
+api WriteTitleToLog
+//api TC_N97_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[*,EPredictiveQwerty,EPatternSort,3]" "RES[3,(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)]"
+//api TC_DEA_TestSearchingInCache "URI[cntdb:\/\/c:contacts.cdb]" "SQ[+,EPredictiveQwerty,EPatternSort,3]" "RES[3,(FN:+allen,LN:good,CN:Nokia)(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:ghi,LN:jkl,CN:Nokia)]"
+api TC_N00_SearchOnInputString "IPSTR[Fake_Test]" "SQ[F,ENonPredictive,EAlphaSort,5]" "RES[1,(-1:F)]" "MATCHLOC[0:1]"
 delete api
 [Endtest]
 
@@ -968,7 +1478,7 @@
 title Cancel search 
 create PsClientTestSuite api
 api WriteTitleToLog
-api CancelSearch "URI[cntdb:\/\/c:contacts.cdb]" "SQ[624374,EItut,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
+api CancelSearch "URI[cntdb:\/\/c:contacts.cdb]" "SQ[624374,EPredictiveItuT,EAlphaSort,5]" "RES[1,(FN:mahesh,LN:doraiswamy,CN:Nokia)]"
 delete api
 [Endtest]
 
@@ -980,10 +1490,10 @@
 
 //******************************************************************************
 [Test]
-title GS: Search FirstName in group (Qwerty)
+title GS: Search FirstName in group (Non-predictive)
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingWithInGroup "SrchInGroup[TheGroup]" "SQ[abc,EQwerty,EAlphaSort,5]" "RES[1,(FN:abc,LN:def,CN:Nokia)]"
+api TestSearchingWithInGroup "SrchInGroup[TheGroup]" "SQ[abc,ENonPredictive,EAlphaSort,5]" "RES[1,(FN:abc,LN:def,CN:Nokia)]"
 delete api
 [Endtest]
 
@@ -993,17 +1503,17 @@
 title GS: Search in group - Empty Query
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingWithInGroup "SrchInGroup[TheGroup]" "SQ[,EQwerty,EAlphaSort,5]" "RES[3,(FN:abc,LN:def,CN:Nokia)(FN:ghi,LN:jkl,CN:Nokia)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
+api TestSearchingWithInGroup "SrchInGroup[TheGroup]" "SQ[,ENonPredictive,EAlphaSort,5]" "RES[3,(FN:abc,LN:def,CN:Nokia)(FN:ghi,LN:jkl,CN:Nokia)(FN:mno,LN:pqr TheGr,CN:Nokia)]"
 delete api
 [Endtest]
 
 
 //******************************************************************************
 [Test]
-title GS: Search in group (Qwerty) - Empty Query -> No result
+title GS: Search in group (Non-predictive) - Empty Query -> No result
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingWithInGroup "SrchInGroup[TheGroup]" "SQ[afdsbc,EQwerty,EPatternSort,5]" "RES[0,]"
+api TestSearchingWithInGroup "SrchInGroup[TheGroup]" "SQ[afdsbc,ENonPredictive,EPatternSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
@@ -1013,7 +1523,7 @@
 title GS: Search in non-existing group
 create PsClientTestSuite api
 api WriteTitleToLog
-api TestSearchingWithInGroup "SrchInGroup[TheNonExistantGroup]" "SQ[abc,EQwerty,EAlphaSort,5]" "RES[0,]"
+api TestSearchingWithInGroup "SrchInGroup[TheNonExistantGroup]" "SQ[abc,ENonPredictive,EAlphaSort,5]" "RES[0,]"
 delete api
 [Endtest]
 
@@ -1058,7 +1568,7 @@
 title Mi: Marked contacts
 create PsClientTestSuite api
 api WriteTitleToLog
-api AddMarkedContactsTest "URI[cntdb:\/\/c:contacts.cdb]" "SQ[624374,EItut,EAlphaSort,25]" "RES[19,(FN:Pcs,LN:,CN:)(FN:0Nick,LN:0Jack,CN:0Sam)(FN:yz,LN:123,CN:Nokia)(FN:@ravi four,LN:!belkud five)(FN:4four,LN:&ampli,CN:Nokia)(FN:abc,LN:def,CN:Nokia)(FN:chiru,LN:devi,CN:motorola)(FN:mahesh,LN:doraiswamy,CN:Nokia)(FN:+allen,LN:good,CN:Nokia)(FN:ghi,LN:jkl,CN:Nokia)(FN:Tim,LN:Jones,CN:Nokia)(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)(FN:a0r,LN:pqr,CN:Nokia)(FN:mno,LN:pqr TheGr,CN:Nokia)(FN:M0hn,LN:Time,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)(FN:ravi kiran,LN:velkud,CN:Nokia)(FN:Ästrid,LN:Öhlm,CN:Åppres)]"
+api AddMarkedContactsTest "URI[cntdb:\/\/c:contacts.cdb]" "SQ[624374,EPredictiveItuT,EAlphaSort,25]" "RES[19,(FN:Pcs,LN:,CN:)(FN:0Nick,LN:0Jack,CN:0Sam)(FN:yz,LN:123,CN:Nokia)(FN:@ravi four,LN:!belkud five)(FN:4four,LN:&ampli,CN:Nokia)(FN:abc,LN:def,CN:Nokia)(FN:chiru,LN:devi,CN:motorola)(FN:mahesh,LN:doraiswamy,CN:Nokia)(FN:+allen,LN:good,CN:Nokia)(FN:ghi,LN:jkl,CN:Nokia)(FN:Tim,LN:Jones,CN:Nokia)(FN:a b c d e f g Jay,LN:L Gee,CN:Nokia India)(FN:Lpcsillet,LN:Lpcsucy,CN:Lpcsush)(FN:a0r,LN:pqr,CN:Nokia)(FN:mno,LN:pqr TheGr,CN:Nokia)(FN:M0hn,LN:Time,CN:Nokia)(FN:John,LN:Tom,CN:Nokia)(FN:ravi kiran,LN:velkud,CN:Nokia)(FN:Ästrid,LN:Öhlm,CN:Åppres)]"
 delete api
 [Endtest]