# HG changeset patch # User Maciej Seroka # Date 1258111206 0 # Node ID 862cab47b1ba86bca0e98fc3d28f926112368f4d # Parent dd806856a8f6af6d156b91fabb451e2d4ebd5ddb# Parent 736214c0060b7d0e39566829ffbbb34a5873f807 merged heads - non trivial merge in smoketest. Manual merge of those changes. diff -r 736214c0060b -r 862cab47b1ba .hgtags --- a/.hgtags Thu Nov 12 14:45:32 2009 +0000 +++ b/.hgtags Fri Nov 13 11:20:06 2009 +0000 @@ -5,3 +5,4 @@ 4709730d52260a9c367e784ea56a32f4035a7619 PDK_3.0.a 7a343c038e7d120d886ec1068c2c10b3c1165acd PDK_2.0.0 cdfb88270be0d5720e775c6570f9676d002e327e PDK_3.0.b +12815724a05335ac5bedb529d40107faf73ba950 PDK_3.0.c diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/Group/bld.inf --- a/common/tools/ats/smoketest/Group/bld.inf Thu Nov 12 14:45:32 2009 +0000 +++ b/common/tools/ats/smoketest/Group/bld.inf Fri Nov 13 11:20:06 2009 +0000 @@ -28,4 +28,5 @@ #include "../appinstall/group/Bld.inf" #include "../lbs/group/bld.inf" #include "../uiresources/group/bld.inf" +#include "../inputmethods/group/Bld.inf" #include "../IM/group/bld.inf" diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/Group/smoketest.pl --- a/common/tools/ats/smoketest/Group/smoketest.pl Thu Nov 12 14:45:32 2009 +0000 +++ b/common/tools/ats/smoketest/Group/smoketest.pl Fri Nov 13 11:20:06 2009 +0000 @@ -11,6 +11,7 @@ mkpath "temp/smoketest/sms/general"; mkpath "temp/smoketest/emailmessage/general"; mkpath "temp/smoketest/emailsettings/general"; +mkpath "temp/smoketest/appinstall/general"; my $epoc=$ENV{'EPOCROOT'} . "epoc32/"; copy("smoketest.xml", "temp/test.xml"); @@ -59,12 +60,15 @@ copy($epoc . "winscw/c/smoketest/ProfileSmokeTestModule.cfg", "temp/smoketest/general/ProfileSmokeTestModule.cfg"); copy($epoc . "release/winscw/udeb/AppInstallSmokeTestModule.dll", "temp/smoketest/winscw_udeb/AppInstallSmokeTestModule.dll"); copy($epoc . "winscw/c/smoketest/AppInstallSmokeTestModule.cfg", "temp/smoketest/general/AppInstallSmokeTestModule.cfg"); +copy($epoc . "winscw/c/smoketest/appinstall/sistest_winscw.sisx", "temp/smoketest/appinstall/general/sistest_winscw.sisx"); copy($epoc . "release/winscw/udeb/TestNpdApi.dll", "temp/smoketest/winscw_udeb/TestNpdApi.dll"); copy($epoc . "data/c/smoketest/smoketest_notepad.cfg", "temp/smoketest/general/smoketest_notepad.cfg"); copy($epoc . "data/c/smoketest/ui_TestNpdApi.cfg", "temp/smoketest/general/ui_TestNpdApi.cfg"); copy($epoc . "release/winscw/udeb/testsdkskins.dll", "temp/smoketest/winscw_udeb/testsdkskins.dll"); copy($epoc . "data/c/smoketest/smoketest_uiresources.cfg", "temp/smoketest/general/smoketest_uiresources.cfg"); copy($epoc . "data/c/smoketest/ui_testsdkskinsu.cfg", "temp/smoketest/general/ui_testsdkskinsu.cfg"); +copy($epoc . "release/winscw/udeb/InputMethodSmokeTestModule.dll", "temp/smoketest/winscw_udeb/InputMethodSmokeTestModule.dll"); +copy($epoc . "winscw/c/smoketest/InputMethodSmokeTestModule.cfg", "temp/smoketest/general/InputMethodSmokeTestModule.cfg"); copy($epoc . "release/winscw/udeb/IMApiTest.dll", "temp/smoketest/winscw_udeb/IMApiTest.dll"); copy($epoc . "data/c/smoketest/imapitest.ini", "temp/smoketest/general/imapitest.ini"); diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/Group/smoketest.xml --- a/common/tools/ats/smoketest/Group/smoketest.xml Thu Nov 12 14:45:32 2009 +0000 +++ b/common/tools/ats/smoketest/Group/smoketest.xml Fri Nov 13 11:20:06 2009 +0000 @@ -383,6 +383,15 @@ + + install + + + + + + + install @@ -410,6 +419,25 @@ + + install + + + + + + + + + install + + + + + + + + install @@ -464,6 +492,15 @@ + + execute + + + + + + + execute @@ -522,10 +559,14 @@ smoketest/general/ui_TestNpdApi.cfg smoketest/winscw_udeb/AppInstallSmokeTestModule.dll smoketest/general/AppInstallSmokeTestModule.cfg + smoketest/appinstall/general/sistest_winscw.sisx smoketest/winscw_udeb/testsdkskins.dll smoketest/general/smoketest_uiresources.cfg smoketest/general/ui_testsdkskinsu.cfg + smoketest/winscw_udeb/InputMethodSmokeTestModule.dll + smoketest/general/InputMethodSmokeTestModule.cfg smoketest/winscw_udeb/IMApiTest.dll smoketest/general/imapitest.ini + diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/appinstall/conf/AppInstallSmokeTestModule.cfg --- a/common/tools/ats/smoketest/appinstall/conf/AppInstallSmokeTestModule.cfg Thu Nov 12 14:45:32 2009 +0000 +++ b/common/tools/ats/smoketest/appinstall/conf/AppInstallSmokeTestModule.cfg Fri Nov 13 11:20:06 2009 +0000 @@ -1,14 +1,14 @@ [Test] title Install Application create AppInstallSmokeTestModule installer -installer InstallApp c:\testing\data\sistest_winscw.sisx +installer InstallApp c:\smoketest\appinstall\sistest_winscw.sisx delete installer [Endtest] [Test] title Uninstall Application create AppInstallSmokeTestModule uninstaller -uninstaller UninstallApp 1A +uninstaller UninstallApp E4F8641B delete uninstaller [Endtest] diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/appinstall/data/sistest.sisx Binary file common/tools/ats/smoketest/appinstall/data/sistest.sisx has changed diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/appinstall/data/sistest_winscw.sisx Binary file common/tools/ats/smoketest/appinstall/data/sistest_winscw.sisx has changed diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/appinstall/group/Bld.inf --- a/common/tools/ats/smoketest/appinstall/group/Bld.inf Thu Nov 12 14:45:32 2009 +0000 +++ b/common/tools/ats/smoketest/appinstall/group/Bld.inf Fri Nov 13 11:20:06 2009 +0000 @@ -25,6 +25,7 @@ // NOTE: If using ARS requirements all export operations should be done under this. // 'abld test export' ../conf/AppInstallSmokeTestModule.cfg c:/smoketest/AppInstallSmokeTestModule.cfg +../data/sistest_winscw.sisx c:/smoketest/appinstall/sistest_winscw.sisx PRJ_EXPORTS // Specify the source file followed by its destination here diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/Bmarm/InputMethodSmokeTestModuleU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/Bmarm/InputMethodSmokeTestModuleU.DEF Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,3 @@ +EXPORTS + LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &) + diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/Bwins/InputMethodSmokeTestModuleU.DEF --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/Bwins/InputMethodSmokeTestModuleU.DEF Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,3 @@ +EXPORTS + ?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &) + diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/EABI/InputMethodSmokeTestModuleU.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/EABI/InputMethodSmokeTestModuleU.def Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,3 @@ +EXPORTS + _Z9LibEntryLR13CTestModuleIf @ 1 NONAME + diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/conf/InputMethodSmokeTestModule.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/conf/InputMethodSmokeTestModule.cfg Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,20 @@ +[Test] +title Create Predictive Text Engine +create InputMethodSmokeTestModule ptiengine +ptiengine CreatePtiEngine +delete ptiengine +[Endtest] + +[Test] +title Create Predictive Text Dictionary +create InputMethodSmokeTestModule ptidict +ptidict CreatePtiDictionary +delete ptidict +[Endtest] + +[Test] +title Predict Word +create InputMethodSmokeTestModule ptiengine +ptiengine MultitapWord 26637776664443 android +delete ptiengine +[Endtest] \ No newline at end of file diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/group/Bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/group/Bld.inf Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,33 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + +PRJ_PLATFORMS +// specify the platforms your component needs to be built for here +// defaults to WINS MARM so you can ignore this if you just build these + + DEFAULT + +PRJ_TESTEXPORTS +// NOTE: If using ARS requirements all export operations should be done under this. +// 'abld test export' +../conf/InputMethodSmokeTestModule.cfg c:/smoketest/InputMethodSmokeTestModule.cfg + +PRJ_TESTMMPFILES + + InputMethodSmokeTestModule.mmp + +// End of File diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/group/InputMethodSmokeTestModule.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/group/InputMethodSmokeTestModule.mmp Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,79 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: MMP file for STIF Test Framework's TestScripter +* testclass test module. +* +*/ + +#include + +TARGET InputMethodSmokeTestModule.dll +TARGETTYPE dll +UID 0x1000008D 0x101FB3E3 + +CAPABILITY ALL -TCB + +/* Remove comments and replace 0x00000000 with correct vendor id */ +// VENDORID 0x00000000 +/* Remove comments and replace 0x00000000 with correct secure id */ +// SECUREID 0x00000000 + +//TARGETPATH ?target_path +DEFFILE InputMethodSmokeTestModule.def + +USERINCLUDE ../inc + +MW_LAYER_SYSTEMINCLUDE + +SOURCEPATH ../src + +SOURCE InputMethodSmokeTestModule.cpp +SOURCE InputMethodSmokeTestModuleBlocks.cpp + +//RESOURCE resource_file +//RESOURCE resource_file2 + +LIBRARY bafl.lib +LIBRARY euser.lib +LIBRARY ecom.lib +LIBRARY stiftestinterface.lib +LIBRARY stiftestengine.lib +LIBRARY ocrsrv.lib +LIBRARY ptiengine.lib + +LANG SC + +/* +START WINS +?wins_specific_information +END + +START MARM +?marm_specific_information +END +*/ +// Other possible keywords: + +// DOCUMENT ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes) +/* +START BITMAP ?target +TARGETPATH ?emulated_path_on_target_machine +HEADER +SOURCE ?color_depth ?source_bitmap +END +*/ +// DEFFILE ?filename +// AIF ?filename + +// End of File diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/inc/InputMethodSmokeTestModule.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/inc/InputMethodSmokeTestModule.h Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,211 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: STIF testclass declaration +* +*/ + +#ifndef INPUTMETHODSMOKETESTMODULE_H +#define INPUTMETHODSMOKETESTMODULE_H + +// INCLUDES +#include +#include +#include +#include + +// CONSTANTS +//const ?type ?constant_var = ?constant; + +// MACROS +//#define ?macro ?macro_def +#define TEST_CLASS_VERSION_MAJOR 0 +#define TEST_CLASS_VERSION_MINOR 0 +#define TEST_CLASS_VERSION_BUILD 0 + +// Logging path +_LIT( KInputMethodSmokeTestModuleLogPath, "\\logs\\testframework\\InputMethodSmokeTestModule\\" ); +// Log file +_LIT( KInputMethodSmokeTestModuleLogFile, "InputMethodSmokeTestModule.txt" ); +_LIT( KInputMethodSmokeTestModuleLogFileWithTitle, "InputMethodSmokeTestModule_[%S].txt" ); + +// FUNCTION PROTOTYPES +//?type ?function_name(?arg_list); + +// FORWARD DECLARATIONS +//class ?FORWARD_CLASSNAME; +class CInputMethodSmokeTestModule; +class CPtiEngine; + +// DATA TYPES +//enum ?declaration +//typedef ?declaration +//extern ?data_type; + +// CLASS DECLARATION + +/** +* CInputMethodSmokeTestModule test class for STIF Test Framework TestScripter. +* ?other_description_lines +* +* @lib ?library +* @since ?Series60_version +*/ +NONSHARABLE_CLASS(CInputMethodSmokeTestModule) : public CScriptBase + { + public: // Constructors and destructor + + /** + * Two-phased constructor. + */ + static CInputMethodSmokeTestModule* NewL( CTestModuleIf& aTestModuleIf ); + + /** + * Destructor. + */ + virtual ~CInputMethodSmokeTestModule(); + + public: // New functions + + /** + * ?member_description. + * @since ?Series60_version + * @param ?arg1 ?description + * @return ?description + */ + //?type ?member_function( ?type ?arg1 ); + + public: // Functions from base classes + + /** + * From CScriptBase Runs a script line. + * @since ?Series60_version + * @param aItem Script line containing method name and parameters + * @return Symbian OS error code + */ + virtual TInt RunMethodL( CStifItemParser& aItem ); + + protected: // New functions + + /** + * ?member_description. + * @since ?Series60_version + * @param ?arg1 ?description + * @return ?description + */ + //?type ?member_function( ?type ?arg1 ); + + protected: // Functions from base classes + + /** + * From ?base_class ?member_description + */ + //?type ?member_function(); + + private: + + /** + * C++ default constructor. + */ + CInputMethodSmokeTestModule( CTestModuleIf& aTestModuleIf ); + + /** + * By default Symbian 2nd phase constructor is private. + */ + void ConstructL(); + + // Prohibit copy constructor if not deriving from CBase. + // ?classname( const ?classname& ); + // Prohibit assigment operator if not deriving from CBase. + // ?classname& operator=( const ?classname& ); + + /** + * Frees all resources allocated from test methods. + * @since ?Series60_version + */ + void Delete(); + + /** + * Test methods are listed below. + */ + + /** + * CreateOcrEngine test method. + * @since ?Series60_version + * @param aItem Script line containing parameters. + * @return Symbian OS error code. + */ + virtual TInt CreateOcrEngineL( CStifItemParser& aItem ); + + /** + * CreatePtiEngine test method. + * @since ?Series60_version + * @param aItem Script line containing parameters. + * @return Symbian OS error code. + */ + virtual TInt CreatePtiEngineL( CStifItemParser& aItem ); + + /** + * CreatePtiEngine test method. + * @since ?Series60_version + * @param aItem Script line containing parameters. + * @return Symbian OS error code. + */ + virtual TInt CreatePtiDictionaryL( CStifItemParser& aItem ); + + /** + * CreatePtiEngine test method. + * @since ?Series60_version + * @param aItem Script line containing parameters. + * @return Symbian OS error code. + */ + virtual TInt MultitapWordL( CStifItemParser& aItem ); + + void PtiEngSimulateInput(CPtiEngine* aEngine, const TDesC& aKeys); + + /** + * Method used to log version of test class + */ + void SendTestClassVersion(); + + //ADD NEW METHOD DEC HERE + //[TestMethods] - Do not remove + + public: // Data + // ?one_line_short_description_of_data + //?data_declaration; + + protected: // Data + // ?one_line_short_description_of_data + //?data_declaration; + + private: // Data + + // ?one_line_short_description_of_data + //?data_declaration; + + // Reserved pointer for future extension + //TAny* iReserved; + + public: // Friend classes + //?friend_class_declaration; + protected: // Friend classes + //?friend_class_declaration; + private: // Friend classes + //?friend_class_declaration; + + }; + +#endif // INPUTMETHODSMOKETESTMODULE_H + +// End of File diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/inc/TestOcrObserver.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/inc/TestOcrObserver.h Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,37 @@ +/* +* Copyright (c) 2002 - 2007 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: test ocrsrv.h + * +*/ + +#ifndef TESTOCROBSERVER_H +#define TESTOCROBSERVER_H + +#include + +/** + * CTestNotesControl is used to add setting page control in its window + */ +class TTestOcrObserver : public MOCREngineObserver + { +public: + // from MOCREngineObserver + void RecognizeBlockComplete( TInt /*aError*/, const TOCRTextRgnInfo* /*aBlocks*/, const TInt /*aBlockCount*/ ) {} + void RecognizeSpecialRegionComplete( TInt /*aError*/, const TOCRTextRgnInfo* /*aBlocks*/, const TInt /*aBlockCount*/ ) {} + void RecognizeComplete( TInt /*aError*/, const TOCRTextRgnInfo* /*aBlocks*/, const TInt /*aBlockCount*/ ) {} + void LayoutComplete( TInt /*aError*/, const TOCRBlockInfo* /*aBlocks*/, const TInt /*aBlockCount*/ ) {} + void RecognizeProcess( const TUint /*aPercent*/ ) {} + }; + +#endif /*TESTOCROBSERVER_H*/ diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/src/InputMethodSmokeTestModule.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/src/InputMethodSmokeTestModule.cpp Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,199 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: This file contains testclass implementation. +* +*/ + +// INCLUDE FILES +#include +#include "InputMethodSmokeTestModule.h" +#include + +// EXTERNAL DATA STRUCTURES +//extern ?external_data; + +// EXTERNAL FUNCTION PROTOTYPES +//extern ?external_function( ?arg_type,?arg_type ); + +// CONSTANTS +//const ?type ?constant_var = ?constant; + +// MACROS +//#define ?macro ?macro_def + +// LOCAL CONSTANTS AND MACROS +//const ?type ?constant_var = ?constant; +//#define ?macro_name ?macro_def + +// MODULE DATA STRUCTURES +//enum ?declaration +//typedef ?declaration + +// LOCAL FUNCTION PROTOTYPES +//?type ?function_name( ?arg_type, ?arg_type ); + +// FORWARD DECLARATIONS +//class ?FORWARD_CLASSNAME; + +// ============================= LOCAL FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// ?function_name ?description. +// ?description +// Returns: ?value_1: ?description +// ?value_n: ?description_line1 +// ?description_line2 +// ----------------------------------------------------------------------------- +// +/* +?type ?function_name( + ?arg_type arg, // ?description + ?arg_type arg) // ?description + { + + ?code // ?comment + + // ?comment + ?code + } +*/ + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::CInputMethodSmokeTestModule +// C++ default constructor can NOT contain any code, that +// might leave. +// ----------------------------------------------------------------------------- +// +CInputMethodSmokeTestModule::CInputMethodSmokeTestModule( + CTestModuleIf& aTestModuleIf ): + CScriptBase( aTestModuleIf ) + { + } + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::ConstructL +// Symbian 2nd phase constructor can leave. +// ----------------------------------------------------------------------------- +// +void CInputMethodSmokeTestModule::ConstructL() + { + //Read logger settings to check whether test case name is to be + //appended to log file name. + RSettingServer settingServer; + TInt ret = settingServer.Connect(); + if(ret != KErrNone) + { + User::Leave(ret); + } + // Struct to StifLogger settigs. + TLoggerSettings loggerSettings; + // Parse StifLogger defaults from STIF initialization file. + ret = settingServer.GetLoggerSettings(loggerSettings); + if(ret != KErrNone) + { + User::Leave(ret); + } + // Close Setting server session + settingServer.Close(); + + TFileName logFileName; + + if(loggerSettings.iAddTestCaseTitle) + { + TName title; + TestModuleIf().GetTestCaseTitleL(title); + logFileName.Format(KInputMethodSmokeTestModuleLogFileWithTitle, &title); + } + else + { + logFileName.Copy(KInputMethodSmokeTestModuleLogFile); + } + + iLog = CStifLogger::NewL( KInputMethodSmokeTestModuleLogPath, + logFileName, + CStifLogger::ETxt, + CStifLogger::EFile, + EFalse ); + + SendTestClassVersion(); + } + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::NewL +// Two-phased constructor. +// ----------------------------------------------------------------------------- +// +CInputMethodSmokeTestModule* CInputMethodSmokeTestModule::NewL( + CTestModuleIf& aTestModuleIf ) + { + CInputMethodSmokeTestModule* self = new (ELeave) CInputMethodSmokeTestModule( aTestModuleIf ); + + CleanupStack::PushL( self ); + self->ConstructL(); + CleanupStack::Pop(); + + return self; + + } + +// Destructor +CInputMethodSmokeTestModule::~CInputMethodSmokeTestModule() + { + + // Delete resources allocated from test methods + Delete(); + + // Delete logger + delete iLog; + + } + +//----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::SendTestClassVersion +// Method used to send version of test class +//----------------------------------------------------------------------------- +// +void CInputMethodSmokeTestModule::SendTestClassVersion() + { + TVersion moduleVersion; + moduleVersion.iMajor = TEST_CLASS_VERSION_MAJOR; + moduleVersion.iMinor = TEST_CLASS_VERSION_MINOR; + moduleVersion.iBuild = TEST_CLASS_VERSION_BUILD; + + TFileName moduleName; + moduleName = _L("InputMethodSmokeTestModule.dll"); + + TBool newVersionOfMethod = ETrue; + TestModuleIf().SendTestModuleVersion(moduleVersion, moduleName, newVersionOfMethod); + } + +// ========================== OTHER EXPORTED FUNCTIONS ========================= + +// ----------------------------------------------------------------------------- +// LibEntryL is a polymorphic Dll entry point. +// Returns: CScriptBase: New CScriptBase derived object +// ----------------------------------------------------------------------------- +// +EXPORT_C CScriptBase* LibEntryL( + CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework + { + + return ( CScriptBase* ) CInputMethodSmokeTestModule::NewL( aTestModuleIf ); + + } + + +// End of File diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/src/InputMethodSmokeTestModuleBlocks.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/src/InputMethodSmokeTestModuleBlocks.cpp Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,285 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of the License "Symbian Foundation License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: This file contains testclass implementation. +* +*/ + +// [INCLUDE FILES] - do not remove +#include +#include +#include +#include +#include +#include +#include +#include "InputMethodSmokeTestModule.h" +#include "TestOcrObserver.h" + +// EXTERNAL DATA STRUCTURES +//extern ?external_data; + +// EXTERNAL FUNCTION PROTOTYPES +//extern ?external_function( ?arg_type,?arg_type ); + +// CONSTANTS +//const ?type ?constant_var = ?constant; +const TInt KMaxSize = 32; + +// MACROS +//#define ?macro ?macro_def + +// LOCAL CONSTANTS AND MACROS +//const ?type ?constant_var = ?constant; +//#define ?macro_name ?macro_def + +// MODULE DATA STRUCTURES +//enum ?declaration +//typedef ?declaration + +// LOCAL FUNCTION PROTOTYPES +//?type ?function_name( ?arg_type, ?arg_type ); + +// FORWARD DECLARATIONS +//class ?FORWARD_CLASSNAME; + +// ============================= LOCAL FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// ?function_name ?description. +// ?description +// Returns: ?value_1: ?description +// ?value_n: ?description_line1 +// ?description_line2 +// ----------------------------------------------------------------------------- +// +/* +?type ?function_name( + ?arg_type arg, // ?description + ?arg_type arg) // ?description + { + + ?code // ?comment + + // ?comment + ?code + } +*/ + +// ============================ MEMBER FUNCTIONS =============================== + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::Delete +// Delete here all resources allocated and opened from test methods. +// Called from destructor. +// ----------------------------------------------------------------------------- +// +void CInputMethodSmokeTestModule::Delete() + { + + } + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::RunMethodL +// Run specified method. Contains also table of test mothods and their names. +// ----------------------------------------------------------------------------- +// +TInt CInputMethodSmokeTestModule::RunMethodL( + CStifItemParser& aItem ) + { + static TStifFunctionInfo const KFunctions[] = + { + // Copy this line for every implemented function. + // First string is the function name used in TestScripter script file. + // Second is the actual implementation member function. + ENTRY( "CreateOcrEngine", CInputMethodSmokeTestModule::CreateOcrEngineL ), + ENTRY( "CreatePtiEngine", CInputMethodSmokeTestModule::CreatePtiEngineL ), + ENTRY( "CreatePtiDictionary", CInputMethodSmokeTestModule::CreatePtiDictionaryL ), + ENTRY( "MultitapWord", CInputMethodSmokeTestModule::MultitapWordL ), + //ADD NEW ENTRY HERE + // [test cases entries] - Do not remove + + }; + + const TInt count = sizeof( KFunctions ) / + sizeof( TStifFunctionInfo ); + + return RunInternalL( KFunctions, count, aItem ); + } + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::ExampleL +// Example test method function. +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +TInt CInputMethodSmokeTestModule::CreateOcrEngineL( CStifItemParser& /*aItem*/ ) + { + // Print to UI + _LIT( KInputMethodSmokeTestModule, "InputMethodSmokeTestModule" ); + _LIT( KCreateOcrEngine, "In Create OCR Engine" ); + + iLog->Log( KCreateOcrEngine ); + + TOcrEngineEnv engineEnv; + engineEnv.iPriority = EPriorityNormal; + engineEnv.iMaxHeapSize = 1200+KMinHeapGrowBy+1; + + TTestOcrObserver observer; + + MOCREngineInterface* ocrEngine = NULL; + ocrEngine = OCREngineFactory::CreateOCREngineL(observer, engineEnv, OCREngineFactory::EEngineLayoutRecognize); + + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::ExampleL +// Example test method function. +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +TInt CInputMethodSmokeTestModule::CreatePtiEngineL( CStifItemParser& /*aItem*/ ) + { + // Print to UI + _LIT( KInputMethodSmokeTestModule, "InputMethodSmokeTestModule" ); + _LIT( KCreatePtiEngine, "In Create PTI Engine" ); + + iLog->Log( KCreatePtiEngine ); + + CPtiEngine* ptiEngine = CPtiEngine::NewL(); + CleanupStack::PushL(ptiEngine); + + ptiEngine->ActivateLanguageL(ELangEnglish, EPtiEngineMultitapping); + + CleanupStack::PopAndDestroy(ptiEngine); + REComSession::FinalClose(); + + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::ExampleL +// Example test method function. +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +TInt CInputMethodSmokeTestModule::CreatePtiDictionaryL( CStifItemParser& /*aItem*/ ) + { + // Print to UI + _LIT( KInputMethodSmokeTestModule, "InputMethodSmokeTestModule" ); + _LIT( KCreatePtiDictionary, "In Create PTI Dictionary" ); + + iLog->Log( KCreatePtiDictionary ); + + CPtiUserDictionary* ptiDictionary = CPtiUserDictionary::NewL(KMaxSize); + + delete ptiDictionary; + ptiDictionary = NULL; + + REComSession::FinalClose(); + + return KErrNone; + } + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::ExampleL +// Example test method function. +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +TInt CInputMethodSmokeTestModule::MultitapWordL(CStifItemParser& aItem) + { + // Print to UI + _LIT( KInputMethodSmokeTestModule, "InputMethodSmokeTestModule" ); + _LIT( KMultitapWord, "In Multitap Word" ); + + iLog->Log( KMultitapWord ); + + TPtrC inputSequence; + if ( aItem.GetNextString(inputSequence) == KErrNone ) + { + CPtiEngine *ptiEngine = CPtiEngine::NewL(); + CleanupStack::PushL(ptiEngine); + + // setup multitap + ptiEngine->ActivateLanguageL(ELangEnglish, EPtiEngineMultitapping); + PtiEngSimulateInput(ptiEngine, inputSequence); + + TPtrC expectedWord; + if ( aItem.GetNextString(expectedWord) == KErrNone ) + { + if ( ptiEngine->CurrentWord() == expectedWord ) + { + iLog->Log(_L("Words matched")); + } + else + { + User::Leave(KErrArgument); + } + } + + ptiEngine->CommitCurrentWord(); + + ptiEngine->CloseCurrentLanguageL(); + CleanupStack::PopAndDestroy(ptiEngine); + REComSession::FinalClose(); + } + + return KErrNone; + } + +void CInputMethodSmokeTestModule::PtiEngSimulateInput(CPtiEngine* aEngine, const TDesC& aKeys) + { + for(int i=0; iDeleteKeyPress(); + } + else + { + aEngine->AppendKeyPress(aEngine->CharacterToKey(aKeys[i])); + } + } + } + + +// ----------------------------------------------------------------------------- +// CInputMethodSmokeTestModule::?member_function +// ?implementation_description +// (other items were commented in a header). +// ----------------------------------------------------------------------------- +// +/* +TInt CInputMethodSmokeTestModule::?member_function( + CItemParser& aItem ) + { + + ?code + + } +*/ + +// ========================== OTHER EXPORTED FUNCTIONS ========================= +// None + +// [End of File] - Do not remove diff -r 736214c0060b -r 862cab47b1ba common/tools/ats/smoketest/inputmethods/src/TestOcrObserver.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/tools/ats/smoketest/inputmethods/src/TestOcrObserver.cpp Fri Nov 13 11:20:06 2009 +0000 @@ -0,0 +1,1 @@ +