--- a/logsui/logscntfinder/tsrc/ut_logscntfinder/src/ut_logspredictivethai12keytranslator.cpp	Fri May 14 15:52:41 2010 +0300
+++ b/logsui/logscntfinder/tsrc/ut_logscntfinder/src/ut_logspredictivethai12keytranslator.cpp	Thu May 27 12:51:53 2010 +0300
@@ -25,13 +25,11 @@
 
 void UT_LogsPredictiveThai12KeyTranslator::initTestCase()
 {
-    mOrigLang = HbInputSettingProxy::instance()->globalInputLanguage();
 }
 
 void UT_LogsPredictiveThai12KeyTranslator::cleanupTestCase()
 {
     
-    HbInputSettingProxy::instance()->setGlobalInputLanguage( mOrigLang );
     
 }
 
@@ -40,15 +38,12 @@
 {
     
     HbInputLanguage thai( QLocale::Thai );
-    
-    HbInputSettingProxy::instance()->setGlobalInputLanguage( thai );
-    mTranslator = new LogsPredictiveThai12KeyTranslator();
+    mTranslator = new LogsPredictiveThai12KeyTranslator( thai );
     
 }
 
 void UT_LogsPredictiveThai12KeyTranslator::cleanup()
 {
-    HbInputSettingProxy::instance()->setGlobalInputLanguage( mOrigLang );
     delete mTranslator;
     mTranslator = 0;
 }
@@ -59,44 +54,80 @@
     
 }
 
-void UT_LogsPredictiveThai12KeyTranslator::testTranslate()
+void UT_LogsPredictiveThai12KeyTranslator::testTranslateText()
 {
-    QCOMPARE( mTranslator->translate( QString( "0123456789" ) ), QString( "0123456789" ) );
-    QCOMPARE( mTranslator->translate( QString( "Nokia" ) ), QString( "" ) );
-    QCOMPARE( mTranslator->translate( QString( "*0123##456*789*" ) ), QString( "0123456789" ) );
+    QCOMPARE( mTranslator->translateText( QString( "0123456789" ) ), QString( "0123456789" ) );
+    //finds name latin name translator
+    QCOMPARE( mTranslator->translateText( QString( "Nokia" ) ), QString( "66542" ) );
     
     const int ucsize = 9;
     //                           1      2      3      4      5     6      7      8     9
     const QChar thaiName1[] = {0x0E01,0x0E06,0x0E0A,0x0E0E,0x0E14,0x0E19,0x0E1E,0x0E23,0x0E2A };
-    QCOMPARE( mTranslator->translate( QString( thaiName1,ucsize ) ), QString( "123456789" ) );
+    QCOMPARE( mTranslator->translateText( QString( thaiName1,ucsize ) ), QString( "123456789" ) );
     
     //                          1       2      *      4      5     6      #      8     9
     const QChar thaiName2[] = {0x0E01,0x0E06,0x0E2F,0x0E0E,0x0E14,0x0E19,0x0E30,0x0E23,0x0E2A };
-    QCOMPARE( mTranslator->translate( QString( thaiName2,ucsize ) ), QString( "1245689" ) );
+    QCOMPARE( mTranslator->translateText( QString( thaiName2,ucsize ) ), QString( "1245689" ) );
     
             
 }
 
+void UT_LogsPredictiveThai12KeyTranslator::testTranslatePattern()
+{
+    QCOMPARE( mTranslator->translatePattern( QString( "0123456789" ) ), QString( "0123456789" ) );
+    QCOMPARE( mTranslator->translatePattern( QString( "*0123##456*789*" ) ), QString( "0123456789" ) );
+            
+}
+
 void UT_LogsPredictiveThai12KeyTranslator::testTranslateChar()
 {
-
-    QCOMPARE( mTranslator->translateChar( QChar('0') ), QChar('0') );
-    QCOMPARE( mTranslator->translateChar( QChar('1') ), QChar('1') );
-    QCOMPARE( mTranslator->translateChar( QChar('N') ), QChar() );
-    QCOMPARE( mTranslator->translateChar( QChar('*') ), QChar() );
-    QCOMPARE( mTranslator->translateChar( QChar('#') ), QChar() );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E01) ), QChar('1') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E06) ), QChar('2') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E0A) ), QChar('3') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E0E) ), QChar('4') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E14) ), QChar('5') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E19) ), QChar('6') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E1E) ), QChar('7') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E23) ), QChar('8') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E2A) ), QChar('9') );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E2F) ), QChar() );
-    QCOMPARE( mTranslator->translateChar( QChar(0x0E30) ), QChar() );
+    bool ok;
+    
+    QCOMPARE( mTranslator->translateChar( QChar('0'), ok ), QChar('0') );
+    QVERIFY( ok );
+    QCOMPARE( mTranslator->translateChar( QChar('1'), ok ), QChar('1') );
+    QVERIFY( ok );
+    QCOMPARE( mTranslator->translateChar( QChar('N'), ok ), QChar() );
+    QVERIFY( !ok );
+    QCOMPARE( mTranslator->translateChar( QChar('*'), ok ), QChar() );
+    QVERIFY( ok );
+    QCOMPARE( mTranslator->translateChar( QChar('#'), ok ), QChar() );
+    QVERIFY( ok );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E01), ok ), QChar('1') );
+    QVERIFY( ok );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E06), ok ), QChar('2') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E0A), ok ), QChar('3') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E0E), ok ), QChar('4') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E14), ok ), QChar('5') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E19), ok ), QChar('6') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E1E), ok ), QChar('7') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E23), ok ), QChar('8') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E2A), ok ), QChar('9') );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E2F), ok ), QChar() );
+    QVERIFY( ok );
+    QCOMPARE( mTranslator->translateChar( QChar(0x0E30), ok ), QChar() );
+    QVERIFY( ok );
     
 }
 
 
+void UT_LogsPredictiveThai12KeyTranslator::testEncodes()
+{
+    //thai
+    const int ucsize = 9;
+    const QChar thaiName2[] = {0x0E01,0x0E06,0x0E2F,0x0E0E,0x0E14,0x0E19,0x0E30,0x0E23,0x0E2A };
+    
+    QVERIFY( mTranslator->encodes( QString( thaiName2,ucsize ) ) );
+    
+    //china
+    QString uni1;
+    uni1.append(QChar(0x4E0E));
+    uni1.append(QChar(0x4E0F));
+    QVERIFY( !mTranslator->encodes( uni1) );
+    
+    QVERIFY( !mTranslator->encodes( QString( "Zulu" ) ) );
+        
+
+}
+
+