# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1262863549 -7200 # Node ID 17b6bb2b14ba0c44fa67e770d7a9a4f077414dd8 # Parent 822a42b6c3f13d9d300b1415634f10941fbcef46 Revision: 200951 Kit: 201001 diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/conf/VCXTestCommon.cfg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/conf/VCXTestCommon.cfg Thu Jan 07 13:25:49 2010 +0200 @@ -0,0 +1,4 @@ + +[Test] +title No tests for this module. +[Endtest] diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/group/VCXTestCommon.pkg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/group/VCXTestCommon.pkg Thu Jan 07 13:25:49 2010 +0200 @@ -0,0 +1,58 @@ +; +; 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 "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 + +; Package header +#{"VCXTestCommon"},(0x101F7961),0,0,0 + +; Localised Vendor name +%{"Nokia EN"} + +; Unique Vendor name +:"Nokia" + +; Logo +; None + +; Package signature - Optional +; None + +; Start of Package body + +; Condition blocks +; None + +; Options list +; None + +; Install files + "\epoc32\release\armv5\udeb\VCXTestCommon.dll" - "!:\Sys\Bin\VCXTestCommon.dll" + "..\conf\VCXTestCommon.cfg" - "c:\TestFramework\VCXTestCommon.cfg" + "..\init\TestFramework.ini" - "c:\TestFramework\TestFramework.ini" + +; Embedded SIS +; None + +; End of Package body + +; PKG dependencies +; None + +; PKG capabilities +; None \ No newline at end of file diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/inc/IptvTestUtilALR.h --- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/inc/IptvTestUtilALR.h Thu Dec 17 09:14:38 2009 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/inc/IptvTestUtilALR.h Thu Jan 07 13:25:49 2010 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include // FORWARD DECLARATIONS; class CIptvTestActiveWait; @@ -130,6 +131,11 @@ * Terminates active connections for the destination's IAPs. */ IMPORT_C void TerminateDestinationConnectionsL( TDesC& aDestinationName ); + + /** + * Gets the default access point from connection manager + */ + IMPORT_C TUint32 GetDefaultIap( void ); private: // New functions diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/init/TestFramework.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/init/TestFramework.ini Thu Jan 07 13:25:49 2010 +0200 @@ -0,0 +1,165 @@ +# +# This is STIFTestFramework initialization file +# Comment lines start with '#'-character. +# See STIF TestFramework users guide.doc for instructions + +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +# Set following test engine settings: +# - Set Test Reporting mode. TestReportMode's possible values are: +# + 'Summary': Summary of the tested test cases. +# + 'Environment': Hardware and software info. +# + 'TestCases': Test case report. +# + 'FullReport': Set of all above ones. +# + Example 'TestReportMode= Summary TestCases' +# +# - CreateTestReport setting controls report creation mode +# + YES, Test report will created. +# + NO, No Test report. +# +# - File path indicates the base path of the test report. +# - File name indicates the name of the test report. +# +# - File format indicates the type of the test report. +# + TXT, Test report file will be txt type, for example 'TestReport.txt'. +# + HTML, Test report will be html type, for example 'TestReport.html'. +# +# - File output indicates output source of the test report. +# + FILE, Test report logging to file. +# + RDEBUG, Test report logging to using rdebug. +# +# - File Creation Mode indicates test report overwriting if file exist. +# + OVERWRITE, Overwrites if the Test report file exist. +# + APPEND, Continue logging after the old Test report information if +# report exist. + +[Engine_Defaults] + +TestReportMode= FullReport # Possible values are: + # 'Summary', 'Environment', 'TestCases' or 'FullReport' + +CreateTestReport= YES # Possible values: YES or NO + +TestReportFilePath= C:\Logs\Fusion\ +TestReportFileName= TestReport + +TestReportFormat= TXT # Possible values: TXT or HTML +TestReportOutput= FILE # Possible values: FILE or RDEBUG +TestReportFileCreationMode= APPEND # Possible values: OVERWRITE or APPEND +UITestingSupport= Yes +SeparateProcesses= YES +[End_Defaults] +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + + + +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +# Module configurations start +# Modules are added between module tags +# tags. Module name is specified after ModuleName= tag, like +# ModuleName= XXXXXXXXX +# Modules might have initialisation file, specified as +# IniFile= c:\testframework\YYYYYY +# Modules might have several configuration files, like +# TestCaseFile= c:\testframework\NormalCases.txt +# TestCaseFile= c:\testframework\SmokeCases.txt +# TestCaseFile= c:\testframework\ManualCases.txt + +# (TestCaseFile is synonym for old term ConfigFile) + +# Following case specifies demo module settings. Demo module +# does not read any settings from file, so tags +# IniFile and TestCaseFile are not used. +# In the simplest case it is enough to specify only the +# name of the test module when adding new test module + +[New_Module] +ModuleName= testscripter +TestCaseFile= c:\testframework\VCXTestCommon.cfg +[End_Module] + + +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + + + +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- +# Set STIFTestFramework logging overwrite parameters for Logger. +# Hardware and emulator environment logging path and styles can +# be configured from here to overwrite the Logger's implemented values. +# +# Settings description: +# - Indicates option for creation log directory/directories. If log directory/directories +# is/are not created by user they will make by software. +# + YES, Create log directory/directories if not allready exist. +# + NO, Log directory/directories not created. Only created one is used. +# +# - Overwrite emulator path setting. +# + Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined +# Logger's path 'D:\\LOGS\\Module\\' with those definition the path +# will be 'C:\LOGS\TestFramework\LOGS\Module\' +# +# - Overwrite emulator's logging format. +# + TXT, Log file(s) will be txt type(s), for example 'Module.txt'. +# + HTML, Log file(s) will be html type(s), for example 'Module.html'. +# +# - Overwrited emulator logging output source. +# + FILE, Logging to file(s). +# + RDEBUG, Logging to using rdebug(s). +# +# - Overwrite hardware path setting (Same description as above in emulator path). +# - Overwrite hardware's logging format(Same description as above in emulator format). +# - Overwrite hardware's logging output source(Same description as above in emulator output). +# +# - File Creation Mode indicates file overwriting if file exist. +# + OVERWRITE, Overwrites if file(s) exist. +# + APPEND, Continue logging after the old logging information if file(s) exist. +# +# - Will thread id include to the log filename. +# + YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'. +# + NO, No thread id to log file(s), Example filename 'Module.txt'. +# +# - Will time stamps include the to log file. +# + YES, Time stamp added to each line in log file(s). Time stamp is +# for example'12.Nov.2003 115958 LOGGING INFO' +# + NO, No time stamp(s). +# +# - Will line breaks include to the log file. +# + YES, Each logging event includes line break and next log event is in own line. +# + NO, No line break(s). +# +# - Will event ranking include to the log file. +# + YES, Event ranking number added to each line in log file(s). Ranking number +# depends on environment's tics, for example(includes time stamp also) +# '012 12.Nov.2003 115958 LOGGING INFO' +# + NO, No event ranking. +# +# - Will write log file in unicode format. +# + YES, Log file will be written in unicode format +# + NO, Log will be written as normal, not unicode, file. +# + +[Logger_Defaults] + +#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' + +CreateLogDirectories= YES # Possible values: YES or NO + +#EmulatorBasePath= C:\LOGS\TestFramework\ +#EmulatorFormat= HTML # Possible values: TXT or HTML +#EmulatorOutput= FILE # Possible values: FILE or RDEBUG + +#HardwareBasePath= C:\ +#HardwareFormat= TXT # Possible values: TXT or HTML +#HardwareOutput= FILE # Possible values: FILE or RDEBUG + +FileCreationMode= APPEND # Possible values: OVERWRITE or APPEND + +#ThreadIdToLogFile= YES # Possible values: YES or NO +#WithTimeStamp= YES # Possible values: YES or NO +#WithLineBreak= YES # Possible values: YES or NO +#WithEventRanking= YES # Possible values: YES or NO + +[End_Logger_Defaults] +# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- + +# End of file diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/CIptvTestTimer.cpp --- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/CIptvTestTimer.cpp Thu Dec 17 09:14:38 2009 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/CIptvTestTimer.cpp Thu Jan 07 13:25:49 2010 +0200 @@ -130,7 +130,7 @@ iInterval = aInterval; -if( !IsActive() ) + if( !IsActive() ) { VCXLOGLO2("CIptvTestTimer::After: Setting active. (%d)", this); iTimer.After( iStatus, aInterval ); diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/CIptvTestVerifyData.cpp --- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/CIptvTestVerifyData.cpp Thu Dec 17 09:14:38 2009 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/CIptvTestVerifyData.cpp Thu Jan 07 13:25:49 2010 +0200 @@ -536,7 +536,7 @@ totalLength += lineFromInst.Length(); // Don't compare if line is for path because it can have service id which varies - if( KErrNotFound != lineFromTest.Match(_L("*\\Data\\videocenter\\*")) && KErrNotFound != lineFromTest.Match(_L("*\\Data\\videocenter\\*")) ) + if( KErrNotFound != lineFromTest.Match(_L("*\\Data\\videocenter\\*")) && KErrNotFound != lineFromTest.Match(_L("*\\data\\videocenter\\*")) ) { TInt res = lineFromInst.Compare(lineFromTest); if(res < 0) diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/IptvTestUtilALR.cpp --- a/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/IptvTestUtilALR.cpp Thu Dec 17 09:14:38 2009 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/VCXTestCommon/src/IptvTestUtilALR.cpp Thu Jan 07 13:25:49 2010 +0200 @@ -887,6 +887,31 @@ } // --------------------------------------------------------------------------- +// CIptvTestUtilALR::GetDefaultIap +// --------------------------------------------------------------------------- +// +EXPORT_C TUint32 CIptvTestUtilALR::GetDefaultIap() + { + VCXLOGLO1(">>>CIptvTestUtilALR::GetDefaultIap"); + RSocketServ ss; + ss.Connect(); + + RConnection conn; + conn.Open( ss ); + + TCommDbConnPref prefs; + prefs.SetDialogPreference( ECommDbDialogPrefDoNotPrompt ); + + conn.Start( prefs ); + TUint32 iap( 0 ); + conn.GetIntSetting( _L("IAP\\Id"), iap ); + conn.Close(); + + VCXLOGLO2("<< +#include #include #include @@ -1619,6 +1620,7 @@ VCXLOGLO1("<< + + install + + + + + + \ No newline at end of file diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/data/cccccc00.cre Binary file videoutils_plat/videoconnutility_api/tsrc/data/cccccc00.cre has changed diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoconnutility_api/tsrc/group/videoconnutility_apitest.pkg --- a/videoutils_plat/videoconnutility_api/tsrc/group/videoconnutility_apitest.pkg Thu Dec 17 09:14:38 2009 +0200 +++ b/videoutils_plat/videoconnutility_api/tsrc/group/videoconnutility_apitest.pkg Thu Jan 07 13:25:49 2010 +0200 @@ -59,7 +59,7 @@ ; The cenrep and testframework.ini files won't install with sis, only for ATS test runs. "../init/TestFramework.ini" - "C:/TestFramework/TestFramework.ini" ; If tests are run in XXXXX CATS uncomment the cenrep file installation line. -; "../data/cccccc00.cre" - "c:\private\10202be9\persists\cccccc00.cre" +"../data/cccccc00.cre" - "c:/private/10202be9/persists/cccccc00.cre" ; Embedded SIS ; None diff -r 822a42b6c3f1 -r 17b6bb2b14ba videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h --- a/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h Thu Dec 17 09:14:38 2009 +0200 +++ b/videoutils_plat/videoplayer_constants_api/inc/vcxmyvideosdefs.h Thu Jan 07 13:25:49 2010 +0200 @@ -2,7 +2,7 @@ * Copyright (c) 2008 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"" +* under the terms of the License "Eclipse Public License v1.0" * which accompanies this distribution, and is available * at the URL "http://www.eclipse.org/legal/epl-v10.html". *