--- a/fep/frontendprocessor/test/feps/TFEP4.CPP	Fri Apr 16 15:17:40 2010 +0300
+++ b/fep/frontendprocessor/test/feps/TFEP4.CPP	Mon May 03 12:49:54 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -1087,22 +1087,15 @@
 				{
 				//TTstArrayOfOneCtrlCharacter arrayOfOneCtrlCharacter(keyCodeInUpperCase-('A'-1)); // the TTstArrayOfOneCtrlCharacter object cannot be an anonymous (temporary) object as its lifetime must be guaranteed to last until iFep.SimulateKeyEventsL returns
                 //iFep.SimulateKeyEventsL(arrayOfOneCtrlCharacter.ArrayOfModifiedCharacters());
-				const TInt numberOfCharacters = 11;
+				const TInt numberOfCharacters = 7;
 			    CArrayFix<TUint>* arrayOfCharacters=new(ELeave) CArrayFixFlat<TUint>(numberOfCharacters); // a RArray would be better than a CArrayFix, but unfortunately RArray doesn't (yet) have a TArray interface
 			    CleanupStack::PushL(arrayOfCharacters);
-			    int i;
-			    TUint32 cjkBase = 0x20020;
+			    arrayOfCharacters->AppendL(' ');
+			    arrayOfCharacters->AppendL('!');
+			    arrayOfCharacters->AppendL('\"');
+			    arrayOfCharacters->AppendL('#');
 			    TUint32 ch;
-			    for (i=0; i<numberOfCharacters - 3; i++)
-			        {
-			            ch = cjkBase++;
-			            TUint32 hi = ((ch - 0x10000) / 0x400) + 0xD800;
-			            TUint32 lo = ((ch - 0x10000) % 0x400) + 0xDC00;
-			            arrayOfCharacters->AppendL(hi);
-			            arrayOfCharacters->AppendL(lo);
-			            i++;
-			        }
-                ch++;
+                ch = 0x20024;
                 TUint32 hi = ((ch - 0x10000) / 0x400) + 0xD800;
                 TUint32 lo = ((ch - 0x10000) % 0x400) + 0xDC00;
                 arrayOfCharacters->AppendL(lo);

--- a/fep/frontendprocessor/test/feps/tfep4_ui.rss	Fri Apr 16 15:17:40 2010 +0300
+++ b/fep/frontendprocessor/test/feps/tfep4_ui.rss	Mon May 03 12:49:54 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -17,7 +17,7 @@
 #include <techview/eikon.rsg>
 #include "tfep4.hrh"
 
-NAME TFP1
+NAME TFP4
 
 RESOURCE RSS_SIGNATURE
 	{

--- a/fep/frontendprocessor/test/src/TFEP1TESTTARGET.CPP	Fri Apr 16 15:17:40 2010 +0300
+++ b/fep/frontendprocessor/test/src/TFEP1TESTTARGET.CPP	Mon May 03 12:49:54 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -839,23 +839,23 @@
 			{
 			SetTestStepID(_L("TI18N-FEPBASE-CIT-4001"));
 			INFO_PRINTF1(_L("Send cursor down events to move the next dialog"));
-			SendKey(EKeyDownArrow);			
-			INFO_PRINTF1(_L("Install the FEP 1"));
-			iCoeEnv->InstallFepL(KUidTFep1);
+			SendKey(EKeyDownArrow);
+			// FEP 1 is already tested in above test cases.
+			// Now install test FEP 4 to test UTF-16 support.
+			INFO_PRINTF1(_L("Install the FEP 4"));
+			iCoeEnv->InstallFepL(KUidTFep4);
 			User::After(TTimeIntervalMicroSeconds32(2000000));
 			}
 			break;
-
 		case 462:
 			{
 			INFO_PRINTF1(_L("...simulate Key Event 'Shift + M' ---> Changes to hex fep!"));
 			SendKey('M', EModifierRightShift);			
-			TUint codes[] = {'0', '0', '2', '1'};
+			TUint codes[] = {'0', '0', '0', '2', '1'};	// FEP 4 supports UTF-16, and need 5 digits for one Unicode value
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(200000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
@@ -863,12 +863,11 @@
 			break;
 		case 463:  
 			{
-			TUint codes[] = {'0', '4', '1', '1'};
+			TUint codes[] = {'0', '0', '4', '1', '1'};	// FEP 4 supports UTF-16, and need 5 digit for one Unicode value
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(200000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
@@ -876,26 +875,23 @@
 			break;
 		case 464:  
 			{
-			TUint codes[] = {'0', 'E', '0', '2'};
+			TUint codes[] = {'0', '0', 'E', '0', '2'};	// FEP 4 supports UTF-16, and need 5 digit for one Unicode value
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(200000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
 			}
 			break;
-			
 		case 465:
 			{
-			TUint codes[] = {'2', 'E', '8', '1'};
+			TUint codes[] = {'0', '2', 'E', '8', '1'};	// FEP 4 supports UTF-16, and need 5 digit for one Unicode value
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(1000000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
@@ -903,12 +899,11 @@
 			break;
 		case 466:
 			{
-			TUint codes[] = {'3', '0', '3', 'A'};
+			TUint codes[] = {'0', '3', '0', '3', 'A'};	// FEP 4 supports UTF-16, and need 5 digit for one Unicode value
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(1000000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
@@ -916,12 +911,11 @@
 			break;
 		case 467:
 			{
-			TUint codes[] = {'4', 'E', '1', '9'};
+			TUint codes[] = {'0', '4', 'E', '1', '9'};	// FEP 4 supports UTF-16, and need 5 digit for one Unicode value
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(1000000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
@@ -929,81 +923,60 @@
 			break;
 		case 468:
 			{
-			TUint codes[] = {'A', 'D', '0', '0'};
+			TUint codes[] = {'0', 'A', 'D', '0', '0'};	// FEP 4 supports UTF-16, and need 5 digit for one Unicode value
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(1000000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
 			}
 			break;
-
 		case 469:
 			{
-			INFO_PRINTF1(_L("Uninstall the FEP"));
-			iCoeEnv->InstallFepL(KNullUid);
-			INFO_PRINTF1(_L("Install the FEP 4"));
-			iCoeEnv->InstallFepL(KUidTFep4);
-			User::After(TTimeIntervalMicroSeconds32(2000000));
-			}
-			break;
-
-		case 471:
-			{
 			TUint codes[] = {'2', '0', '0', '0', '0'};
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(1000000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
 			}
 			break;
-		case 472: 
+		case 470: 
 			{
 			TUint codes[] =  {'2', 'F', '8', '0', '0'};
 			for (int i = 0; i < sizeof(codes)/sizeof(TUint); i++)
 				{
 				INFO_PRINTF2(_L("...simulate Key Event '%d'"), codes[i]);
 				SendKey(codes[i]);
-				User::After(TTimeIntervalMicroSeconds32(1000000));
 				}
 			INFO_PRINTF1(_L("...simulate Key Event Enter"));
 			SendKey(EKeyEnter);			
 			}
 			break;
-			
-		case 473:
+		case 471:
 			{
-            INFO_PRINTF1(_L("...simulate Key Event 'Shift + X' ---> test SimulateKeyEventsL!"));
-            SendKey('X', EModifierRightShift);
-            User::After(TTimeIntervalMicroSeconds32(2000000));
+			INFO_PRINTF1(_L("...simulate Key Event 'Shift + X' ---> test SimulateKeyEventsL!"));
+			SendKey('X', EModifierRightShift);
+			User::After(TTimeIntervalMicroSeconds32(2000000));
 			INFO_PRINTF1(_L("...simulate Key Event 'Shift + M' ---> Changes to Pinyin!"));
 			SendKey('M', EModifierRightShift);
-            User::After(TTimeIntervalMicroSeconds32(2000000));
-			}
-			break;
-		case 474:
-			{
-			INFO_PRINTF1(_L("...simulate Key Event 'Shift + M' ---> Changes back to Plain!"));
-			SendKey('M', EModifierRightShift);
 			User::After(TTimeIntervalMicroSeconds32(2000000));
 			}
 			break;
-		case 475:
+		case 472:
 			{
-			INFO_PRINTF1(_L("Uninstall the FEP"));
+			INFO_PRINTF1(_L("Uninstall the FEP 4"));
 			iCoeEnv->InstallFepL(KNullUid);
-			SendKey(EKeyEnter);  
-			RecordTestResultL();
+			User::After(TTimeIntervalMicroSeconds32(2000000));
+            SendKey(EKeyEnter);  
+            RecordTestResultL();
 			}
 			break;
-						
+
 //----------------------------------------------------------------------------------------------
 
 /**

--- a/inputmethods_pub/ptiengine_iti_api/inc/PtiDefs.h	Fri Apr 16 15:17:40 2010 +0300
+++ b/inputmethods_pub/ptiengine_iti_api/inc/PtiDefs.h	Mon May 03 12:49:54 2010 +0300
@@ -499,7 +499,7 @@
     EPtiPinyin   = 0x02,
     EPtiBopomofo = 0x04,
     EPtiZhuyin   = 0x08,
-    EPtiCangJie  = 0x16,
+    EPtiCangJie  = 0x10,
     EPtiEasyCangjie = 0x20,
     EPtiAdvCangjie = 0x40
     };

--- a/layers.sysdef.xml	Fri Apr 16 15:17:40 2010 +0300
+++ b/layers.sysdef.xml	Mon May 03 12:49:54 2010 +0300
@@ -14,9 +14,6 @@
 <layer name="api_test_layer">
   <module name="inputmethods_api_tests">
     <unit unitID="abs.inputmethods.tsrc.all" mrp="" bldFile="&layer_real_source_path;/tsrc/group" name="inputmethods_tsrc_all" />
-    <unit unitID="abs.inputmethods.tsrc.pen_input_server_api" mrp="" bldFile="&layer_real_source_path;/inputmethods_plat/pen_input_server_api/tsrc/group" name="inputmethods_tsrc_pen_input_server" />
-    <unit unitID="abs.inputmethods.tsrc.ptiengine_hwr_api" mrp="" bldFile="&layer_real_source_path;/inputmethods_plat/ptiengine_hwr_api/tsrc/group" name="inputmethods_tsrc_ptiengine_hwr" />
-    <unit unitID="abs.inputmethods.tsrc.aknfep_uiinterface_api" mrp="" bldFile="&layer_real_source_path;/inputmethods_plat/aknfep_uiinterface_api/tsrc/group" name="inputmethods_tsrc_aknfep_uiinterface" />
   </module>
 </layer>
     

--- a/tsrc/group/bld.inf	Fri Apr 16 15:17:40 2010 +0300
+++ b/tsrc/group/bld.inf	Mon May 03 12:49:54 2010 +0300
@@ -19,12 +19,12 @@
 
 PRJ_TESTMMPFILES
 
-#include "../../inputmethods_plat/pen_input_server_api/tsrc/group/bld.inf"
-#include "../../inputmethods_plat/ptiengine_hwr_api/tsrc/group/bld.inf"
-#include "../../inputmethods_plat/aknfep_uiinterface_api/tsrc/group/bld.inf"
+//#include "../../inputmethods_plat/pen_input_server_api/tsrc/group/bld.inf"
+//#include "../../inputmethods_plat/ptiengine_hwr_api/tsrc/group/bld.inf"
+//#include "../../inputmethods_plat/aknfep_uiinterface_api/tsrc/group/bld.inf"
 #include "../../inputmethods_plat/ptiengine_key_definations_api/tsrc/group/bld.inf"
 
 
 #include "../../inputmethods_pub/ptiengine_iti_api/tsrc/group/bld.inf"
-#include "../../inputmethods_pub/optical_character_recognition_api/tsrc/group/bld.inf"
-#include "../../inputmethods_pub/input_language_info_api/tsrc/group/bld.inf"
+//#include "../../inputmethods_pub/optical_character_recognition_api/tsrc/group/bld.inf"
+//#include "../../inputmethods_pub/input_language_info_api/tsrc/group/bld.inf"