--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/group/T_CharConvFWServer.mmp	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,67 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+TARGET		  t_charconvfwserver.exe
+TARGETTYPE	  exe
+UID 0x1000007A 0xE27AD85E
+//UID			 0 0xE27AD85D
+
+CAPABILITY		ProtServ
+
+USERINCLUDE	 ../inc
+USERINCLUDE	 ../test/rtest/tsrc/inc
+USERINCLUDE	 ../test/rtest/tsrc/otherutf
+
+APP_LAYER_SYSTEMINCLUDE 
+OS_LAYER_LIBC_SYSTEMINCLUDE 
+
+
+SOURCEPATH		../test
+//SOURCEPATH		../test/rtest/tsrc/otherutf
+
+
+SOURCE			t_charconvfwserver.cpp
+SOURCEPATH		../test/rtest/tsrc/utf
+SOURCE			tsimple7.cpp
+SOURCE			tsimple8.cpp
+SOURCE			trfc1642.cpp
+SOURCE			tcomp7.cpp
+SOURCE			tcomp8.cpp
+SOURCE			trealut8.cpp
+SOURCE			trealuni.cpp
+SOURCE			terror.cpp
+SOURCE			tnewlin7.cpp
+SOURCE			tjava.cpp
+SOURCE			tpartial.cpp
+SOURCE			timap.cpp
+
+SOURCEPATH		../test/rtest/tsrc/main
+SOURCE	        t_memory.cpp
+
+
+LIBRARY		euser.lib
+LIBRARY		charconv.lib
+LIBRARY		efsrv.lib
+LIBRARY		utf8.lib
+LIBRARY		utf7.lib
+LIBRARY	    testexecuteutils.lib 
+LIBRARY	    testexecutelogclient.lib
+
+#ifdef ENABLE_ABIV2_MODE
+DEBUGGABLE_UDEBONLY
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/group/T_CharConvFWServer.pkg	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,42 @@
+;
+; Copyright (c) 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"
+; which accompanies this distribution, and is available
+; at the URL "http:;www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: 
+;
+
+;Languages
+&EN
+
+;Localised Vendor name
+%{"t_PTPipsuite EN"}
+
+; Vendor name
+: "t_PTPipsuite"
+
+; test scripts
+
+"\epoc32\data\z\test\T_MEMORY.script"-"c:\charconvfwtest\T_MEMORY.script"
+"\epoc32\data\z\test\T_SIMPLE7.script"-"c:\charconvfwtest\T_SIMPLE7.script"
+"\epoc32\data\z\test\T_SIMPLE8.script"-"c:\charconvfwtest\T_SIMPLE8.script"
+"\epoc32\data\z\test\T_RFC1642.script"-"c:\charconvfwtest\T_RFC1642.script"
+"\epoc32\data\z\test\T_COMP7.script"-"c:\charconvfwtest\T_COMP7.script"
+"\epoc32\data\z\test\T_COMP8.script"-"c:\charconvfwtest\T_COMP8.script"
+"\epoc32\data\z\test\T_REALUT8.script"-"c:\charconvfwtest\T_REALUT8.script"
+"\epoc32\data\z\test\T_REALUNI.script"-"c:\charconvfwtest\T_REALUNI.script"
+"\epoc32\data\z\test\T_MEMORY.script"-"c:\charconvfwtest\T_MEMORY.script"
+"\epoc32\data\z\test\T_ERROR.script"-"c:\charconvfwtest\T_ERROR.script"
+"\epoc32\data\z\test\T_NEWLIN7.script"-"c:\charconvfwtest\T_NEWLIN7.script"
+"\epoc32\data\z\test\T_JAVA.script"-"c:\charconvfwtest\T_JAVA.script"
+"\epoc32\data\z\test\T_PARTIAL.script"-"c:\charconvfwtest\T_PARTIAL.script"
+"\epoc32\data\z\test\T_IMAP.script"-"c:\charconvfwtest\T_IMAP.script"
+

--- a/charconvfw/charconv_fw/group/bld.inf	Mon Jul 12 15:26:00 2010 +0800
+++ b/charconvfw/charconv_fw/group/bld.inf	Thu Aug 26 11:46:18 2010 +0800
@@ -74,25 +74,28 @@
 	../test/data/ethiopic.ut8					/epoc32/winscw/c/system/data/ethiopic.ut8
 	../test/data/daxue.uni						/epoc32/winscw/c/system/data/daxue.uni
 
