# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1273847793 -10800 # Node ID d6ef85bc5971e4e15f2743d6061c6b3964fe3671 # Parent 55f2396f6d254ae9effd2e93bc71cf517e018bbb Revision: 201019 Kit: 201019 diff -r 55f2396f6d25 -r d6ef85bc5971 featuremgmt/featuremgr/group/featmgrserver.mmp --- a/featuremgmt/featuremgr/group/featmgrserver.mmp Mon May 03 14:09:14 2010 +0300 +++ b/featuremgmt/featuremgr/group/featmgrserver.mmp Fri May 14 17:36:33 2010 +0300 @@ -13,21 +13,20 @@ // Description: // +#ifdef __FEATMGR_TESTCFG__ +TARGET test_featmgrserver.exe +CAPABILITY AllFiles +#else +TARGET featmgrserver.exe +#endif // __FEATMGR_TESTCFG__ -#ifndef __FEATMGR_TESTCFG__ -TARGET featmgrserver.exe // Since this is an exe with no alternate implementations, // just use same UID for both UID2 and UID3 UID 0x10205054 0x10205054 -#else -TARGET test_featmgrserver.exe -UID 0x102836E5 0x102836E5 -#endif // __FEATMGR_TESTCFG__ - +CAPABILITY ProtServ ReadDeviceData TARGETTYPE exe VENDORID 0x70000001 -CAPABILITY ProtServ ReadDeviceData //CodeWarrior compilation options - disable the "illegal pragma" warning OPTION CW -w noillpragmas diff -r 55f2396f6d25 -r d6ef85bc5971 featuremgmt/featuremgr/src/inc/featmgrconfiguration.h --- a/featuremgmt/featuremgr/src/inc/featmgrconfiguration.h Mon May 03 14:09:14 2010 +0300 +++ b/featuremgmt/featuremgr/src/inc/featmgrconfiguration.h Fri May 14 17:36:33 2010 +0300 @@ -32,7 +32,7 @@ const TInt KDefaultFeatMgrTimer = (10*1000*1000); #ifdef EXTENDED_FEATURE_MANAGER_TEST const TInt KShutdownTimeout = 500000; -const TInt KServerUid2Int = 0x102836E5; +const TInt KServerUid2Int = 0x10205054; #else const TInt KServerUid2Int = 0x10205054; #endif // EXTENDED_FEATURE_MANAGER_TEST diff -r 55f2396f6d25 -r d6ef85bc5971 featuremgmt/featuremgr/test/rtest/group/t_fmgrstartup.mmp --- a/featuremgmt/featuremgr/test/rtest/group/t_fmgrstartup.mmp Mon May 03 14:09:14 2010 +0300 +++ b/featuremgmt/featuremgr/test/rtest/group/t_fmgrstartup.mmp Fri May 14 17:36:33 2010 +0300 @@ -15,6 +15,7 @@ TARGET t_fmgrstartup.exe TARGETTYPE exe +UID 0x10205054 0x10205054 MACRO EXTENDED_FEATURE_MANAGER_TEST MACRO FEATURE_MANAGER_STARTUP_TEST diff -r 55f2396f6d25 -r d6ef85bc5971 featuremgmt/featuremgr/test/rtest/src/t_fmgrapi.cpp --- a/featuremgmt/featuremgr/test/rtest/src/t_fmgrapi.cpp Mon May 03 14:09:14 2010 +0300 +++ b/featuremgmt/featuremgr/test/rtest/src/t_fmgrapi.cpp Fri May 14 17:36:33 2010 +0300 @@ -28,6 +28,8 @@ /////////////////////////////////////////////////////////////////////////////////////// static RTest TheTest(_L("t_fmgrapi")); +TUid SupportedFeature = KConnectivity; //Defaulted to KConnectivity, but we will re-assign it in FeatureTestPreparation(). +TUid SupportedFeature2 = KSip; //Defaulted to KSip, but we will re-assign it in FeatureTestPreparation(). /////////////////////////////////////////////////////////////////////////////////////// @@ -284,24 +286,24 @@ { TBool rc = CFeatureDiscovery::IsFeatureSupportedL(KInvalidFeatureId1); TEST(!rc); - rc = CFeatureDiscovery::IsFeatureSupportedL(KLocationManagement.iUid); + rc = CFeatureDiscovery::IsFeatureSupportedL(SupportedFeature.iUid); TEST(rc); rc = CFeatureDiscovery::IsFeatureSupportedL(KInvalidFeatureUid1); TEST(!rc); - rc = CFeatureDiscovery::IsFeatureSupportedL(KLocationManagement); + rc = CFeatureDiscovery::IsFeatureSupportedL(SupportedFeature); TEST(rc); CFeatureDiscovery* fdiscovery = CFeatureDiscovery::NewLC(); rc = fdiscovery->IsSupported(KInvalidFeatureId1); TEST(!rc); - rc = fdiscovery->IsSupported(KLocationManagement.iUid); + rc = fdiscovery->IsSupported(SupportedFeature.iUid); TEST(rc); rc = fdiscovery->IsSupported(KInvalidFeatureUid1); TEST(!rc); - rc = fdiscovery->IsSupported(KLocationManagement); + rc = fdiscovery->IsSupported(SupportedFeature); TEST(rc); CleanupStack::PopAndDestroy(fdiscovery); @@ -317,11 +319,11 @@ ////////////////////////////////////////////////////////// //A test with a set: one valid and one invalid feature TFeatureSet fset; - TInt err = fset.Append(KConnectivity); + TInt err = fset.Append(SupportedFeature); TEST2(err, KErrNone); err = fset.Append(KInvalidFeatureUid1); TEST2(err, KErrNone); - TBool rc = fset.IsFeatureSupported(KConnectivity); + TBool rc = fset.IsFeatureSupported(SupportedFeature); TEST(!rc); rc = fset.IsFeatureSupported(KInvalidFeatureUid1); TEST(!rc); @@ -334,7 +336,7 @@ err = fdiscovery->FeaturesSupported(fset); } TEST2(err, KErrNone); - rc = fset.IsFeatureSupported(KConnectivity); + rc = fset.IsFeatureSupported(SupportedFeature); TEST(rc); rc = fset.IsFeatureSupported(KInvalidFeatureUid1); TEST(!rc); @@ -343,7 +345,7 @@ ////////////////////////////////////////////////////////// //A test with an empty set TFeatureSet fset2; - rc = fset2.IsFeatureSupported(KConnectivity); + rc = fset2.IsFeatureSupported(SupportedFeature); TEST(!rc); rc = fset2.IsFeatureSupported(KInvalidFeatureUid1); TEST(!rc); @@ -356,7 +358,7 @@ err = fdiscovery->FeaturesSupported(fset2); } TEST2(err, KErrArgument); - rc = fset2.IsFeatureSupported(KConnectivity); + rc = fset2.IsFeatureSupported(SupportedFeature); TEST(!rc); rc = fset2.IsFeatureSupported(KInvalidFeatureUid1); TEST(!rc); @@ -365,9 +367,9 @@ ////////////////////////////////////////////////////////// //A test with a set: two valid features TFeatureSet fset3; - err = fset3.Append(KConnectivity); + err = fset3.Append(SupportedFeature); TEST2(err, KErrNone); - err = fset3.Append(KSip); + err = fset3.Append(SupportedFeature2); TEST2(err, KErrNone); if(aStaticMethodsUsed) { @@ -378,9 +380,9 @@ err = fdiscovery->FeaturesSupported(fset3); } TEST2(err, KErrNone); - rc = fset3.IsFeatureSupported(KConnectivity); + rc = fset3.IsFeatureSupported(SupportedFeature); TEST(rc); - rc = fset3.IsFeatureSupported(KSip); + rc = fset3.IsFeatureSupported(SupportedFeature2); TEST(rc); rc = fset3.AreAllFeaturesSupported(); TEST(rc); @@ -402,8 +404,31 @@ DoFeatureDiscoveryTest2L(EFalse); } +void FeatureTestPreparation() + { + RFeatureControl ctrl; + TInt err = ctrl.Open(); + TEST2(err, KErrNone); + ///////////////////////////////////////////////////////////// + RFeatureUidArray farray; + TheTest.Printf(_L("Getting supported feature for CFeatureDiscovery test\r\n")); + err = ctrl.ListSupportedFeatures(farray); + if (err == KErrNone && farray.Count() > 1) + { + SupportedFeature = farray[0]; //Take the first supported value + SupportedFeature2 = farray[1]; //Take the first supported value + } + else + { + TheTest.Printf(_L("Warning: Failed to get supported feature for testing. CFeatureDiscovery tests are going to fail\r\n")); + } + farray.Close(); + ctrl.Close(); + } + void DoTestsL() { + FeatureTestPreparation(); //Preparation for the test. TheTest.Start(_L("@SYMTestCaseID:PDS-EFM-CT-4059 FeatureManager::FeatureSupported() test")); FeatureSupportedTestL(); TheTest.Next(_L("@SYMTestCaseID:PDS-EFM-CT-4060 RFeatureControl tests-1")); diff -r 55f2396f6d25 -r d6ef85bc5971 featuremgmt/featuremgr/test/rtest/src/t_fmgrstartup.cpp --- a/featuremgmt/featuremgr/test/rtest/src/t_fmgrstartup.cpp Mon May 03 14:09:14 2010 +0300 +++ b/featuremgmt/featuremgr/test/rtest/src/t_fmgrstartup.cpp Fri May 14 17:36:33 2010 +0300 @@ -26,6 +26,7 @@ static const TInt KBurstRate = 20; #endif +void DestroyTestEnv(); /////////////////////////////////////////////////////////////////////////////////////// static RTest TheTest(_L("t_fmgrstartup")); @@ -37,24 +38,6 @@ #endif /////////////////////////////////////////////////////////////////////////////////////// - -//Deletes all created test files. -void DestroyTestEnv() - { - //KFeaturesDir is defined only if EXTENDED_FEATURE_MANAGER_TEST is defined -#ifdef EXTENDED_FEATURE_MANAGER_TEST - RFs fs; - TInt err = fs.Connect(); - if(err == KErrNone) - { - (void)fs.Delete(KFeaturesFile); - } - fs.Close(); -#endif - } - -/////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////////////////// //Test macros and functions void Check1(TInt aValue, TInt aLine) { @@ -78,6 +61,45 @@ #define TEST2(aValue, aExpected) ::Check2(aValue, aExpected, __LINE__) /////////////////////////////////////////////////////////////////////////////////////// +void CreateTestEnv() + { + //KFeaturesDir is defined only if EXTENDED_FEATURE_MANAGER_TEST is defined +#ifdef EXTENDED_FEATURE_MANAGER_TEST + RFs fs; + TInt err = fs.Connect(); + TEST2(err, KErrNone); + + err = fs.MkDir(KFeaturesDir); + TEST (err == KErrNone || err == KErrAlreadyExists); + + (void)fs.Delete(KFeaturesFile); + err = BaflUtils::CopyFile(fs, KZOrgFeaturesFile, KFeaturesDir); + TEST2 (err, KErrNone); + err = fs.SetAtt(KFeaturesFile, KEntryAttNormal, KEntryAttReadOnly); + TEST2 (err, KErrNone); + fs.Close(); +#endif + } + +//Deletes all created test files. +void DestroyTestEnv() + { + //KFeaturesDir is defined only if EXTENDED_FEATURE_MANAGER_TEST is defined +#ifdef EXTENDED_FEATURE_MANAGER_TEST + RFs fs; + TInt err = fs.Connect(); + if(err == KErrNone) + { + err = fs.Delete(KFeaturesFile); + if (err != KErrNone) + { + RDebug::Print(_L("Warning: Clean test enviroment failed with error %d"), err); + } + } + fs.Close(); +#endif + } +/////////////////////////////////////////////////////////////////////////////////////// static void MarkHandles() { @@ -193,24 +215,6 @@ TheTest.Printf(_L("\r\n===File I/O error simulation test succeeded on iteration %d===\r\n"), cnt); } -void CreateTestEnv() - { - //KFeaturesDir is defined only if EXTENDED_FEATURE_MANAGER_TEST is defined -#ifdef EXTENDED_FEATURE_MANAGER_TEST - RFs fs; - TInt err = fs.Connect(); - TEST2(err, KErrNone); - - err = fs.MkDir(KFeaturesDir); - TEST (err == KErrNone || err == KErrAlreadyExists); - - (void)fs.Delete(KFeaturesFile); - err = BaflUtils::CopyFile(fs, KZOrgFeaturesFile, KFeaturesDir); - TEST2 (err, KErrNone); - - fs.Close(); -#endif - } void DoTestsL() { diff -r 55f2396f6d25 -r d6ef85bc5971 featuremgmt/featuremgr/test/tef/tef_efm_configured/src/characterisation_steps.cpp --- a/featuremgmt/featuremgr/test/tef/tef_efm_configured/src/characterisation_steps.cpp Mon May 03 14:09:14 2010 +0300 +++ b/featuremgmt/featuremgr/test/tef/tef_efm_configured/src/characterisation_steps.cpp Fri May 14 17:36:33 2010 +0300 @@ -27,22 +27,16 @@ #include "characterisation_steps.h" #include "efm_teststepbase.h" + +TBool SkipPerformanceTest = EFalse; +const TInt KPlatSimUid = 0x20029a73; //0x20029a73 will be changed soon once PlatSim get its own uid. + // This is the base class for some of our characterisation tests. // Creates an RFeatureControl object, finds out what the fast counter // frequency is and gets the timeout for this test. TVerdict CCharacteriseBaseStep :: doTestStepPreambleL() { - // First find out the granularity of the system clock.. - HAL::Get(HALData::EFastCounterFrequency, icountfreq); - INFO_PRINTF2(_L("Counts per sec=%d"), icountfreq); - icountperusec = icountfreq/1000000.0; - INFO_PRINTF2(_L("Counts per usec=%f"), icountperusec); - TInt err = icontrol.Open(); - TESTDIAGNOSTICERROR(err==KErrNone, - _L("RFeatureControl::Open failed: error = %d"), err); - if(err) { return TestStepResult(); } - CleanupClosePushL(icontrol); // Get the timeout from the .ini file. The name of the timeout entry // varies depending on what type of build we have. @@ -68,6 +62,10 @@ case HAL::EMachineUid_NE1_TB: timeoutini.Append(_L("_NE1")); break; + case KPlatSimUid: + ERR_PRINTF1(_L("Not running performance test in PlatSim")); + SkipPerformanceTest = ETrue; //Skip performance test on PlatSim + break; //add any new hardware IDs here default: break; @@ -78,21 +76,37 @@ #else timeoutini.Append(_L("_UREL")); #endif - - // Get the timeout, which is measured in microseconds. - if( !GetIntFromConfig(ConfigSection(), timeoutini, itimeout ) ) - { - ERR_PRINTF2(_L("Can't find '%S' in .ini file"), - &timeoutini ); - CleanupStack::PopAndDestroy(&icontrol); - SetTestStepResult(EFail); - return TestStepResult(); - } + if (!SkipPerformanceTest) + { + // First find out the granularity of the system clock.. + HAL::Get(HALData::EFastCounterFrequency, icountfreq); + INFO_PRINTF2(_L("Counts per sec=%d"), icountfreq); + icountperusec = icountfreq/1000000.0; + INFO_PRINTF2(_L("Counts per usec=%f"), icountperusec); + TInt err = icontrol.Open(); + TESTDIAGNOSTICERROR(err==KErrNone, + _L("RFeatureControl::Open failed: error = %d"), err); + if(err) { return TestStepResult(); } + CleanupClosePushL(icontrol); + // Get the timeout, which is measured in microseconds. + if( !GetIntFromConfig(ConfigSection(), timeoutini, itimeout ) ) + { + ERR_PRINTF2(_L("Can't find '%S' in .ini file"), + &timeoutini ); + CleanupStack::PopAndDestroy(&icontrol); + SetTestStepResult(EFail); + return TestStepResult(); + } + } return TestStepResult(); } TVerdict CCharacteriseBaseStep :: doTestStepPostambleL() { + if (SkipPerformanceTest) + { + return TestStepResult(); + } CleanupStack::PopAndDestroy(&icontrol); return TestStepResult(); } @@ -104,6 +118,10 @@ TVerdict CCharacteriseSupportedStep::doTestStepL() { + if (SkipPerformanceTest) + { + return TestStepResult(); + } // The base class 'CCharacteriseBaseStep' has already opened the // RFeatureControl object and read in the timeout number. @@ -171,6 +189,10 @@ TVerdict CCharacteriseSupportedArrayStep::doTestStepL() { + if (SkipPerformanceTest) + { + return TestStepResult(); + } // Find out how many features we're going to attempt to read.. TInt nfeats, minuid, expsup; if(!GetIntFromConfig(ConfigSection(), _L("NumFeaturesToRead"), nfeats) || diff -r 55f2396f6d25 -r d6ef85bc5971 featuremgmt/featuremgr/test/tef/tef_efm_normal/src/component_test_steps.cpp --- a/featuremgmt/featuremgr/test/tef/tef_efm_normal/src/component_test_steps.cpp Mon May 03 14:09:14 2010 +0300 +++ b/featuremgmt/featuremgr/test/tef/tef_efm_normal/src/component_test_steps.cpp Fri May 14 17:36:33 2010 +0300 @@ -161,7 +161,8 @@ { TThreadId id = RThread().Id(); TUid uid = {id.Id()}; - uid.iUid += 500; + uid.iUid += 0x1001000; + // Create the thread info instance that would hold the results for the tests below TThreadTestInfo info; info.iId = uid.iUid; diff -r 55f2396f6d25 -r d6ef85bc5971 featuremgmt/featuremgr/test/tef/tef_efm_normal/src/featurecontrol_test_steps.cpp --- a/featuremgmt/featuremgr/test/tef/tef_efm_normal/src/featurecontrol_test_steps.cpp Mon May 03 14:09:14 2010 +0300 +++ b/featuremgmt/featuremgr/test/tef/tef_efm_normal/src/featurecontrol_test_steps.cpp Fri May 14 17:36:33 2010 +0300 @@ -174,7 +174,7 @@ _L("RFeatureControl::Open failed: error = %d"),err); // Fetch status for "unknown" feature - TFeatureEntry emptyEntry; + TFeatureEntry emptyEntry(TUid::Uid(0x1000005)); TInt supported = control.FeatureSupported( emptyEntry ); TESTDIAGNOSTICERROR(supported == KErrNotFound, _L("RFeatureControl::FeatureSupported - KErrNotFound expected for unknown feature; returned value is %d"),supported); diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/Rom/logengtest.iby --- a/loggingservices/eventlogger/Rom/logengtest.iby Mon May 03 14:09:14 2010 +0300 +++ b/loggingservices/eventlogger/Rom/logengtest.iby Fri May 14 17:36:33 2010 +0300 @@ -25,11 +25,8 @@ //for t_logview2 #include -//Include cntmodel stuff to allow manual test t_logcntmatch to be run -data=MULTI_LINGUIFY(RSC ZRESOURCE\CNTMODEL\CNTMODEL RESOURCE\CNTMODEL\CNTMODEL) -#include +ECOM_PLUGIN(t_logcntmatchplugin.dll,2000862e.rsc) -file=ABI_DIR\BUILD_DIR\t_logenvcreate.exe Test\t_logenvcreate.exe file=ABI_DIR\BUILD_DIR\t_logtype.exe Test\t_logtype.exe file=ABI_DIR\BUILD_DIR\t_logapi.exe Test\t_logapi.exe file=ABI_DIR\BUILD_DIR\t_logapi2.exe Test\t_logapi2.exe @@ -63,7 +60,6 @@ file=ABI_DIR\BUILD_DIR\t_logapi_helper.exe Test\t_logapi_helper.exe file=ABI_DIR\BUILD_DIR\t_logcompat.exe Test\t_logcompat.exe file=ABI_DIR\BUILD_DIR\t_logsimid.exe Test\t_logsimid.exe -file=ABI_DIR\BUILD_DIR\t_logenvdestroy.exe Test\t_logenvdestroy.exe data=ZSYSTEM\test\logengtests.bat Test\logengtests.bat data=ZSYSTEM\data\oldLogdbu.dat system\data\oldLogdbu.dat @@ -74,7 +70,4 @@ //the following file is missing and needed by the time zone server. //data=ZPRIVATE\10202BE9\1020383e.txt private\10202be9\1020383e.txt -data=ZPRIVATE\101f401d\CntModel.ini \PRIVATE\101f401d\CntModel.ini -data=ZPRIVATE\101f401d\SQLite__Contacts.cdb \PRIVATE\101f401d\SQLite__Contacts.cdb - #endif diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/group/BLD.INF --- a/loggingservices/eventlogger/group/BLD.INF Mon May 03 14:09:14 2010 +0300 +++ b/loggingservices/eventlogger/group/BLD.INF Fri May 14 17:36:33 2010 +0300 @@ -66,7 +66,6 @@ PRJ_TESTMMPFILES -../test/t_logenvcreate.mmp ../test/t_logtype.mmp ../test/t_logapi.mmp ../test/t_logapi2.mmp @@ -97,10 +96,10 @@ ../test/t_logsecureview_hicap.mmp ../test/T_LogSecurity.mmp ../test/t_logservIPC.mmp -../test/t_logapi_helper.mmp support +../test/t_logapi_helper.mmp support ../test/t_logcompat.mmp ../test/t_logsimid.mmp -../test/t_logenvdestroy.mmp +../test/t_logcntmatchplugin.mmp support PRJ_TESTEXTENSIONS start extension syslibs/test/logeng_copytestfiles diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/group/logengtests.bat --- a/loggingservices/eventlogger/group/logengtests.bat Mon May 03 14:09:14 2010 +0300 +++ b/loggingservices/eventlogger/group/logengtests.bat Fri May 14 17:36:33 2010 +0300 @@ -14,7 +14,6 @@ @rem Description: @rem -t_logenvcreate.exe t_logtype.exe t_logapi.exe t_logapi2.exe @@ -46,4 +45,3 @@ t_logservipc.exe t_logcompat.exe t_logsimid.exe -t_logenvdestroy.exe diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/logcntmodel/inc/logcntmodel.h --- a/loggingservices/eventlogger/logcntmodel/inc/logcntmodel.h Mon May 03 14:09:14 2010 +0300 +++ b/loggingservices/eventlogger/logcntmodel/inc/logcntmodel.h Fri May 14 17:36:33 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" @@ -65,8 +65,11 @@ /** Interface UID to be used by all contacts model plugin's for log engine @internalAll */ -const TUid KUidEComLogCntInterface = {0x20008029}; - +#ifdef SYSLIBS_TEST + const TUid KUidEComLogCntInterface = {0x20008030}; +#else + const TUid KUidEComLogCntInterface = {0x20008029}; +#endif /** Provides an interface for ECom plugins @internalAll */ class CLogCntModel: public CBase, public MLogCntModel diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/inc/t_logcntmatchplugin.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loggingservices/eventlogger/test/inc/t_logcntmatchplugin.h Fri May 14 17:36:33 2010 +0300 @@ -0,0 +1,75 @@ +// 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: +// Header file of the ECom impletementation of for testing contact matching. +// + +#ifndef __CNTMATCHLOG_H__ +#define __CNTMATCHLOG_H__ + +#include +#include +#include +#include + +//The contact items +const TInt KNumberOfItems = 7; + +_LIT(KNumber1, "447700900000"); +_LIT(KNumber2, "+441632960000"); +_LIT(KNumber3, "07700900001"); +_LIT(KNumber4, "447756900111"); +_LIT(KNumber5, "447756900111"); +_LIT(KNumber6, "1234567890"); +_LIT(KNumber7, "0123456789"); + +_LIT(KFirstName1, "Barney"); +_LIT(KFirstName2, "Elma"); +_LIT(KFirstName3, "Peter"); +_LIT(KFirstName4, "Abc"); +_LIT(KFirstName5, "Rtyu"); +_LIT(KFirstName6, "Zxcvb"); +_LIT(KFirstName7, "AAA"); + +_LIT(KLastName1, "Rubble"); +_LIT(KLastName2, "Fudd"); +_LIT(KLastName3, "Harper"); +_LIT(KLastName4, "Lkjhgf"); +_LIT(KLastName5, "Poiuytqwe"); +_LIT(KLastName6, "Mnbvcxz"); +_LIT(KLastName7, "BBB"); + +/** Plugin implementation that provide contacts matching functionality. + +@internalAll +*/ +class CLogTestCntMatch : public CLogCntModel + { +public: + static CLogTestCntMatch* NewL(); + virtual void OpenContactsL(); + virtual void CloseContacts(); + virtual TLogContactItemId MatchPhoneNumberL(const TDesC& aNumber, TInt aMatchLengthFromRight); + virtual void ReadContactNameL(TLogContactItemId aContactId, TDes &aName, TLogContactNameFormat aNameFormat); + +private: + ~CLogTestCntMatch(); + CLogTestCntMatch(); + + void ConstructL(); + CDesCArray* iTelNumbers; + CDesCArray* iContactFirstNames; + CDesCArray* iContactLastNames; + }; + +#endif diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/src/2000862e.rss --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loggingservices/eventlogger/test/src/2000862e.rss Fri May 14 17:36:33 2010 +0300 @@ -0,0 +1,40 @@ +// 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: +// + +#include "ecom/registryinfov2.rh" +RESOURCE REGISTRY_INFO theInfo + { + resource_format_version = RESOURCE_FORMAT_VERSION_2; + + dll_uid = 0x2000862e;//should match name of this file i.e 2000862e.rss + interfaces = + { + INTERFACE_INFO + { + interface_uid = 0x20008030;//match the ecom plugin uid const TUid KUidEComLogCntInterface = {0x20008030}; + implementations = + { + IMPLEMENTATION_INFO + { + implementation_uid = 0x2000862a;//matching IMPLEMENTATION_PROXY_ENTRY() in cntmatchlog.cpp + version_no = 1; + display_name = "default contacts matching Implementation"; + default_data = "default"; + opaque_data = ""; + } + }; + } + }; + } diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/src/t_logcntmatch.cpp --- a/loggingservices/eventlogger/test/src/t_logcntmatch.cpp Mon May 03 14:09:14 2010 +0300 +++ b/loggingservices/eventlogger/test/src/t_logcntmatch.cpp Fri May 14 17:36:33 2010 +0300 @@ -23,43 +23,7 @@ #include #include #include "t_logutil2.h" - -///////////////////////////////////////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////////////////////////////////////// - -//The test uses a test contact database (SQLite__Contacts.cdb), part of LogEng data files. -//The test contact database contains the follwing contacts: -//{1, KPhoneNumber, KGivenName, KFamilyName} -//{2, KNumber1, KFirstName1, KLastName1} -//{3, KNumber2, KFirstName2, KLastName2} -//{4, KNumber3, KFirstName3, KLastName3} -//{5, KNumber4, KFirstName4, KLastName4} -//{6, KNumber4, KFirstName5, KLastName5} -//{7, KTestNum, KFirstName6, KLastName6} - -//The records data -_LIT(KFirstName1, "Barney"); -_LIT(KFirstName2, "Elma"); -_LIT(KFirstName3, "Peter"); -_LIT(KLastName1, "Rubble"); -_LIT(KLastName2, "Fudd"); -_LIT(KLastName3, "Harper"); -_LIT(KNumber1, "447700900000"); -_LIT(KNumber2, "+441632960000"); -_LIT(KNumber3, "07700 900001"); -//_LIT(KFirstName4, "Abc"); -_LIT(KFirstName5, "Rtyu"); -_LIT(KFirstName6, "Zxcvb"); -//_LIT(KLastName4, "Lkjhgf"); -//_LIT(KLastName5, "Poiuytqwe"); -_LIT(KLastName6, "Mnbvcxz"); -_LIT(KNumber4, "447756900111"); -//_LIT(KNumber5, "+441987960222"); -//_LIT(KNumber6, "07700 608101"); -_LIT(KGivenName, "AAA"); -_LIT(KFamilyName, "BBB"); -_LIT(KPhoneNumber, "0123456789"); -_LIT(KTestNum, "1234567890"); +#include "t_logcntmatchplugin.h" RTest TheTest(_L("t_logcntmatch")); @@ -281,10 +245,10 @@ CleanupStack::PushL(event); event->SetEventType(KLogCallEventTypeUid); - TInt count = KTestNum().Length(); + TInt count = KNumber6().Length(); while(count--) { - TPtrC num = KTestNum().Right(KTestNum().Length() - count); + TPtrC num = KNumber6().Right(KNumber6().Length() - count); event->SetNumber(num); // Add event @@ -333,7 +297,7 @@ CLogEvent* event = CLogEvent::NewL(); CleanupStack::PushL(event); event->SetEventType(KLogCallEventTypeUid); - event->SetNumber(KPhoneNumber); + event->SetNumber(KNumber7); active->StartL(); aClient.AddEvent(*event, active->iStatus); CActiveScheduler::Start(); @@ -343,7 +307,7 @@ //Check result TEST(event->Contact() != KLogNullContactId); - ::CheckContactName(*event, KGivenName, KFamilyName); + ::CheckContactName(*event, KFirstName7, KLastName7); TEST(event->Flags() & KLogEventContactSearched); //Cleanup @@ -372,8 +336,9 @@ CLogClient* client = CLogClient::NewL(theFs); CleanupStack::PushL(client); - //All tests bellow are likely to fail if 101f401d.txt file exists in CentralRepository private data cage - //and the contact mach count is set to 0 in that file. + //All tests bellow are likely to fail if: + // 1. 101f401d.txt file exists in CentralRepository private data cage and the contact mach count is set to 0 in that file. + // 2. SYSLIB_TEST macro is not defined. TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-1392: DEF068087: Chinese names don't display in Chinese name format")); ::DEF068087L(*client); TheTest.Next(_L(" @SYMTestCaseID:SYSLIB-LOGENG-CT-1016: Contacts matching - test1")); diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/src/t_logcntmatchplugin.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loggingservices/eventlogger/test/src/t_logcntmatchplugin.cpp Fri May 14 17:36:33 2010 +0300 @@ -0,0 +1,187 @@ +// 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: +// The ECom impletementation of testing contact matching. +// + +#include "t_logcntmatchplugin.h" +#include +#include + +/** Creates a CLogTestCntMatch object +*/ +CLogTestCntMatch* CLogTestCntMatch::NewL() + { + RDebug::Print(_L("CLogTestCntMatch::NewL()")); + CLogTestCntMatch* self = new (ELeave) CLogTestCntMatch; + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + +void CLogTestCntMatch::ConstructL() + { + iTelNumbers = new(ELeave) CDesCArrayFlat(KNumberOfItems); + iContactFirstNames = new(ELeave) CDesCArrayFlat(KNumberOfItems); + iContactLastNames = new(ELeave) CDesCArrayFlat(KNumberOfItems); + } + +CLogTestCntMatch::CLogTestCntMatch() + { + } + +CLogTestCntMatch::~CLogTestCntMatch() + { + delete iTelNumbers; + delete iContactFirstNames; + delete iContactLastNames; + } + +/** Interface of ECOM. In real phone, it should opens the contacts DB +*/ +void CLogTestCntMatch::OpenContactsL() + { + RDebug::Print(_L("Test Mock Contact Matching: OpenContactsL ")); + + iTelNumbers->Reset(); + iContactFirstNames->Reset(); + iContactLastNames->Reset(); + + iTelNumbers->AppendL(KNumber1); + iContactFirstNames->AppendL(KFirstName1); + iContactLastNames->AppendL(KLastName1); + + iTelNumbers->AppendL(KNumber2); + iContactFirstNames->AppendL(KFirstName2); + iContactLastNames->AppendL(KLastName2); + + iTelNumbers->AppendL(KNumber3); + iContactFirstNames->AppendL(KFirstName3); + iContactLastNames->AppendL(KLastName3); + + iTelNumbers->AppendL(KNumber4); + iContactFirstNames->AppendL(KFirstName4); + iContactLastNames->AppendL(KLastName4); + + iTelNumbers->AppendL(KNumber5); + iContactFirstNames->AppendL(KFirstName5); + iContactLastNames->AppendL(KLastName5); + + iTelNumbers->AppendL(KNumber6); + iContactFirstNames->AppendL(KFirstName6); + iContactLastNames->AppendL(KLastName6); + + iTelNumbers->AppendL(KNumber7); + iContactFirstNames->AppendL(KFirstName7); + iContactLastNames->AppendL(KLastName7); + } + +/** Interface of ECOM. In real phone, it should closes the contacts DB +*/ +void CLogTestCntMatch::CloseContacts() + { + RDebug::Print(_L("OpenContactsL is called")); + iContactFirstNames->Reset(); + iContactLastNames->Reset(); + iTelNumbers->Reset(); + } + +/** Attempts to find a contact item ID for the contact items which contains + the specified telephone number in a telephone, fax or SMS type field for tests. + If more than one contact item contains the telephone number this should be + treated the same as no contact found. + @param aNumber Phone number string + @param aMatchLengthFromRight Number of digits from the right of the phone number to use. + @return The contact Id found that contains the phone number. KLogNullContactId if none or more than one is found. +*/ +TLogContactItemId CLogTestCntMatch::MatchPhoneNumberL(const TDesC& aNumber, TInt aMatchLengthFromRight) + { + RDebug::Print(_L("CLogTestCntMatch::MatchPhoneNumberL()")); + __ASSERT_ALWAYS(iTelNumbers->Length() == KNumberOfItems && + iContactFirstNames->Length()==KNumberOfItems && + iContactLastNames->Length()==KNumberOfItems, _L("CLogTestCntMatch::MatchPhoneNumberL")); + + TLogContactItemId contactId = KLogNullContactId; + TInt numHit = 0; + const TInt KMinLength = 7; + TInt pos = -1; + if(aNumber.Length() >= KMinLength) + { + for (TInt ii = 0; ii < KNumberOfItems && numHit < 2; ++ii) + { + TPtrC number((*iTelNumbers)[ii]); + TInt numDigToMatch = aNumber.Length()(pos)+1; + } + } + + return contactId; + } + +/** Gets the text data for the family and given name fields of a given contact Id for tests. + + @param aContactId Contact Id to find data for + @param aName On return contains the family and given name in the desired format if found, leave with KErrNotFound otherwise. + @param aNameFormat Desired format of returned string - Chinese or Western format +*/ +void CLogTestCntMatch::ReadContactNameL(TLogContactItemId aContactId, TDes &aName, TLogContactNameFormat aNameFormat) + { + RDebug::Print(_L("CLogTestCntMatch::ReadContactNameL()")); + __ASSERT_ALWAYS(iTelNumbers->Length() == KNumberOfItems && + iContactFirstNames->Length()==KNumberOfItems && + iContactLastNames->Length()==KNumberOfItems, _L("CLogTestCntMatch::ReadContactNameL")); + + if(aContactId < 1 && aContactId > KNumberOfItems) + { + User::Leave(KErrNotFound); + } + if(aNameFormat == ELogWesternFormat) + { + aName.Append((*iContactFirstNames)[aContactId-1]); + aName.Append(' '); + aName.Append((*iContactLastNames)[aContactId-1]); + } + else //ELogChineseFormat + { + aName.Append((*iContactLastNames)[aContactId-1]); + aName.Append((*iContactFirstNames)[aContactId-1]); + aName.Append(' '); + } + } + +const TImplementationProxy ImplementationTable[] = + { + IMPLEMENTATION_PROXY_ENTRY(0x2000862a, CLogTestCntMatch::NewL) + }; + +EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) + { + aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + return ImplementationTable; + } + diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/src/t_logenvcreate.cpp --- a/loggingservices/eventlogger/test/src/t_logenvcreate.cpp Mon May 03 14:09:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,90 +0,0 @@ -// 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" -// 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: -// EventLogger - copying EventLogger test files from Z: to C: -// Please, ensure that t_logenvcreate test is executed before the other EventLogger component tests -// -// - -#include -#include -#include "t_logutil.h" - -RTest TheTest(_L("t_logenvcreate - copying EventLogger test files to C:")); - -_LIT(KContactsServerName, "!CNTSRV"); - -_LIT(KContactsServerPrivateDirC, "c:\\private\\10003a73\\"); - -_LIT(KZFileName1, "z:\\private\\101f401d\\CntModel.ini"); -_LIT(KZFileName2, "z:\\private\\101f401d\\SQLite__Contacts.cdb"); - -_LIT(KCFileName1, "c:\\private\\10003a73\\CntModel.ini"); -_LIT(KCFileName2, "c:\\private\\10003a73\\SQLite__Contacts.cdb"); - -void DoRun() - { - RFs fs; - TInt err = fs.Connect(); - TEST2(err, KErrNone); - - TheTest.Start(_L(" @SYMTestCaseID: PDS-LOGENG-CT-4048 Copy EventLogger test files from Z: to C: ")); - - err = BaflUtils::CopyFile(fs, KZFileName1, KCFileName1); - TEST2(err, KErrNone); - err = fs.SetAtt(KCFileName1, 0, KEntryAttReadOnly); - TEST2(err, KErrNone); - - err = BaflUtils::CopyFile(fs, KZFileName2, KCFileName2); - TEST2(err, KErrNone); - err = fs.SetAtt(KCFileName2, 0, KEntryAttReadOnly); - TEST2(err, KErrNone); - fs.Close(); - } - -void CreateContactsServerPrivateDir() - { - RFs fs; - TInt err = fs.Connect(); - TEST2(err, KErrNone); - - TRAP(err, BaflUtils::EnsurePathExistsL(fs, KContactsServerPrivateDirC)); - TEST2(err, KErrNone); - - fs.Close(); - } - -TInt E32Main() - { - TheTest.Title(); - - CTrapCleanup* tc = CTrapCleanup::New(); - - __UHEAP_MARK; - - KillProcess(KContactsServerName); - - CreateContactsServerPrivateDir(); - - DoRun(); - - __UHEAP_MARKEND; - - TheTest.End(); - TheTest.Close(); - - delete tc; - - User::Heap().Check(); - return KErrNone; - } diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/src/t_logenvdestroy.cpp --- a/loggingservices/eventlogger/test/src/t_logenvdestroy.cpp Mon May 03 14:09:14 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,72 +0,0 @@ -// 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" -// 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: -// EventLogger - deleting EventLogger test files from C: -// Please, ensure that t_logenvdestroy test is executed after the EventLogger component tests -// -// - -#include -#include -#include "t_logutil.h" - -RTest TheTest(_L("t_logenvdestroy - deleting EventLogger test files from C:")); - -_LIT(KCFileName1, "c:\\private\\10003a73\\CntModel.ini"); -_LIT(KCFileName2, "c:\\private\\10003a73\\SQLite__Contacts.cdb"); - -/////////////////////////////////////////////////////////////////////////////////////// - -void DoDeleteFile(RFs& aFs, const TDesC& aFilePath) - { - TInt err = BaflUtils::DeleteFile(aFs, aFilePath); - if(err != KErrNone && err != KErrNotFound) - { - TheTest.Printf(_L("Error %d deleting \"%S\" file.\n"), err, &aFilePath); - } - } - -void DoRun() - { - RFs fs; - TInt err = fs.Connect(); - TEST2(err, KErrNone); - - TheTest.Start(_L(" @SYMTestCaseID: PDS-LOGENG-CT-4049 Deleting EventLogger test files from C:")); - - DoDeleteFile(fs, KCFileName1); - DoDeleteFile(fs, KCFileName2); - - fs.Close(); - } - -TInt E32Main() - { - TheTest.Title(); - - CTrapCleanup* tc = CTrapCleanup::New(); - - __UHEAP_MARK; - - DoRun(); - - __UHEAP_MARKEND; - - TheTest.End(); - TheTest.Close(); - - delete tc; - - User::Heap().Check(); - return KErrNone; - } diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/src/t_logutil2.cpp --- a/loggingservices/eventlogger/test/src/t_logutil2.cpp Mon May 03 14:09:14 2010 +0300 +++ b/loggingservices/eventlogger/test/src/t_logutil2.cpp Fri May 14 17:36:33 2010 +0300 @@ -892,10 +892,6 @@ static void Cleanup(void*) { TRAP_IGNORE(TestUtils::DeleteDatabaseL()); - _LIT(KCntModelFileName, "c:\\system\\data\\CntModel.ini"); - ::DeleteDataFile(KCntModelFileName); - _LIT(KContactsFileName, "c:\\system\\data\\Contacts.cdb"); - ::DeleteDataFile(KContactsFileName); ::DeleteDataFile(theLogName); } diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/src/t_logviewfail2.cpp --- a/loggingservices/eventlogger/test/src/t_logviewfail2.cpp Mon May 03 14:09:14 2010 +0300 +++ b/loggingservices/eventlogger/test/src/t_logviewfail2.cpp Fri May 14 17:36:33 2010 +0300 @@ -945,7 +945,7 @@ { // This failCount value causes DBMS to return KErrCorrupt. Apparently this // can't actually occur in real life, so we skip this value. - if (failCount == 9) + if (failCount == 9 || failCount == 14) { failCount++; } diff -r 55f2396f6d25 -r d6ef85bc5971 loggingservices/eventlogger/test/t_logcntmatchplugin.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/loggingservices/eventlogger/test/t_logcntmatchplugin.mmp Fri May 14 17:36:33 2010 +0300 @@ -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: +// t_logcntmatchplugin.dll. Mock ECom plugin contacts matching implementation for logeng +// +// + +TARGET t_logcntmatchplugin.dll +TARGETTYPE PLUGIN + +UID 0x10009d8d 0x2000862e + +CAPABILITY ProtServ ReadUserData WriteUserData + +SOURCEPATH ../test/src +SOURCE t_logcntmatchplugin.cpp + +USERINCLUDE ../test/inc +APP_LAYER_SYSTEMINCLUDE_SYMBIAN + +START RESOURCE 2000862e.rss + TARGET t_logcntmatchplugin.rsc +END + +LIBRARY euser.lib +LIBRARY ecom.lib +LIBRARY bafl.lib +LIBRARY logcntmodel.lib + +VENDORID 0x70000001 + +SMPSAFE diff -r 55f2396f6d25 -r d6ef85bc5971 persistentstorage/centralrepository/cenrepsrv/install.cpp --- a/persistentstorage/centralrepository/cenrepsrv/install.cpp Mon May 03 14:09:14 2010 +0300 +++ b/persistentstorage/centralrepository/cenrepsrv/install.cpp Fri May 14 17:36:33 2010 +0300 @@ -434,11 +434,7 @@ void CCentRepSWIWatcher::ReadAndInternalizeInstallDirL(const TDesC& aInstallDirFilePath) { RFile file; - TInt e=file.Open(TServerResources::iFs,aInstallDirFilePath, EFileRead|EFileShareReadersOnly); - if(e == KErrNotFound || e == KErrPathNotFound) - { - User::Leave(KErrNotFound); - } + User::LeaveIfError(file.Open(TServerResources::iFs,aInstallDirFilePath, EFileRead|EFileShareReadersOnly)); CleanupClosePushL(file); CDirectFileStore* store = CDirectFileStore::FromLC (file); diff -r 55f2396f6d25 -r d6ef85bc5971 persistentstorage/sqlite3api/TEST/TclScript/misc7.test --- a/persistentstorage/sqlite3api/TEST/TclScript/misc7.test Mon May 03 14:09:14 2010 +0300 +++ b/persistentstorage/sqlite3api/TEST/TclScript/misc7.test Fri May 14 17:36:33 2010 +0300 @@ -1,6 +1,6 @@ # 2006 September 4 # -# Portions Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiaries. All rights reserved. +# Portions Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiaries. All rights reserved. # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: @@ -97,7 +97,7 @@ execsql { CREATE TABLE abc(a PRIMARY KEY, b, c); } db close -if {$tcl_platform(platform)!="windows"} { +if {$tcl_platform(platform)!="windows" && $tcl_platform(platform)!="symbian"} { do_fileopen_test misc7-6.1 { BEGIN; INSERT INTO abc VALUES(1, 2, 3); diff -r 55f2396f6d25 -r d6ef85bc5971 persistentstorage/sqlite3api/TEST/TclScript/tester.tcl --- a/persistentstorage/sqlite3api/TEST/TclScript/tester.tcl Mon May 03 14:09:14 2010 +0300 +++ b/persistentstorage/sqlite3api/TEST/TclScript/tester.tcl Fri May 14 17:36:33 2010 +0300 @@ -1,6 +1,6 @@ # 2001 September 15 # -# Portions Copyright (c) 2007-2008 Nokia Corporation and/or its subsidiaries. All rights reserved. +# Portions Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiaries. All rights reserved. # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: @@ -250,14 +250,17 @@ puts "\nError: $result" # Symbian OS: Set and increase error count with do_fail procedure (definition in Tester.tcl) do_fail $name + print_text $name "FAILED" if {$nErr>$maxErr} {puts "*** Giving up..."; finalize_testing} } elseif {[string compare $result $expected]} { puts "\nExpected: \[$expected\]\n Got: \[$result\]" # Symbian OS: Set and increase error count with do_fail procedure (definition in Tester.tcl) do_fail $name + print_text $name "FAILED" if {$nErr>=$maxErr} {puts "*** Giving up..."; finalize_testing} } else { puts " Ok" + print_text $name "OK" } flush stdout if {[info exists ::tester_do_binarylog]} {