--- a/logsui/logscntfinder/tsrc/ut_logscntfinder/src/ut_logspredictive12keytranslator.cpp	Fri Sep 17 16:47:32 2010 +0300
+++ b/logsui/logscntfinder/tsrc/ut_logscntfinder/src/ut_logspredictive12keytranslator.cpp	Fri Oct 15 14:47:48 2010 +0300
@@ -22,6 +22,7 @@
 
 #include <QtTest/QtTest>
 #include <QSignalSpy>
+#include "qtcontacts_stubs.h"
 
 class LogsPredictive12KeyTranslator_mock : public LogsPredictive12KeyTranslator
 {
@@ -32,13 +33,21 @@
     {  
     }
     
-    inline QStringList nameTokens( const QString& /*name*/ ) const
-            {return QStringList();}
-    inline const QChar translateChar( const QChar /*character*/, bool& /*ok*/ ) const
-            {return QChar();}
+    inline QStringList nameTokens( const QString& name ) const
+        {return QStringList(name);}
+    inline const QString translateChar( const QChar /*character*/, bool& /*ok*/ ) const
+        {return QString();}
     inline bool encodes( const QString& /*sniplet*/ )
         {return true;}
-    inline int mib() const {return 0;}
+    inline int mib() const 
+        {return 0;}
+    inline QString& trimPattern( QString& pattern, bool /*tailOnly*/ ) const
+        {return pattern;}
+    inline int hasPatternSeparators( const QString& pattern ) const
+        {return pattern.length();}
+    inline QStringList patternTokens( const QString& pattern ) const
+        {return QStringList( pattern );}
+    
     
 
 };
@@ -46,14 +55,12 @@
 
 void UT_LogsPredictive12KeyTranslator::initTestCase()
 {
-    mOrigLang = HbInputSettingProxy::instance()->globalInputLanguage();
     
 }
 
 void UT_LogsPredictive12KeyTranslator::cleanupTestCase()
 {
-    HbInputSettingProxy::instance()->setGlobalInputLanguage( mOrigLang );
-    
+    LOGS_CNTFINDER_SET_PHONE_LANGUAGE( QLocale::English );    
 }
 
 
@@ -66,7 +73,6 @@
 {
     delete mTranslator;
     mTranslator = 0;
-    HbInputSettingProxy::instance()->setGlobalInputLanguage( mOrigLang );
     
 }
 
@@ -76,140 +82,15 @@
     QVERIFY( mTranslator->mKeyMap );
 }
 