-	../test/rtest/group/charconvtests.bat		/epoc32/data/z/system/test/charconvtests.bat
+	../test/T_All_charcovfw.bat				z:/test/T_All_charcovfw.bat
+	../test/T_All_charcovfw.script			z:/test/T_All_charcovfw.script
+	../test/T_MEMORY.script			     	z:/test/T_MEMORY.script
+	../test/T_SIMPLE7.script				z:/test/T_SIMPLE7.script
+	../test/T_SIMPLE8.script				z:/test/T_SIMPLE8.script
+	../test/T_RFC1642.script				z:/test/T_RFC1642.script	
+	../test/T_COMP7.script					z:/test/T_COMP7.script
+	../test/T_COMP8.script					z:/test/T_COMP8.script
+	../test/T_REALUT8.script				z:/test/T_REALUT8.script
+	../test/T_REALUNI.script				z:/test/T_REALUNI.script
+	../test/T_ERROR.script					z:/test/T_ERROR.script
+	../test/T_NEWLIN7.script				z:/test/T_NEWLIN7.script
+	../test/T_JAVA.script					z:/test/T_JAVA.script
+	../test/T_PARTIAL.script				z:/test/T_PARTIAL.script
+	../test/T_IMAP.script					z:/test/T_IMAP.script
+
 	../test/rtest/group/charconvtests.iby		/epoc32/rom/include/charconvtests.iby
 
 PRJ_TESTMMPFILES
 
 	../test/rtest/group/utf7.mmp				support			// used by tcomp7
 	../test/rtest/group/utf8.mmp				support			// used by tcomp8
-	../test/rtest/group/t_memory.mmp
-	../test/rtest/group/tsimple7.mmp
-	../test/rtest/group/tsimple8.mmp
-	../test/rtest/group/trfc1642.mmp
-	../test/rtest/group/tcomp7.mmp
-	../test/rtest/group/tcomp8.mmp
-	../test/rtest/group/trealut8.mmp
-	../test/rtest/group/trealuni.mmp
-	../test/rtest/group/terror.mmp
-	../test/rtest/group/tnewlin7.mmp
-	../test/rtest/group/tjava.mmp
-	../test/rtest/group/tpartial.mmp
-	../test/rtest/group/timap.mmp
+	../group/T_CharConvFWServer.mmp
 
 #endif

--- a/charconvfw/charconv_fw/group/t_charconvfw.pkg	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-;
-; Copyright (c) 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"
-; which accompanies this distribution, and is available
-; at the URL "http:;www.eclipse.org/legal/epl-v10.html".
-;
-; Initial Contributors:
-; Nokia Corporation - initial contribution.
-;
-; Contributors:
-;
-; Description: 
-;
-
-;Languages
-&EN
-
-;Localised Vendor name
-%{"t_PTPipsuite EN"}
-
-; Vendor name
-: "t_PTPipsuite"
-
-; test scripts
-"\epoc32\release\$(platform)\$(target)\t_memory.exe"-"c:\sys\bin\t_memory.exe"
-"\epoc32\release\$(platform)\$(target)\tsimple7.exe"-"c:\sys\bin\tsimple7.exe"
-"\epoc32\release\$(platform)\$(target)\tsimple8.exe"-"c:\sys\bin\tsimple8.exe"
-"\epoc32\release\$(platform)\$(target)\trfc1642.exe"-"c:\sys\bin\trfc1642.exe"
-"\epoc32\release\$(platform)\$(target)\tcomp7.exe"-"c:\sys\bin\tcomp7.exe"
-"\epoc32\release\$(platform)\$(target)\tcomp8.exe"-"c:\sys\bin\tcomp8.exe"
-"\epoc32\release\$(platform)\$(target)\trealut8.exe"-"c:\sys\bin\trealut8.exe"
-"\epoc32\release\$(platform)\$(target)\trealuni.exe"-"c:\sys\bin\trealuni.exe"
-"\epoc32\release\$(platform)\$(target)\terror.exe"-"c:\sys\bin\terror.exe"
-"\epoc32\release\$(platform)\$(target)\tnewlin7.exe"-"c:\sys\bin\tnewlin7.exe"
-"\epoc32\release\$(platform)\$(target)\tjava.exe"-"c:\sys\bin\tjava.exe"
-"\epoc32\release\$(platform)\$(target)\tpartial.exe"-"c:\sys\bin\tpartial.exe"
-"\epoc32\release\$(platform)\$(target)\timap.exe"-"c:\sys\bin\timap.exe"

