--- a/logsui/logscntfinder/tsrc/ut_logscntfinder/src/ut_logspredictivetranslator.cpp	Fri Sep 17 16:47:32 2010 +0300
+++ b/logsui/logscntfinder/tsrc/ut_logscntfinder/src/ut_logspredictivetranslator.cpp	Fri Oct 15 14:47:48 2010 +0300
@@ -23,18 +23,17 @@
 #include "logspredictivethai12keytranslator.h"
 
 #include <QtTest/QtTest>
+#include "qtcontacts_stubs.h"
 
 
 void UT_LogsPredictiveTranslator::initTestCase()
 {
-    mOrigLang = HbInputSettingProxy::instance()->globalInputLanguage();
     
 }
 
 void UT_LogsPredictiveTranslator::cleanupTestCase()
 {
-    HbInputSettingProxy::instance()->setGlobalInputLanguage( mOrigLang );
-    
+    LOGS_CNTFINDER_SET_PHONE_LANGUAGE( QLocale::English );    
 }
 
 
@@ -46,13 +45,14 @@
 void UT_LogsPredictiveTranslator::cleanup()
 {
     LogsPredictiveTranslator::deleteInstance();
-    HbInputSettingProxy::instance()->setGlobalInputLanguage( mOrigLang );
+    LOGS_CNTFINDER_SET_PHONE_LANGUAGE( QLocale::English );    
     
 }
 
 void UT_LogsPredictiveTranslator::testConstructor()
 {
     QVERIFY( mTranslator );
+    QCOMPARE( mTranslator->mib(), MIBenumLatin );
     QVERIFY( mTranslator->mKeyMap );
     QVERIFY( mTranslator->mNameTranslator == 0 );
     QVERIFY( LogsPredictiveTranslator::mInstance != 0 );
@@ -60,11 +60,11 @@
     QVERIFY( LogsPredictiveTranslator::mInstance == 0 );
     
     mTranslator = 0;
-    HbInputLanguage thai( QLocale::Thai );
-    HbInputSettingProxy::instance()->setGlobalInputLanguage( thai );
+    LOGS_CNTFINDER_SET_PHONE_LANGUAGE( QLocale::Thai );    
 
     mTranslator = LogsPredictiveTranslator::instance();
     QVERIFY( mTranslator );
+    QCOMPARE( mTranslator->mib(), MIBenumThai );
     //temp off QVERIFY( mTranslator->mKeyMap );
     QVERIFY( mTranslator->mNameTranslator == 0 );
     QVERIFY( LogsPredictiveTranslator::mInstance != 0 );
@@ -72,6 +72,7 @@
     LogsPredictiveTranslator::deleteInstance();
     QVERIFY( LogsPredictiveTranslator::mInstance == 0 );
     mTranslator = 0;
+
     
 }
 
@@ -98,11 +99,11 @@
     
 }
 
-void UT_LogsPredictiveTranslator::testTranslatePattern()
+void UT_LogsPredictiveTranslator::testPreparePattern()
 {
     QString test1( "%12345" );
     
-    QCOMPARE( mTranslator->LogsPredictiveTranslator::translatePattern( test1 ).length(),
+    QCOMPARE( mTranslator->LogsPredictiveTranslator::preparePattern( test1 ).length(),
               test1.length() );
     
 }
@@ -113,13 +114,18 @@
     QString test1( "%12345" );
     
     QCOMPARE( mTranslator->translateText( test1 ).length(), test1.length() );
+    QVERIFY( !mTranslator->mNameTranslator );
+    QCOMPARE( mTranslator->mib(), MIBenumLatin );
     
-    QEXPECT_FAIL("", "No proper Thai keymap yet", Abort );
-    //text is thai, input lang latin
-    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->translateText( QString( thaiName1,ucsize ) ), QString( "123456789" ) );
+    //china
+    QString uni;
+    uni.append(QChar(0x0219));
+    uni.append(QChar(0x4E0F));
+    
+    mTranslator->translateText( uni );
+    QVERIFY( !mTranslator->mNameTranslator );
+    QCOMPARE( mTranslator->mib(), MIBenumLatin );
+    
 
     
 }
@@ -140,7 +146,6 @@
     QVERIFY( !mTranslator->mNameTranslator );
     QCOMPARE( mTranslator->mib(), MIBenumLatin );
     
-
     QEXPECT_FAIL("", "No proper Thai keymap yet", Abort );
     
     //text is thai, input lang latin