-void UT_LogsPredictive12KeyTranslator::testSplitPattern()
-{
-    QString car;
-    QString cdr;
-    
-    mTranslator->splitPattern( QString( "122" ), car, cdr );
-    QCOMPARE( car, QString("122" ) );
-    QCOMPARE( cdr, QString("" ) );
-    
-    mTranslator->splitPattern( QString( "01220" ), car, cdr );
-    QCOMPARE( car, QString("01220" ) );
-    QCOMPARE( cdr, QString("" ) );
-    
-    mTranslator->splitPattern( QString( "0122020" ), car, cdr );
-    QCOMPARE( car, QString("0122" ) );
-    QCOMPARE( cdr, QString("20" ) );
-    
-    mTranslator->splitPattern( QString( "012200020" ), car, cdr );
-    QCOMPARE( car, QString("0122" ) );
-    QCOMPARE( cdr, QString("20" ) );
-    
-    mTranslator->splitPattern( QString( "0122050020" ), car, cdr );
-    QCOMPARE( car, QString("0122" ) );
-    QCOMPARE( cdr, QString("50020" ) );
-    
-    mTranslator->splitPattern( QString( "00000" ), car, cdr );
-    QCOMPARE( car, QString("00000" ) );
-    QCOMPARE( cdr, QString("" ) );
-    
-    mTranslator->splitPattern( QString( "0" ), car, cdr );
-    QCOMPARE( car, QString("0" ) );
-    QCOMPARE( cdr, QString("" ) );
-
-    mTranslator->splitPattern( QString( "" ), car, cdr );
-    QCOMPARE( car, QString("" ) );
-    QCOMPARE( cdr, QString("" ) );
-    
-}
-
-void UT_LogsPredictive12KeyTranslator::testTrimPattern()
-{
-    QString pattern;
-    
-    pattern = "1";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "1") );
-    
-    pattern = "122";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "122") );
-    
-    pattern = "0122";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "122") );
-    
-    pattern = "0122";
-    QCOMPARE( mTranslator->trimPattern( pattern, true ), QString( "0122") );
-    
-    pattern = "1220";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "122") );
-    
-    pattern = "1220";
-    QCOMPARE( mTranslator->trimPattern( pattern, true ), QString( "122") );
-    
-    pattern = "01220";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "122") );
-    
-    pattern = "01220";
-    QCOMPARE( mTranslator->trimPattern( pattern, true ), QString( "0122") );
-    
-    pattern = "012020";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "1202") );
-    
-    pattern = "012020";
-    QCOMPARE( mTranslator->trimPattern( pattern, true ), QString( "01202") );
-
-    pattern = "000120200";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "1202") );
-    
-    pattern = "00012000200";
-    QCOMPARE( mTranslator->trimPattern( pattern , false), QString( "120002") );
-    
-    pattern = "0001200024500";
-    QCOMPARE( mTranslator->trimPattern( pattern , false), QString( "12000245") );
-    
-    pattern = "000";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "0") );
-
-    pattern = "0";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "0") );
-    
-    pattern = "";
-    QCOMPARE( mTranslator->trimPattern( pattern, false ), QString( "") );
-    
-    
-}
-
-void UT_LogsPredictive12KeyTranslator::testPatternTokens()
-{
-    
-    QCOMPARE( mTranslator->patternTokens( QString("122" ) ).length(), 1 );
-    QCOMPARE( mTranslator->patternTokens( QString("122" ) )[0], QString("122" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("01220" ) ).length(), 1 );
-    QCOMPARE( mTranslator->patternTokens( QString("01220" ) )[0], QString("01220" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("102" ) ).length(), 2 );
-    QCOMPARE( mTranslator->patternTokens( QString("102" ) )[0], QString("1" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("102" ) )[1], QString("2" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("0010200" ) ).length(), 2 );
-    QCOMPARE( mTranslator->patternTokens( QString("0010200" ) )[0], QString("001" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("0010200" ) )[1], QString("200" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("0010200564760635" ) ).length(), 2 );
-    QCOMPARE( mTranslator->patternTokens( QString("0010200564760635" ) )[0], QString("001" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("0010200564760635" ) )[1], QString("200564760635" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("0" ) ).length(), 1 );
-    QCOMPARE( mTranslator->patternTokens( QString("0" ) )[0], QString("0" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("000" ) ).length(), 1 );
-    QCOMPARE( mTranslator->patternTokens( QString("000" ) )[0], QString("000" ) );
-    QCOMPARE( mTranslator->patternTokens( QString("001" ) ).length(), 1 );
-    QCOMPARE( mTranslator->patternTokens( QString("001" ) )[0], QString("001" ) );
-    
-}
-
-void UT_LogsPredictive12KeyTranslator::testHasPatternSeparators()
-{
-    QVERIFY( !mTranslator->hasPatternSeparators( QString("122" ) ) );
-    QVERIFY( mTranslator->hasPatternSeparators( QString("1022" ) ) );
-    QCOMPARE( mTranslator->hasPatternSeparators( QString("0010200" ) ), 5 );
-    QCOMPARE( mTranslator->hasPatternSeparators( QString("0000" ) ), 4 );
-    QCOMPARE( mTranslator->hasPatternSeparators( QString("345345" ) ), 0 );
-    
-}
 
 void UT_LogsPredictive12KeyTranslator::testTranslateChar()
 {
     //latin
-    QCOMPARE( mTranslator->translateChar( QChar('0') ), QChar('0') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x4E0F) ), QChar() );
+    QCOMPARE( mTranslator->translateChar( QChar('0') ), QString('0') );
+    QCOMPARE( mTranslator->translateChar( QChar('%') ), QString('*') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x4E0F) ), QString() );
+    mTranslator->mKeyMap = 0;
+    QCOMPARE( mTranslator->translateChar( QChar('0') ), QString() );
     
 }