--- a/charconvfw/charconv_fw/test/rtest/group/charconvtests.bat	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-@rem
-@rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-@rem All rights reserved.
-@rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
-@rem which accompanies this distribution, and is available
-@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-@rem
-@rem Initial Contributors:
-@rem Nokia Corporation - initial contribution.
-@rem
-@rem Contributors:
-@rem
-@rem Description: 
-@rem
-
-t_memory
-tsimple7
-tsimple8
-trfc1642
-tcomp7
-tcomp8
-trealut8
-trealuni
-terror
-tnewlin7
-tjava
-tpartial
-timap

--- a/charconvfw/charconv_fw/test/rtest/group/charconvtests.iby	Mon Jul 12 15:26:00 2010 +0800
+++ b/charconvfw/charconv_fw/test/rtest/group/charconvtests.iby	Thu Aug 26 11:46:18 2010 +0800
@@ -20,28 +20,16 @@
 #define __CHARCONVTESTS_IBY__
 
 // Batch file that runs all automatic charconv tests.
-data=ZSYSTEM\test\charconvtests.bat						test\charconvtests.bat
 
 #include <charconv.iby>
 
 data=EPOCROOT##epoc32\wins\c\system\data\ethiopic.ut8	system\data\ethiopic.ut8
 data=EPOCROOT##epoc32\wins\c\system\data\daxue.uni		system\data\daxue.uni
 
+
+file=ABI_DIR\BUILD_DIR\t_charconvfwserver.exe			sys\bin\t_charconvfwserver.exe
 file=ABI_DIR\BUILD_DIR\utf7.dll				system\libs\utf7.dll
 file=ABI_DIR\BUILD_DIR\utf8.dll				system\libs\utf8.dll
 
-file=ABI_DIR\BUILD_DIR\t_memory.exe			test\t_memory.exe
-file=ABI_DIR\BUILD_DIR\tsimple7.exe			test\tsimple7.exe
-file=ABI_DIR\BUILD_DIR\tsimple8.exe			test\tsimple8.exe
-file=ABI_DIR\BUILD_DIR\trfc1642.exe			test\trfc1642.exe
-file=ABI_DIR\BUILD_DIR\tcomp7.exe			test\tcomp7.exe
-file=ABI_DIR\BUILD_DIR\tcomp8.exe			test\tcomp8.exe
-file=ABI_DIR\BUILD_DIR\trealut8.exe			test\trealut8.exe
-file=ABI_DIR\BUILD_DIR\trealuni.exe			test\trealuni.exe
-file=ABI_DIR\BUILD_DIR\terror.exe			test\terror.exe
-file=ABI_DIR\BUILD_DIR\tnewlin7.exe			test\tnewlin7.exe
-file=ABI_DIR\BUILD_DIR\tjava.exe			test\tjava.exe
-file=ABI_DIR\BUILD_DIR\tpartial.exe			test\tpartial.exe
-file=ABI_DIR\BUILD_DIR\timap.exe			test\timap.exe
 
 #endif

--- a/charconvfw/charconv_fw/test/rtest/group/runtests.bat	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-@echo off
-@rem
-@rem Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
-@rem All rights reserved.
-@rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
-@rem which accompanies this distribution, and is available
-@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
-@rem
-@rem Initial Contributors:
-@rem Nokia Corporation - initial contribution.
-@rem
-@rem Contributors:
-@rem
-@rem Description: 
-@rem
-
-t_memory.exe
-tsimple7.exe
-tsimple8.exe
-trfc1642.exe
-tcomp7.exe
-tcomp8.exe
-trealut8.exe
-trealuni.exe
-terror.exe
-tnewlin7.exe
-tjava.exe
-tpartial.exe
-timap.exe

--- a/charconvfw/charconv_fw/test/rtest/group/t_memory.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2004-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			t_memory.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/main
-SOURCE			t_memory.cpp
-
-LIBRARY			efsrv.lib
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/tcomp7.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			tcomp7.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE		../tsrc/otherutf
-
-SOURCEPATH		../tsrc/utf
-SOURCE			tcomp7.cpp
-
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-LIBRARY			utf7.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/tcomp8.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			tcomp8.exe
-TARGETTYPE		exe
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-USERINCLUDE		../tsrc/otherutf
-
-SOURCEPATH		../tsrc/utf
-SOURCE			tcomp8.cpp
-
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-LIBRARY			utf8.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/terror.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			terror.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			terror.cpp
-
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/timap.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			timap.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			timap.cpp
-
-LIBRARY			euser.lib
-LIBRARY			efsrv.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/tjava.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			tjava.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			tjava.cpp
-
-LIBRARY			euser.lib
-LIBRARY			efsrv.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/tnewlin7.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			tnewlin7.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			tnewlin7.cpp
-
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/tpartial.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			tpartial.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			tpartial.cpp
-
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/trealuni.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			trealuni.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			trealuni.cpp
-
-LIBRARY			euser.lib
-LIBRARY			efsrv.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/trealut8.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			trealut8.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			trealut8.cpp
-
-LIBRARY			euser.lib
-LIBRARY			efsrv.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/trfc1642.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			trfc1642.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			trfc1642.cpp
-
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/tsimple7.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			tsimple7.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			tsimple7.cpp
-
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- a/charconvfw/charconv_fw/test/rtest/group/tsimple8.mmp	Mon Jul 12 15:26:00 2010 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 1997-2009 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"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
-
-TARGET			tsimple8.exe
-TARGETTYPE		exe
-
-VENDORID		0x70000001
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-
-SOURCEPATH		../tsrc/utf
-SOURCE			tsimple8.cpp
-
-LIBRARY			euser.lib
-LIBRARY			charconv.lib
-
-SMPSAFE
-//RTEST

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_comp7.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_COMP7_H__
+#define __T_COMP7_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_COMP7 : public CTestStep
+    {
+public:
+    CT_COMP7();
+protected:  
+    TVerdict doTestStepL();
+private:
+    void TestCOMP7();
+    };
+
+_LIT(KTestStep_T_COMP7, "T_COMP7");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_comp8.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+#ifndef __T_COMP8_H__
+#define __T_COMP8_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_COMP8 : public CTestStep
+    {
+public:
+    CT_COMP8();
+protected:  
+    TVerdict doTestStepL();
+private:
+    void TestCOMP8();
+    };
+
+_LIT(KTestStep_T_COMP8, "T_COMP8");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_error.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,49 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_ERROR_H__
+#define __T_ERROR_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+#include <e32std.h>
+#include <utf.h>
+
+typedef TInt (*FConvertFromUtfX)(TDes16& aUnicode, const TDesC8& aUtfX, TInt& aState);
+
+typedef TInt (*FConvertToUtfX)(TDes8& aUtfX, const TDesC16& aUnicode);
+
+class CT_ERROR : public CTestStep
+    {
+public:
+    CT_ERROR();
+protected:  
+    TVerdict doTestStepL();
+private:
+    void TestERROR();
+    void ExhaustivelyLengthTest(const TDesC16& aUnicode, const TDesC8& aUtfX, FConvertFromUtfX aConvertFromUtfX);
+    void ExhaustivelyLengthTest(const TDesC8& aUtfX, const TDesC16& aUnicode, FConvertToUtfX aConvertToUtfX);
+    void ExhaustivelyLengthTest(const TDesC16& aUnicode, const TDesC8& aUtf7WithOptionalDirectCharactersEncodedInBase64, const TDesC8& aUtf7WithOptionalDirectCharactersEncodedDirectly, const TDesC8& aUtf8);
+    void ExhaustivelyLengthTest(const TDesC16& aUnicode, const TDesC8& aUtf7, const TDesC8& aUtf8);
+    void LengthTestGeneratingUtf7();
+    void LengthTestGeneratingUtf8();
+    };
+
+_LIT(KTestStep_T_ERROR, "T_ERROR");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_imap.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_IMAP_H__
+#define __T_IMAP_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_IMAP : public CTestStep
+    {
+public:
+    CT_IMAP();
+protected:  
+    TVerdict doTestStepL();
+private:
+    void TestIMAP();
+    };
+
+_LIT(KTestStep_T_IMAP, "T_IMAP");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_java.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_JAVA_H__
+#define __T_JAVA_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_JAVA : public CTestStep
+    {
+public:
+    CT_JAVA();
+protected:  
+    TVerdict doTestStepL();
+private:
+	void Test_JAVA();
+    };
+
+_LIT(KTestStep_T_JAVA, "T_JAVA");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_memory.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_MEMORY_H__
+#define __T_MEMORY_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_MEMORY : public CTestStep
+    {
+public:
+    CT_MEMORY();
+protected:  
+    TVerdict doTestStepL();
+private:
+	void TestDef41901L();
+    };
+
+_LIT(KTestStep_T_MEMORY, "T_MEMORY");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_newlin7.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_NEWLIN7_H__
+#define __T_NEWLIN7_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_NEWLIN7 : public CTestStep
+    {
+public:
+    CT_NEWLIN7();
+protected:  
+    TVerdict doTestStepL();
+private:
+	void TestNEWLIN7();
+    };
+
+_LIT(KTestStep_T_NEWLIN7, "T_NEWLIN7");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_partial.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_PARTIAL_H__
+#define __T_PARTIAL_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_PARTIAL : public CTestStep
+    {
+public:
+    CT_PARTIAL();
+protected:  
+    TVerdict doTestStepL();
+private:
+    void TestPARTIAL();
+    void TestConvertingToUtf(TUint8* aUtfBuffer, TInt aMaximumLengthOfUtfDescriptor, const TDesC16& aUnicode, TBool aBoolParameter, TInt aNumberOfUnicodeItemsExpectedToBeConverted, const TDesC8& aFirstHalfOfUtfExpected, const TDesC8& aSecondHalfOfUtfExpected);
+    void TestUtf7StatePreservation(const TDesC8& aUtf7);
+    void TestConvertingToUtf(TUint8* aUtfBuffer, TInt aMaximumLengthOfUtfDescriptor, const TDesC16& aUnicode, TInt aNumberOfUnicodeItemsExpectedToBeConverted, const TDesC8& aFirstHalfOfUtfExpected, const TDesC8& aSecondHalfOfUtfExpected);
+    };
+
+_LIT(KTestStep_T_PARTIAL, "T_PARTIAL");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_realuni.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_REALUNI_H__
+#define __T_REALUNI_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_REALUNI : public CTestStep
+    {
+public:
+    CT_REALUNI();
+protected:  
+    TVerdict doTestStepL();
+private:
+    void TestREALUNI();
+    };
+
+_LIT(KTestStep_T_REALUNI, "T_REALUNI");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_realut8.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_REALUT8_H__
+#define __T_REALUT8_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_REALUT8 : public CTestStep
+    {
+public:
+    CT_REALUT8();
+protected:  
+    TVerdict doTestStepL();
+private:
+    void TestREALUT8();
+    };
+
+_LIT(KTestStep_T_REALUT8, "T_REALUT8");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_rfc1642.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,36 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+#ifndef __T_RFC1642_H__
+#define __T_RFC1642_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_RFC1642 : public CTestStep
+    {
+public:
+    CT_RFC1642();
+protected:  
+    TVerdict doTestStepL();
+private:
+    void TestRFC1642();
+    };
+
+_LIT(KTestStep_T_RFC1642, "T_RFC1642");
+
+#endif

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/charconvfw/charconv_fw/test/rtest/tsrc/inc/t_simple7.h	Thu Aug 26 11:46:18 2010 +0800
@@ -0,0 +1,37 @@
+/*
+* Copyright (c) 1997-2009 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
+
+#ifndef __T_SIMPLE7_H__
+#define __T_SIMPLE7_H__
+
+//#include <w32std.h>
+#include <test/testexecutestepbase.h>
+
+class CT_SIMPLE7 : public CTestStep
+    {
+public:
+    CT_SIMPLE7();
+protected:  
+    TVerdict doTestStepL();
+private:
+	void TestSIMPLE7();
+    };
+
+_LIT(KTestStep_T_SIMPLE7, "T_SIMPLE7");
+
+#endif