--- a/filedetails/filedetailsdialog/data/MPFileDetails.rss Mon Jan 18 20:21:12 2010 +0200
+++ b/filedetails/filedetailsdialog/data/MPFileDetails.rss Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 5 %
+// Version : %version: 7 %
--- a/filedetails/filedetailsdialog/group/MPFileDlg.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/filedetails/filedetailsdialog/group/MPFileDlg.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 10 %
+// Version : %version: 11 %
@@ -23,7 +23,7 @@
#include <platform_paths.hrh>
#include <data_caging_paths.hrh>
-TARGET MPFileDetailsDialog.dll
+TARGET mpfiledetailsdialog.dll
TARGETTYPE dll
UID 0x1000006C 0x101F8511
@@ -64,20 +64,20 @@
LIBRARY eikcoctl.lib
LIBRARY avkon.lib
LIBRARY bafl.lib
-LIBRARY Flogger.lib
+LIBRARY flogger.lib
LIBRARY eikcore.lib
LIBRARY centralrepository.lib
LIBRARY efsrv.lib
LIBRARY playbackhelper.lib
LIBRARY commonengine.lib
-LIBRARY FeatMgr.lib
-LIBRARY ServiceHandler.lib
+LIBRARY featmgr.lib
+LIBRARY servicehandler.lib
LIBRARY mmfcontrollerframework.lib
-LIBRARY MediaClientAudio.lib
+LIBRARY mediaclientaudio.lib
LIBRARY mediaclientvideo.lib
-LIBRARY MetaDataUtility.lib
+LIBRARY metadatautility.lib
LIBRARY caf.lib
-LIBRARY DrmUtility.lib
+LIBRARY drmutility.lib
--- a/filedetails/filedetailsdialog/inc/mppopuplist.h Mon Jan 18 20:21:12 2010 +0200
+++ b/filedetails/filedetailsdialog/inc/mppopuplist.h Tue Jan 26 12:00:59 2010 +0200
@@ -16,7 +16,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 8 %
--- a/filedetails/filedetailsdialog/src/MPFileDetails.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/filedetails/filedetailsdialog/src/MPFileDetails.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 8 %
// INCLUDE FILES
--- a/filedetails/filedetailsdialog/src/MPFileDetailsDialog.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/filedetails/filedetailsdialog/src/MPFileDetailsDialog.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 16 %
+// Version : %version: 18 %
// INCLUDE FILES
#include <aknlists.h>
--- a/filedetails/filedetailsdialog/src/mppopuplist.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/filedetails/filedetailsdialog/src/mppopuplist.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 13 %
+// Version : %version: 15 %
#include <aknpopuplayout.h>
#include <eiklbx.h>
--- a/filedetails/filedetailsplugin/group/filedetailsplugin.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/filedetails/filedetailsplugin/group/filedetailsplugin.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -45,5 +45,5 @@
LIBRARY flogger.lib
LIBRARY estor.lib
LIBRARY mpxcommon.lib
-LIBRARY MPFileDetailsDialog.lib
+LIBRARY mpfiledetailsdialog.lib
--- a/homescreenplugins/videoahlplugin/group/videoahplugin.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/homescreenplugins/videoahlplugin/group/videoahplugin.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -47,7 +47,7 @@
LIBRARY euser.lib
-LIBRARY ECom.lib
+LIBRARY ecom.lib
LIBRARY liwservicehandler.lib
LIBRARY eikcore.lib
LIBRARY cone.lib
--- a/homescreenplugins/videoahlplugin/src/videoactionhandler.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/homescreenplugins/videoahlplugin/src/videoactionhandler.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 19 %
+// Version : %version: 21 %
#include <e32def.h>
#include <e32uid.h>
@@ -29,7 +29,7 @@
#include <AknGlobalNote.h>
#include <MediatorEventProvider.h>
#include <centralrepository.h>
-#include <LiwVariant.h>
+#include <liwvariant.h>
#include <videoplayeractivationmessage.h>
#include <vcxmyvideosdefs.h>
#include <ErrorUI.h>
--- a/homescreenplugins/videochplugin/src/videochpublishabledata.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/homescreenplugins/videochplugin/src/videochpublishabledata.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-#include <LiwVariant.h>
+#include <liwvariant.h>
#include <e32hashtab.h>
#include <videosuiteres.rsg>
--- a/homescreenplugins/videochplugin/src/videochpublishabledtaitem.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/homescreenplugins/videochplugin/src/videochpublishabledtaitem.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -21,7 +21,7 @@
#include <e32std.h>
#include <e32base.h>
#include <e32hashtab.h>
-#include <LiwVariant.h>
+#include <liwvariant.h>
#include "videochpublishabledataitem.h"
#include "videochpublishabledata.h"
--- a/homescreenplugins/videochplugin/src/videochpublisher.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/homescreenplugins/videochplugin/src/videochpublisher.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -17,9 +17,9 @@
-#include <LiwServiceHandler.h>
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
+#include <liwservicehandler.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
#include "videochpublishabledata.h"
#include "videochpublisher.h"
--- a/homescreenplugins/videochplugin/src/videocontentharvesterplugin.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/homescreenplugins/videochplugin/src/videocontentharvesterplugin.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -20,9 +20,9 @@
#include <e32def.h>
#include <e32cmn.h>
-#include <LiwServiceHandler.h>
-#include <LiwVariant.h>
-#include <LiwGenericParam.h>
+#include <liwservicehandler.h>
+#include <liwvariant.h>
+#include <liwgenericparam.h>
#include <vcxmyvideosdefs.h>
#include <vcxmyvideosuids.h>
--- a/homescreenplugins/videosuiteconf/group/bld.inf Mon Jan 18 20:21:12 2010 +0200
+++ b/homescreenplugins/videosuiteconf/group/bld.inf Tue Jan 26 12:00:59 2010 +0200
@@ -24,11 +24,11 @@
../rom/videomatrixmenu.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(videomatrixmenu.iby)
-../data/suite.xml /epoc32/release/winscw/udeb/z/private/101F4CD2/import/suites/tvvideosuite/suite.xml
-../data/vcns_matrix_items.xml /epoc32/release/winscw/udeb/z/private/101F4CD2/import/suites/tvvideosuite/vcns_matrix_items.xml
+../data/suite.xml /epoc32/release/winscw/udeb/z/private/101f4cd2/import/suites/tvvideosuite/suite.xml
+../data/vcns_matrix_items.xml /epoc32/release/winscw/udeb/z/private/101f4cd2/import/suites/tvvideosuite/vcns_matrix_items.xml
-../data/suite.xml /epoc32/data/z/private/101F4CD2/import/suites/tvvideosuite/suite.xml
-../data/vcns_matrix_items.xml /epoc32/data/z/private/101F4CD2/import/suites/tvvideosuite/vcns_matrix_items.xml
+../data/suite.xml /epoc32/data/z/private/101f4cd2/import/suites/tvvideosuite/suite.xml
+../data/vcns_matrix_items.xml /epoc32/data/z/private/101f4cd2/import/suites/tvvideosuite/vcns_matrix_items.xml
PRJ_EXTENSIONS
START EXTENSION s60/mifconv
--- a/homescreenplugins/videosuiteconf/group/videosuiteconf.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/homescreenplugins/videosuiteconf/group/videosuiteconf.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
#include <data_caging_paths.hrh>
-TARGET dummyVideo.dll
+TARGET dummyvideo.dll
TARGETTYPE dll
CAPABILITY CAP_GENERAL_DLL
--- a/mediasettings/feedsettingsviews/group/vcxnssettingsview.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/feedsettingsviews/group/vcxnssettingsview.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -62,7 +62,7 @@
APP_LAYER_SYSTEMINCLUDE
-LIBRARY CseSchedulerClient.lib
+LIBRARY cseschedulerclient.lib
LIBRARY avkon.lib
LIBRARY bafl.lib
@@ -77,13 +77,13 @@
LIBRARY eikdlg.lib
LIBRARY euser.lib
LIBRARY flogger.lib
-LIBRARY GSEcomPlugin.lib
-LIBRARY IptvClientApi.lib
+LIBRARY gsecomplugin.lib
+LIBRARY iptvclientapi.lib
LIBRARY iptvutil.lib
LIBRARY mpxviewutility.lib
LIBRARY vcxnsuiengine.lib
LIBRARY vcxnssettingsengine.lib
-LIBRARY InetProtUtil.lib // for UriParser
+LIBRARY inetprotutil.lib // for UriParser
LIBRARY browserlauncher.lib // Browser
LIBRARY apparc.lib
LIBRARY vcxconnectionutility.lib
@@ -91,9 +91,9 @@
LIBRARY sisregistryclient.lib
LIBRARY aknskinsrv.lib // for enhanced skinning
LIBRARY aknskins.lib // for enhanced skinning
-LIBRARY GSFramework.lib // CGSTabHelper
+LIBRARY gsframework.lib // CGSTabHelper
LIBRARY hlplch.lib // for "Help" options menu
-LIBRARY FeatMgr.lib // Feature manager
+LIBRARY featmgr.lib // Feature manager
// For RAPTOR compliancy
LIBRARY ecom.lib
--- a/mediasettings/feedsettingsviews/src/feedsettingsviewserviceselection.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/feedsettingsviews/src/feedsettingsviewserviceselection.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -23,8 +23,8 @@
#include <eikclbd.h>
#include <barsread.h>
#include <aknViewAppUi.h>
-#include <BrowserLauncher.h>
-#include <BrowserOverriddenSettings.h>
+#include <browserlauncher.h>
+#include <browseroverriddensettings.h>
#include <uriutils.h>
#include "IptvDebug.h"
#include <AknQueryDialog.h>
--- a/mediasettings/gsvideoplugin/group/gsvideoplugin.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/gsvideoplugin/group/gsvideoplugin.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 3 %
+// Version : %version: 4 %
@@ -24,7 +24,7 @@
#include <bldvariant.hrh>
CAPABILITY CAP_ECOM_PLUGIN
-TARGET GSVideoPlugin.dll
+TARGET gsvideoplugin.dll
TARGETTYPE PLUGIN
UID 0x10009D8D 0x10275068
@@ -92,7 +92,7 @@
//--otherwise Ecom won't recognise it.
//*****************************************************
START RESOURCE ../data/10275068.rss
-TARGET GSVideoPlugin.rsc
+TARGET gsvideoplugin.rsc
END
//Gs Video Plugin resources
@@ -110,37 +110,37 @@
LIBRARY cone.lib
LIBRARY eikcoctl.lib
LIBRARY eikcore.lib
-LIBRARY EtelMM.lib // security, network, call
-LIBRARY GSListBox.lib // For CGSListBoxItemTextArray
-LIBRARY CommonEngine.lib // For RConeResourceLoader
-LIBRARY FeatMgr.lib // Feature manager
+LIBRARY etelmm.lib // security, network, call
+LIBRARY gslistbox.lib // For CGSListBoxItemTextArray
+LIBRARY commonengine.lib // For RConeResourceLoader
+LIBRARY featmgr.lib // Feature manager
LIBRARY commsdat.lib
-LIBRARY GSFramework.lib // For base classes
-LIBRARY CentralRepository.lib
+LIBRARY gsframework.lib // For base classes
+LIBRARY centralrepository.lib
LIBRARY pbkeng.lib
LIBRARY pbkview.lib
LIBRARY aknskinsrv.lib // for enhanced skinning
LIBRARY aknskins.lib // for enhanced skinning
LIBRARY egul.lib
-LIBRARY MMFCONTROLLERFRAMEWORK.LIB //for RMMFController
+LIBRARY mmfcontrollerframework.lib //for RMMFController
LIBRARY charconv.lib
LIBRARY apparc.lib
-LIBRARY MPSettBase.lib
-LIBRARY MPSettEngine.lib
+LIBRARY mpsettbase.lib
+LIBRARY mpsettengine.lib
LIBRARY eikctl.lib
LIBRARY mediaclientvideo.lib
LIBRARY estor.lib //RWriteStream
LIBRARY esock.lib
-LIBRARY GSEcomPlugin.lib
+LIBRARY gsecomplugin.lib
LIBRARY vcxnssettingsengine.lib
-LIBRARY CommonDialogs.lib
+LIBRARY commondialogs.lib
LIBRARY cmmanager.lib
#ifndef RD_STARTUP_CHANGE
LIBRARY sysutil.lib // Shutdown::Restart
#endif //RD_STARTUP_CHANGE
-LIBRARY AknNotify.lib // for CAknGlobalNote.h
+LIBRARY aknnotify.lib // for CAknGlobalNote.h
LIBRARY hlplch.lib // for "Help" options menu
LIBRARY eikdlg.lib // eikon dialogs
--- a/mediasettings/gsvideoplugin/inc/GSVideoPlugin.h Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/gsvideoplugin/inc/GSVideoPlugin.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 4 %
+// Version : %version: 6 %
--- a/mediasettings/gsvideoplugin/src/GSMediaPlayerStreamingView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/gsvideoplugin/src/GSMediaPlayerStreamingView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 8 %
--- a/mediasettings/gsvideoplugin/src/GSMediaPlayerVideoView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/gsvideoplugin/src/GSMediaPlayerVideoView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 7 %
+// Version : %version: 9 %
--- a/mediasettings/gsvideoplugin/src/GSVideoPlugin.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/gsvideoplugin/src/GSVideoPlugin.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 8 %
--- a/mediasettings/mediasettingsapp/data/MediaSettings.rss Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/data/MediaSettings.rss Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 13 %
+// Version : %version: 15 %
--- a/mediasettings/mediasettingsapp/data/MediaSettings_reg.rss Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/data/MediaSettings_reg.rss Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 8 %
--- a/mediasettings/mediasettingsapp/group/bld.inf Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/group/bld.inf Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 9 %
+// Version : %version: 10 %
#include <platform_paths.hrh>
@@ -28,8 +28,8 @@
// Export the loc, stub sis iby files for S60 5.0
//
../loc/mediasettings.loc APP_LAYER_LOC_EXPORT_PATH(mediasettings.loc)
-../rom/mediasettings.iby CORE_APP_LAYER_IBY_EXPORT_PATH(MediaSettings.iby)
-../rom/mediasettingsresources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(MediaSettingsResources.iby)
+../rom/mediasettings.iby CORE_APP_LAYER_IBY_EXPORT_PATH(mediasettings.iby)
+../rom/mediasettingsresources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(mediasettingsresources.iby)
// Generic configuration interface for component cenrep settings
// mediasettings_101F880B implementation specifics for cenrep data
--- a/mediasettings/mediasettingsapp/group/mediasettingsapp.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/group/mediasettingsapp.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 4 %
+// Version : %version: 5 %
@@ -23,7 +23,7 @@
#include <data_caging_paths.hrh>
#include <bldvariant.hrh>
-TARGET MediaSettings.exe
+TARGET mediasettings.exe
TARGETTYPE exe
UID 0x100039CE 0x10005A3F
EPOCSTACKSIZE 0x5000
@@ -93,12 +93,12 @@
LIBRARY aknskins.lib
LIBRARY egul.lib
LIBRARY centralrepository.lib
-LIBRARY MPSettBase.lib
-LIBRARY MPSettEngine.lib
-LIBRARY Flogger.lib
+LIBRARY mpsettbase.lib
+LIBRARY mpsettengine.lib
+LIBRARY flogger.lib
LIBRARY sisregistryclient.lib
LIBRARY vcxnssettingsengine.lib
-LIBRARY CommonDialogs.lib
+LIBRARY commondialogs.lib
LIBRARY cmmanager.lib
LIBRARY vcxnssettingsview.lib
--- a/mediasettings/mediasettingsapp/inc/MPSettingsAppUi.h Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/inc/MPSettingsAppUi.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 3 %
+// Version : %version: 5 %
--- a/mediasettings/mediasettingsapp/inc/MPSettingsDocument.h Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/inc/MPSettingsDocument.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 3 %
+// Version : %version: 5 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwContainer.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwContainer.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 5 %
+// Version : %version: 7 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwSettingItem.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwSettingItem.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 4 %
+// Version : %version: 6 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwSettingItemList.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwSettingItemList.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 5 %
+// Version : %version: 7 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsAdvancedBwView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 4 %
+// Version : %version: 6 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsAppUi.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsAppUi.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 7 %
+// Version : %version: 9 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsMainContainer.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsMainContainer.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 7 %
+// Version : %version: 9 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsMainView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsMainView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 5 %
+// Version : %version: 7 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsNetworkContainer.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsNetworkContainer.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 5 %
+// Version : %version: 7 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsNetworkSettingItemList.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsNetworkSettingItemList.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 9 %
@@ -265,8 +265,8 @@
CleanupStack::PushL ( settingsUi );
TCmSettingSelection selection;
- selection.iId = 0; // iSettingUsedSnapId;
- selection.iResult = CMManager::EDestination;
+ selection.iId = 0;
+ selection.iResult = CMManager::EConnectionMethod;
TUint listItems = CMManager::EShowConnectionMethods;
--- a/mediasettings/mediasettingsapp/src/MPSettingsNetworkView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsNetworkView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 4 %
+// Version : %version: 6 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsProxyContainer.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsProxyContainer.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 5 %
+// Version : %version: 7 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsProxyView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsProxyView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 4 %
+// Version : %version: 6 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsSliderSettingItem.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsSliderSettingItem.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 4 %
+// Version : %version: 6 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsStreamingContainer.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsStreamingContainer.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 5 %
+// Version : %version: 7 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsStreamingView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsStreamingView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 5 %
+// Version : %version: 7 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsVideoContainer.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsVideoContainer.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 8 %
--- a/mediasettings/mediasettingsapp/src/MPSettingsVideoSettingItemList.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsVideoSettingItemList.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 16 %
+// Version : %version: 19 %
@@ -282,13 +282,15 @@
}
#endif
-
- (*SettingItemArray())[itemIndex]->LoadL();
- (*SettingItemArray())[itemIndex]->UpdateListBoxTextL();
-
- iVideoSettingsEngine.SetUsedMemory(
- iDriveMonitor->iAvailableDrives[iSettingMemory].iDrive );
-
+
+ if ( iSettingMemory != KErrNotFound )
+ {
+ (*SettingItemArray())[itemIndex]->LoadL();
+ (*SettingItemArray())[itemIndex]->UpdateListBoxTextL();
+
+ iVideoSettingsEngine.SetUsedMemory(
+ iDriveMonitor->iAvailableDrives[iSettingMemory].iDrive );
+ }
DrawDeferred();
}
--- a/mediasettings/mediasettingsapp/src/MPSettingsVideoView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsapp/src/MPSettingsVideoView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 8 %
--- a/mediasettings/mediasettingsengine/group/MPSettROPModel.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsengine/group/MPSettROPModel.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -16,12 +16,12 @@
-// Version : %version: 4 %
+// Version : %version: 5 %
#include <platform_paths.hrh>
-TARGET MPSettROPModel.dll
+TARGET mpsettropmodel.dll
CAPABILITY CAP_ECOM_PLUGIN
TARGETTYPE PLUGIN
UID 0x10009D8D 0x101F857B
@@ -35,12 +35,12 @@
SOURCEPATH ../data
START RESOURCE 101F857B.rss
-TARGET MPSettROPModel.rsc
+TARGET mpsettropmodel.rsc
END
START RESOURCE MPSettingsROPModel.rss
HEADER
-TARGET MPSettingsROPModel.rsc
+TARGET mpsettingsropmodel.rsc
TARGETPATH resource
END
@@ -54,14 +54,14 @@
LIBRARY euser.lib
-LIBRARY MMFCONTROLLERFRAMEWORK.LIB
+LIBRARY mmfcontrollerframework.lib
LIBRARY charconv.lib
-LIBRARY MPSettEngine.lib
+LIBRARY mpsettengine.lib
LIBRARY commdb.lib
LIBRARY bafl.lib
LIBRARY efsrv.lib
-LIBRARY Flogger.lib
-LIBRARY CentralRepository.lib
+LIBRARY flogger.lib
+LIBRARY centralrepository.lib
LIBRARY commsdat.lib
//end of file
--- a/mediasettings/mediasettingsengine/src/MPSettingsModelForROP.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mediasettingsengine/src/MPSettingsModelForROP.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 7 %
+// Version : %version: 9 %
@@ -30,7 +30,7 @@
#include <f32file.h>
#include <commdb.h> // CMDBSession
#include <commsdattypesv1_1.h> // CCDWAPIPBearerRecord
-#include <MPSettingsROPModel.rsg>
+#include <mpsettingsropmodel.rsg>
#include <data_caging_path_literals.hrh> // KDC_RESOURCE_FILES_DIR
--- a/mediasettings/mpsettbase/group/mpsettbase.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mpsettbase/group/mpsettbase.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -15,12 +15,12 @@
*/
-// Version : %version: 2 %
+// Version : %version: 3 %
#include <platform_paths.hrh>
-TARGET MPSettBase.dll
+TARGET mpsettbase.dll
TARGETTYPE dll
UID 0x1000006C 0x101F85E3
VENDORID VID_DEFAULT
@@ -49,7 +49,7 @@
LIBRARY eikcoctl.lib
LIBRARY featmgr.lib
LIBRARY aknskins.lib
-LIBRARY Flogger.lib
+LIBRARY flogger.lib
#if defined(ARMCC)
deffile ../eabi/
--- a/mediasettings/mpsettbase/src/MPSettingsBaseView.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/mpsettbase/src/MPSettingsBaseView.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 4 %
+// Version : %version: 6 %
--- a/mediasettings/videoplayersettingsengine/group/videoplayersettingsengine.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/videoplayersettingsengine/group/videoplayersettingsengine.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -47,7 +47,7 @@
LIBRARY etelmm.lib
LIBRARY centralrepository.lib
LIBRARY efsrv.lib
-LIBRARY SecUi.lib
+LIBRARY secui.lib
LIBRARY apmime.lib
-LIBRARY PlatformEnv.lib // PathInfo
+LIBRARY platformenv.lib // PathInfo
--- a/mediasettings/videoplayersettingsengine/src/videoplayersettingsengine.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/videoplayersettingsengine/src/videoplayersettingsengine.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -24,8 +24,8 @@
#include <commdb.h>
#include <sysutil.h>
#include <mmtsy_names.h>
-#include <SecUi.h>
-#include <SecUiSecurityHandler.h>
+#include <secui.h>
+#include <secuisecurityhandler.h>
#include "videosettingsdrivemonitor.h"
--- a/mediasettings/videoplayersettingsengine/src/videosettingsdrivemonitor.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/mediasettings/videoplayersettingsengine/src/videosettingsdrivemonitor.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -293,6 +293,7 @@
#endif // __WINSCW__
{
if ( !(driveInfo.iMediaAtt & KMediaAttWriteProtected) &&
+ !(driveInfo.iDriveAtt & KDriveAttExternal) &&
(driveInfo.iDriveAtt & KDriveAttLocal) )
{
TIptvDriveInfo iptvDriveInfo;
--- a/tsrc/VCXTestCommon/BWINS/VCXTestCommonu.def Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/VCXTestCommon/BWINS/VCXTestCommonu.def Tue Jan 26 12:00:59 2010 +0200
@@ -145,4 +145,7 @@
?WriteVerifyData@CVCXTestCommon@@QAEHAAVTDesC16@@0@Z @ 144 NONAME ; int CVCXTestCommon::WriteVerifyData(class TDesC16 &, class TDesC16 &)
?WriteVerifyDataL@CIptvTestVerifyData@@QAEHAAVTDesC16@@0@Z @ 145 NONAME ; int CIptvTestVerifyData::WriteVerifyDataL(class TDesC16 &, class TDesC16 &)
?ListFilesProcessesAndThreadsL@CVCXTestCommon@@SAXAAVRFs@@@Z @ 146 NONAME ; void CVCXTestCommon::ListFilesProcessesAndThreadsL(class RFs &)
+ ?GetDefaultIap@CIptvTestUtilALR@@QAEKXZ @ 147 NONAME ; unsigned long CIptvTestUtilALR::GetDefaultIap(void)
+ ?SetDefaultIapCenRep@CIptvTestUtilALR@@QAEHXZ @ 148 NONAME ; int CIptvTestUtilALR::SetDefaultIapCenRep(void)
+ ?GetDefaultIapCenRep@CIptvTestUtilALR@@QAEKXZ @ 149 NONAME ; unsigned long CIptvTestUtilALR::GetDefaultIapCenRep(void)
--- a/tsrc/VCXTestCommon/EABI/VCXTestCommonu.def Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/VCXTestCommon/EABI/VCXTestCommonu.def Tue Jan 26 12:00:59 2010 +0200
@@ -38,180 +38,183 @@
_ZN14CVCXTestCommon22EnableVerifyTimestampsEi @ 37 NONAME
_ZN14CVCXTestCommon24AdvanceSystemTimeMinutesEi @ 38 NONAME
_ZN14CVCXTestCommon24AdvanceSystemTimeSecondsEi @ 39 NONAME
- _ZN14CVCXTestCommon4NewLEv @ 40 NONAME
- _ZN14CVCXTestCommon7ListDirERK7TDesC16i @ 41 NONAME
- _ZN14CVCXTestCommon9GetIapIdLERK7TDesC16Rm @ 42 NONAME
- _ZN14CVCXTestCommon9PrintIapsEv @ 43 NONAME
- _ZN16CIptvTestUtilALR11CopyMethodLER7TDesC16S1_S1_ @ 44 NONAME
- _ZN16CIptvTestUtilALR13DeleteMethodLER7TDesC16S1_ @ 45 NONAME
- _ZN16CIptvTestUtilALR17GetDestinationIdLER7TDesC16 @ 46 NONAME
- _ZN16CIptvTestUtilALR18CreateDestinationLER7TDesC16 @ 47 NONAME
- _ZN16CIptvTestUtilALR18DeleteDestinationLER7TDesC16 @ 48 NONAME
- _ZN16CIptvTestUtilALR18SetMethodPriorityLER7TDesC16S1_m @ 49 NONAME
- _ZN16CIptvTestUtilALR19SetUsedDestinationLER7TDesC16 @ 50 NONAME
- _ZN16CIptvTestUtilALR22SetMethodIntAttributeLER7TDesC16S1_ii @ 51 NONAME
- _ZN16CIptvTestUtilALR23SetMethodBoolAttributeLER7TDesC16S1_ii @ 52 NONAME
- _ZN16CIptvTestUtilALR25SetMethodStringAttributeLER7TDesC16S1_iS1_ @ 53 NONAME
- _ZN16CIptvTestUtilALR28RemoveUsedDestinationCenRepLEv @ 54 NONAME
- _ZN16CIptvTestUtilALR32TerminateDestinationConnectionsLER7TDesC16 @ 55 NONAME
- _ZN16CIptvTestUtilALR4NewLEv @ 56 NONAME
- _ZN16CIptvTestUtilALR5NewLCEv @ 57 NONAME
- _ZN16CIptvTestUtilALRD0Ev @ 58 NONAME
- _ZN16CIptvTestUtilALRD1Ev @ 59 NONAME
- _ZN16CIptvTestUtilALRD2Ev @ 60 NONAME
- _ZN17CVCXTestTimerWait10ConstructLEv @ 61 NONAME
- _ZN17CVCXTestTimerWait4NewLEv @ 62 NONAME
- _ZN17CVCXTestTimerWait5WaitLEm @ 63 NONAME
- _ZN17CVCXTestTimerWaitD0Ev @ 64 NONAME
- _ZN17CVCXTestTimerWaitD1Ev @ 65 NONAME
- _ZN17CVCXTestTimerWaitD2Ev @ 66 NONAME
- _ZN19CIptvTestActiveWait10ActiveWaitENS_22TIptvTestActiveWaitCmdE @ 67 NONAME
- _ZN19CIptvTestActiveWait10ConstructLEv @ 68 NONAME
- _ZN19CIptvTestActiveWait4NewLEv @ 69 NONAME
- _ZN19CIptvTestActiveWait4StopEv @ 70 NONAME
- _ZN19CIptvTestActiveWait5StartEv @ 71 NONAME
- _ZN19CIptvTestActiveWait9IsWaitingEv @ 72 NONAME
- _ZN19CIptvTestActiveWaitC1Ev @ 73 NONAME
- _ZN19CIptvTestActiveWaitC2Ev @ 74 NONAME
- _ZN19CIptvTestActiveWaitD0Ev @ 75 NONAME
- _ZN19CIptvTestActiveWaitD1Ev @ 76 NONAME
- _ZN19CIptvTestActiveWaitD2Ev @ 77 NONAME
- _ZN19CIptvTestVerifyData11VerifyDataLER7TDesC16RNS_13TVerifyResultE @ 78 NONAME
- _ZN19CIptvTestVerifyData16EnableTimestampsEi @ 79 NONAME
- _ZN19CIptvTestVerifyData16WriteVerifyDataLER7TDesC16S1_ @ 80 NONAME
- _ZN19CIptvTestVerifyData17CreateVerifyDataLER7TDesC16i @ 81 NONAME
- _ZN19CIptvTestVerifyData4NewLEv @ 82 NONAME
- _ZN19CIptvTestVerifyDataD0Ev @ 83 NONAME
- _ZN19CIptvTestVerifyDataD1Ev @ 84 NONAME
- _ZN19CIptvTestVerifyDataD2Ev @ 85 NONAME
- _ZN19CTestUtilConnection20TerminateConnectionLEv @ 86 NONAME
- _ZN19CTestUtilConnection24SetConnectionPreferencesEjm @ 87 NONAME
- _ZN19CTestUtilConnection4NewLEP27MTestUtilConnectionObserver @ 88 NONAME
- _ZN19CTestUtilConnection5NewLCEP27MTestUtilConnectionObserver @ 89 NONAME
- _ZN19CTestUtilConnection7AttachLEv @ 90 NONAME
- _ZN19CTestUtilConnection8ConnectLEv @ 91 NONAME
- _ZN19CTestUtilConnectionD0Ev @ 92 NONAME
- _ZN19CTestUtilConnectionD1Ev @ 93 NONAME
- _ZN19CTestUtilConnectionD2Ev @ 94 NONAME
- _ZN19CVCXTestMessageWait10AddMessageEl @ 95 NONAME
- _ZN19CVCXTestMessageWait10ConstructLEv @ 96 NONAME
- _ZN19CVCXTestMessageWait11WaitForAllLEii @ 97 NONAME
- _ZN19CVCXTestMessageWait14ReceiveMessageEli @ 98 NONAME
- _ZN19CVCXTestMessageWait15WaitForMessageLElii @ 99 NONAME
- _ZN19CVCXTestMessageWait21ResetReceivedMessagesEv @ 100 NONAME
- _ZN19CVCXTestMessageWait4NewLEP27MVCXTestMessageWaitObserver @ 101 NONAME
- _ZN19CVCXTestMessageWait5ResetEv @ 102 NONAME
- _ZN19CVCXTestMessageWait9CoolDownLEi @ 103 NONAME
- _ZN19CVCXTestMessageWaitC1EP27MVCXTestMessageWaitObserver @ 104 NONAME
- _ZN19CVCXTestMessageWaitC2EP27MVCXTestMessageWaitObserver @ 105 NONAME
- _ZN19CVCXTestMessageWaitD0Ev @ 106 NONAME
- _ZN19CVCXTestMessageWaitD1Ev @ 107 NONAME
- _ZN19CVCXTestMessageWaitD2Ev @ 108 NONAME
- _ZN19CVCXTestStatsKeeper10ActionEndLERK7TDesC16i @ 109 NONAME
- _ZN19CVCXTestStatsKeeper10ActionEndLEli @ 110 NONAME
- _ZN19CVCXTestStatsKeeper12ActionStartLERK7TDesC16S2_i @ 111 NONAME
- _ZN19CVCXTestStatsKeeper12ActionStartLElRK7TDesC16 @ 112 NONAME
- _ZN19CVCXTestStatsKeeper12ActionTraceLERK7TDesC16 @ 113 NONAME
- _ZN19CVCXTestStatsKeeper15ActionProgressLERK7TDesC16S2_ @ 114 NONAME
- _ZN19CVCXTestStatsKeeper15ActionProgressLElRK7TDesC16 @ 115 NONAME
- _ZN19CVCXTestStatsKeeper18StartStatsKeepingLERK7TDesC16S2_ @ 116 NONAME
- _ZN19CVCXTestStatsKeeper4NewLEv @ 117 NONAME
- _ZN20CIptvTestEventWaiter13CheckTimeoutsEv @ 118 NONAME
- _ZN20CIptvTestEventWaiter13EventHappenedEP14CIptvTestEventPS1_ @ 119 NONAME
- _ZN20CIptvTestEventWaiter13GetEventCountEv @ 120 NONAME
- _ZN20CIptvTestEventWaiter4NewLER28MIptvTestEventWaiterObserver @ 121 NONAME
- _ZN20CIptvTestEventWaiter5ResetEv @ 122 NONAME
- _ZN20CIptvTestEventWaiter8AddEventEP14CIptvTestEventi @ 123 NONAME
- _ZN20CIptvTestEventWaiterD0Ev @ 124 NONAME
- _ZN20CIptvTestEventWaiterD1Ev @ 125 NONAME
- _ZN20CIptvTestEventWaiterD2Ev @ 126 NONAME
- _ZN20CVCXTestPSSubscriber11WaitChangeLEv @ 127 NONAME
- _ZN20CVCXTestPSSubscriber3GetER6TDes16 @ 128 NONAME
- _ZN20CVCXTestPSSubscriber3GetERi @ 129 NONAME
- _ZN20CVCXTestPSSubscriber3SetERK7TDesC16 @ 130 NONAME
- _ZN20CVCXTestPSSubscriber3SetERi @ 131 NONAME
- _ZN20CVCXTestPSSubscriber4NewLE4TUidmN9RProperty5TTypeEP18MVCXTestPSObserver @ 132 NONAME
- _ZN20CVCXTestPSSubscriber5StartEv @ 133 NONAME
- _ZN20CVCXTestPSSubscriber7EndWaitEv @ 134 NONAME
- _ZN20CVCXTestPSSubscriber8DoCancelEv @ 135 NONAME
- _ZN20CVCXTestPSSubscriberD0Ev @ 136 NONAME
- _ZN20CVCXTestPSSubscriberD1Ev @ 137 NONAME
- _ZN20CVCXTestPSSubscriberD2Ev @ 138 NONAME
- _ZN21CIptvTestVideoCreator10ConstructLEv @ 139 NONAME
- _ZN21CIptvTestVideoCreator12CreateVideoLENS_18TIptvTestVideoTypeER7TDesC16i @ 140 NONAME
- _ZN21CIptvTestVideoCreator12GetVideoFileER6TDes16NS_18TIptvTestVideoTypeERK7TDesC16 @ 141 NONAME
- _ZN21CIptvTestVideoCreator13CreateVideosLENS_18TIptvTestVideoTypeER7TDesC16iR13RPointerArrayI7HBufC16E @ 142 NONAME
- _ZN21CIptvTestVideoCreator4NewLEv @ 143 NONAME
- _ZN21CIptvTestVideoCreatorC1Ev @ 144 NONAME
- _ZN21CIptvTestVideoCreatorC2Ev @ 145 NONAME
- _ZN21CIptvTestVideoCreatorD0Ev @ 146 NONAME
- _ZN21CIptvTestVideoCreatorD1Ev @ 147 NONAME
- _ZN21CIptvTestVideoCreatorD2Ev @ 148 NONAME
- _ZN24CIptvTestDownloadManager10ConstructLEv @ 149 NONAME
- _ZN24CIptvTestDownloadManager4NewLEP25MTestUtilDownloadObserver @ 150 NONAME
- _ZN24CIptvTestDownloadManager5NewLCEP25MTestUtilDownloadObserver @ 151 NONAME
- _ZN24CIptvTestDownloadManager8GetErrorER13RHttpDownloadRl @ 152 NONAME
- _ZN24CIptvTestDownloadManager9DownloadLER7TDesC16S1_S1_S1_li @ 153 NONAME
- _ZN24CIptvTestDownloadManagerD0Ev @ 154 NONAME
- _ZN24CIptvTestDownloadManagerD1Ev @ 155 NONAME
- _ZN24CIptvTestDownloadManagerD2Ev @ 156 NONAME
- _ZN25CTestUtilConnectionWaiter17WaitForConnectionEm @ 157 NONAME
- _ZN25CTestUtilConnectionWaiter18IsConnectionActiveEm @ 158 NONAME
- _ZN25CTestUtilConnectionWaiter27WaitUntilConnectionIsClosedEm @ 159 NONAME
- _ZN25CTestUtilConnectionWaiter4NewLEP27MTestUtilConnectionObserver @ 160 NONAME
- _ZN25CTestUtilConnectionWaiter5NewLCEP27MTestUtilConnectionObserver @ 161 NONAME
- _ZN25CTestUtilConnectionWaiterC1EP27MTestUtilConnectionObserver @ 162 NONAME
- _ZN25CTestUtilConnectionWaiterC2EP27MTestUtilConnectionObserver @ 163 NONAME
- _ZN25CTestUtilConnectionWaiterD0Ev @ 164 NONAME
- _ZN25CTestUtilConnectionWaiterD1Ev @ 165 NONAME
- _ZN25CTestUtilConnectionWaiterD2Ev @ 166 NONAME
- _ZN27CIptvTestMobilecrashWatcher16CheckNewCrashesLEv @ 167 NONAME
- _ZN27CIptvTestMobilecrashWatcher16ReturnNewCrashesER13RPointerArrayI7HBufC16E @ 168 NONAME
- _ZN27CIptvTestMobilecrashWatcher18ReadMobilecrashesLER13RPointerArrayI7HBufC16ERK7TDesC16 @ 169 NONAME
- _ZN27CIptvTestMobilecrashWatcher21CompareMobilecrashesLER13RPointerArrayI7HBufC16ES3_ @ 170 NONAME
- _ZN27CIptvTestMobilecrashWatcher22ReturnMobileCrashCountEv @ 171 NONAME
- _ZN27CIptvTestMobilecrashWatcher4NewLEi @ 172 NONAME
- _ZN27CIptvTestMobilecrashWatcher4NewLEv @ 173 NONAME
- _ZN27CIptvTestMobilecrashWatcherD0Ev @ 174 NONAME
- _ZN27CIptvTestMobilecrashWatcherD1Ev @ 175 NONAME
- _ZN27CIptvTestMobilecrashWatcherD2Ev @ 176 NONAME
- _ZTI11CVerifyFile @ 177 NONAME ; #<TI>#
- _ZTI14CIptvTestEvent @ 178 NONAME ; #<TI>#
- _ZTI14CIptvTestTimer @ 179 NONAME ; #<TI>#
- _ZTI14CVCXTestCommon @ 180 NONAME ; #<TI>#
- _ZTI16CIptvTestUtilALR @ 181 NONAME ; #<TI>#
- _ZTI17CVCXTestStatsItem @ 182 NONAME ; #<TI>#
- _ZTI17CVCXTestTimerWait @ 183 NONAME ; #<TI>#
- _ZTI19CIptvTestActiveWait @ 184 NONAME ; #<TI>#
- _ZTI19CIptvTestVerifyData @ 185 NONAME ; #<TI>#
- _ZTI19CTestUtilConnection @ 186 NONAME ; #<TI>#
- _ZTI19CVCXTestMessageWait @ 187 NONAME ; #<TI>#
- _ZTI19CVCXTestStatsKeeper @ 188 NONAME ; #<TI>#
- _ZTI20CIptvTestEventWaiter @ 189 NONAME ; #<TI>#
- _ZTI20CVCXTestPSSubscriber @ 190 NONAME ; #<TI>#
- _ZTI21CIptvTestVideoCreator @ 191 NONAME ; #<TI>#
- _ZTI24CIptvTestDownloadManager @ 192 NONAME ; #<TI>#
- _ZTI24CVCXTestStatsItemSummary @ 193 NONAME ; #<TI>#
- _ZTI25CTestUtilConnectionWaiter @ 194 NONAME ; #<TI>#
- _ZTI27CIptvTestMobilecrashWatcher @ 195 NONAME ; #<TI>#
- _ZTV11CVerifyFile @ 196 NONAME ; #<VT>#
- _ZTV14CIptvTestEvent @ 197 NONAME ; #<VT>#
- _ZTV14CIptvTestTimer @ 198 NONAME ; #<VT>#
- _ZTV14CVCXTestCommon @ 199 NONAME ; #<VT>#
- _ZTV16CIptvTestUtilALR @ 200 NONAME ; #<VT>#
- _ZTV17CVCXTestStatsItem @ 201 NONAME ; #<VT>#
- _ZTV17CVCXTestTimerWait @ 202 NONAME ; #<VT>#
- _ZTV19CIptvTestActiveWait @ 203 NONAME ; #<VT>#
- _ZTV19CIptvTestVerifyData @ 204 NONAME ; #<VT>#
- _ZTV19CTestUtilConnection @ 205 NONAME ; #<VT>#
- _ZTV19CVCXTestMessageWait @ 206 NONAME ; #<VT>#
- _ZTV19CVCXTestStatsKeeper @ 207 NONAME ; #<VT>#
- _ZTV20CIptvTestEventWaiter @ 208 NONAME ; #<VT>#
- _ZTV20CVCXTestPSSubscriber @ 209 NONAME ; #<VT>#
- _ZTV21CIptvTestVideoCreator @ 210 NONAME ; #<VT>#
- _ZTV24CIptvTestDownloadManager @ 211 NONAME ; #<VT>#
- _ZTV24CVCXTestStatsItemSummary @ 212 NONAME ; #<VT>#
- _ZTV25CTestUtilConnectionWaiter @ 213 NONAME ; #<VT>#
- _ZTV27CIptvTestMobilecrashWatcher @ 214 NONAME ; #<VT>#
- _ZN14CVCXTestCommon29ListFilesProcessesAndThreadsLER3RFs @ 215 NONAME
+ _ZN14CVCXTestCommon29ListFilesProcessesAndThreadsLER3RFs @ 40 NONAME
+ _ZN14CVCXTestCommon4NewLEv @ 41 NONAME
+ _ZN14CVCXTestCommon7ListDirERK7TDesC16i @ 42 NONAME
+ _ZN14CVCXTestCommon9GetIapIdLERK7TDesC16Rm @ 43 NONAME
+ _ZN14CVCXTestCommon9PrintIapsEv @ 44 NONAME
+ _ZN16CIptvTestUtilALR11CopyMethodLER7TDesC16S1_S1_ @ 45 NONAME
+ _ZN16CIptvTestUtilALR13DeleteMethodLER7TDesC16S1_ @ 46 NONAME
+ _ZN16CIptvTestUtilALR13GetDefaultIapEv @ 47 NONAME
+ _ZN16CIptvTestUtilALR17GetDestinationIdLER7TDesC16 @ 48 NONAME
+ _ZN16CIptvTestUtilALR18CreateDestinationLER7TDesC16 @ 49 NONAME
+ _ZN16CIptvTestUtilALR18DeleteDestinationLER7TDesC16 @ 50 NONAME
+ _ZN16CIptvTestUtilALR18SetMethodPriorityLER7TDesC16S1_m @ 51 NONAME
+ _ZN16CIptvTestUtilALR19SetUsedDestinationLER7TDesC16 @ 52 NONAME
+ _ZN16CIptvTestUtilALR22SetMethodIntAttributeLER7TDesC16S1_ii @ 53 NONAME
+ _ZN16CIptvTestUtilALR23SetMethodBoolAttributeLER7TDesC16S1_ii @ 54 NONAME
+ _ZN16CIptvTestUtilALR25SetMethodStringAttributeLER7TDesC16S1_iS1_ @ 55 NONAME
+ _ZN16CIptvTestUtilALR28RemoveUsedDestinationCenRepLEv @ 56 NONAME
+ _ZN16CIptvTestUtilALR32TerminateDestinationConnectionsLER7TDesC16 @ 57 NONAME
+ _ZN16CIptvTestUtilALR4NewLEv @ 58 NONAME
+ _ZN16CIptvTestUtilALR5NewLCEv @ 59 NONAME
+ _ZN16CIptvTestUtilALRD0Ev @ 60 NONAME
+ _ZN16CIptvTestUtilALRD1Ev @ 61 NONAME
+ _ZN16CIptvTestUtilALRD2Ev @ 62 NONAME
+ _ZN17CVCXTestTimerWait10ConstructLEv @ 63 NONAME
+ _ZN17CVCXTestTimerWait4NewLEv @ 64 NONAME
+ _ZN17CVCXTestTimerWait5WaitLEm @ 65 NONAME
+ _ZN17CVCXTestTimerWaitD0Ev @ 66 NONAME
+ _ZN17CVCXTestTimerWaitD1Ev @ 67 NONAME
+ _ZN17CVCXTestTimerWaitD2Ev @ 68 NONAME
+ _ZN19CIptvTestActiveWait10ActiveWaitENS_22TIptvTestActiveWaitCmdE @ 69 NONAME
+ _ZN19CIptvTestActiveWait10ConstructLEv @ 70 NONAME
+ _ZN19CIptvTestActiveWait4NewLEv @ 71 NONAME
+ _ZN19CIptvTestActiveWait4StopEv @ 72 NONAME
+ _ZN19CIptvTestActiveWait5StartEv @ 73 NONAME
+ _ZN19CIptvTestActiveWait9IsWaitingEv @ 74 NONAME
+ _ZN19CIptvTestActiveWaitC1Ev @ 75 NONAME
+ _ZN19CIptvTestActiveWaitC2Ev @ 76 NONAME
+ _ZN19CIptvTestActiveWaitD0Ev @ 77 NONAME
+ _ZN19CIptvTestActiveWaitD1Ev @ 78 NONAME
+ _ZN19CIptvTestActiveWaitD2Ev @ 79 NONAME
+ _ZN19CIptvTestVerifyData11VerifyDataLER7TDesC16RNS_13TVerifyResultE @ 80 NONAME
+ _ZN19CIptvTestVerifyData16EnableTimestampsEi @ 81 NONAME
+ _ZN19CIptvTestVerifyData16WriteVerifyDataLER7TDesC16S1_ @ 82 NONAME
+ _ZN19CIptvTestVerifyData17CreateVerifyDataLER7TDesC16i @ 83 NONAME
+ _ZN19CIptvTestVerifyData4NewLEv @ 84 NONAME
+ _ZN19CIptvTestVerifyDataD0Ev @ 85 NONAME
+ _ZN19CIptvTestVerifyDataD1Ev @ 86 NONAME
+ _ZN19CIptvTestVerifyDataD2Ev @ 87 NONAME
+ _ZN19CTestUtilConnection20TerminateConnectionLEv @ 88 NONAME
+ _ZN19CTestUtilConnection24SetConnectionPreferencesEjm @ 89 NONAME
+ _ZN19CTestUtilConnection4NewLEP27MTestUtilConnectionObserver @ 90 NONAME
+ _ZN19CTestUtilConnection5NewLCEP27MTestUtilConnectionObserver @ 91 NONAME
+ _ZN19CTestUtilConnection7AttachLEv @ 92 NONAME
+ _ZN19CTestUtilConnection8ConnectLEv @ 93 NONAME
+ _ZN19CTestUtilConnectionD0Ev @ 94 NONAME
+ _ZN19CTestUtilConnectionD1Ev @ 95 NONAME
+ _ZN19CTestUtilConnectionD2Ev @ 96 NONAME
+ _ZN19CVCXTestMessageWait10AddMessageEl @ 97 NONAME
+ _ZN19CVCXTestMessageWait10ConstructLEv @ 98 NONAME
+ _ZN19CVCXTestMessageWait11WaitForAllLEii @ 99 NONAME
+ _ZN19CVCXTestMessageWait14ReceiveMessageEli @ 100 NONAME
+ _ZN19CVCXTestMessageWait15WaitForMessageLElii @ 101 NONAME
+ _ZN19CVCXTestMessageWait21ResetReceivedMessagesEv @ 102 NONAME
+ _ZN19CVCXTestMessageWait4NewLEP27MVCXTestMessageWaitObserver @ 103 NONAME
+ _ZN19CVCXTestMessageWait5ResetEv @ 104 NONAME
+ _ZN19CVCXTestMessageWait9CoolDownLEi @ 105 NONAME
+ _ZN19CVCXTestMessageWaitC1EP27MVCXTestMessageWaitObserver @ 106 NONAME
+ _ZN19CVCXTestMessageWaitC2EP27MVCXTestMessageWaitObserver @ 107 NONAME
+ _ZN19CVCXTestMessageWaitD0Ev @ 108 NONAME
+ _ZN19CVCXTestMessageWaitD1Ev @ 109 NONAME
+ _ZN19CVCXTestMessageWaitD2Ev @ 110 NONAME
+ _ZN19CVCXTestStatsKeeper10ActionEndLERK7TDesC16i @ 111 NONAME
+ _ZN19CVCXTestStatsKeeper10ActionEndLEli @ 112 NONAME
+ _ZN19CVCXTestStatsKeeper12ActionStartLERK7TDesC16S2_i @ 113 NONAME
+ _ZN19CVCXTestStatsKeeper12ActionStartLElRK7TDesC16 @ 114 NONAME
+ _ZN19CVCXTestStatsKeeper12ActionTraceLERK7TDesC16 @ 115 NONAME
+ _ZN19CVCXTestStatsKeeper15ActionProgressLERK7TDesC16S2_ @ 116 NONAME
+ _ZN19CVCXTestStatsKeeper15ActionProgressLElRK7TDesC16 @ 117 NONAME
+ _ZN19CVCXTestStatsKeeper18StartStatsKeepingLERK7TDesC16S2_ @ 118 NONAME
+ _ZN19CVCXTestStatsKeeper4NewLEv @ 119 NONAME
+ _ZN20CIptvTestEventWaiter13CheckTimeoutsEv @ 120 NONAME
+ _ZN20CIptvTestEventWaiter13EventHappenedEP14CIptvTestEventPS1_ @ 121 NONAME
+ _ZN20CIptvTestEventWaiter13GetEventCountEv @ 122 NONAME
+ _ZN20CIptvTestEventWaiter4NewLER28MIptvTestEventWaiterObserver @ 123 NONAME
+ _ZN20CIptvTestEventWaiter5ResetEv @ 124 NONAME
+ _ZN20CIptvTestEventWaiter8AddEventEP14CIptvTestEventi @ 125 NONAME
+ _ZN20CIptvTestEventWaiterD0Ev @ 126 NONAME
+ _ZN20CIptvTestEventWaiterD1Ev @ 127 NONAME
+ _ZN20CIptvTestEventWaiterD2Ev @ 128 NONAME
+ _ZN20CVCXTestPSSubscriber11WaitChangeLEv @ 129 NONAME
+ _ZN20CVCXTestPSSubscriber3GetER6TDes16 @ 130 NONAME
+ _ZN20CVCXTestPSSubscriber3GetERi @ 131 NONAME
+ _ZN20CVCXTestPSSubscriber3SetERK7TDesC16 @ 132 NONAME
+ _ZN20CVCXTestPSSubscriber3SetERi @ 133 NONAME
+ _ZN20CVCXTestPSSubscriber4NewLE4TUidmN9RProperty5TTypeEP18MVCXTestPSObserver @ 134 NONAME
+ _ZN20CVCXTestPSSubscriber5StartEv @ 135 NONAME
+ _ZN20CVCXTestPSSubscriber7EndWaitEv @ 136 NONAME
+ _ZN20CVCXTestPSSubscriber8DoCancelEv @ 137 NONAME
+ _ZN20CVCXTestPSSubscriberD0Ev @ 138 NONAME
+ _ZN20CVCXTestPSSubscriberD1Ev @ 139 NONAME
+ _ZN20CVCXTestPSSubscriberD2Ev @ 140 NONAME
+ _ZN21CIptvTestVideoCreator10ConstructLEv @ 141 NONAME
+ _ZN21CIptvTestVideoCreator12CreateVideoLENS_18TIptvTestVideoTypeER7TDesC16i @ 142 NONAME
+ _ZN21CIptvTestVideoCreator12GetVideoFileER6TDes16NS_18TIptvTestVideoTypeERK7TDesC16 @ 143 NONAME
+ _ZN21CIptvTestVideoCreator13CreateVideosLENS_18TIptvTestVideoTypeER7TDesC16iR13RPointerArrayI7HBufC16E @ 144 NONAME
+ _ZN21CIptvTestVideoCreator4NewLEv @ 145 NONAME
+ _ZN21CIptvTestVideoCreatorC1Ev @ 146 NONAME
+ _ZN21CIptvTestVideoCreatorC2Ev @ 147 NONAME
+ _ZN21CIptvTestVideoCreatorD0Ev @ 148 NONAME
+ _ZN21CIptvTestVideoCreatorD1Ev @ 149 NONAME
+ _ZN21CIptvTestVideoCreatorD2Ev @ 150 NONAME
+ _ZN24CIptvTestDownloadManager10ConstructLEv @ 151 NONAME
+ _ZN24CIptvTestDownloadManager4NewLEP25MTestUtilDownloadObserver @ 152 NONAME
+ _ZN24CIptvTestDownloadManager5NewLCEP25MTestUtilDownloadObserver @ 153 NONAME
+ _ZN24CIptvTestDownloadManager8GetErrorER13RHttpDownloadRl @ 154 NONAME
+ _ZN24CIptvTestDownloadManager9DownloadLER7TDesC16S1_S1_S1_li @ 155 NONAME
+ _ZN24CIptvTestDownloadManagerD0Ev @ 156 NONAME
+ _ZN24CIptvTestDownloadManagerD1Ev @ 157 NONAME
+ _ZN24CIptvTestDownloadManagerD2Ev @ 158 NONAME
+ _ZN25CTestUtilConnectionWaiter17WaitForConnectionEm @ 159 NONAME
+ _ZN25CTestUtilConnectionWaiter18IsConnectionActiveEm @ 160 NONAME
+ _ZN25CTestUtilConnectionWaiter27WaitUntilConnectionIsClosedEm @ 161 NONAME
+ _ZN25CTestUtilConnectionWaiter4NewLEP27MTestUtilConnectionObserver @ 162 NONAME
+ _ZN25CTestUtilConnectionWaiter5NewLCEP27MTestUtilConnectionObserver @ 163 NONAME
+ _ZN25CTestUtilConnectionWaiterC1EP27MTestUtilConnectionObserver @ 164 NONAME
+ _ZN25CTestUtilConnectionWaiterC2EP27MTestUtilConnectionObserver @ 165 NONAME
+ _ZN25CTestUtilConnectionWaiterD0Ev @ 166 NONAME
+ _ZN25CTestUtilConnectionWaiterD1Ev @ 167 NONAME
+ _ZN25CTestUtilConnectionWaiterD2Ev @ 168 NONAME
+ _ZN27CIptvTestMobilecrashWatcher16CheckNewCrashesLEv @ 169 NONAME
+ _ZN27CIptvTestMobilecrashWatcher16ReturnNewCrashesER13RPointerArrayI7HBufC16E @ 170 NONAME
+ _ZN27CIptvTestMobilecrashWatcher18ReadMobilecrashesLER13RPointerArrayI7HBufC16ERK7TDesC16 @ 171 NONAME
+ _ZN27CIptvTestMobilecrashWatcher21CompareMobilecrashesLER13RPointerArrayI7HBufC16ES3_ @ 172 NONAME
+ _ZN27CIptvTestMobilecrashWatcher22ReturnMobileCrashCountEv @ 173 NONAME
+ _ZN27CIptvTestMobilecrashWatcher4NewLEi @ 174 NONAME
+ _ZN27CIptvTestMobilecrashWatcher4NewLEv @ 175 NONAME
+ _ZN27CIptvTestMobilecrashWatcherD0Ev @ 176 NONAME
+ _ZN27CIptvTestMobilecrashWatcherD1Ev @ 177 NONAME
+ _ZN27CIptvTestMobilecrashWatcherD2Ev @ 178 NONAME
+ _ZTI11CVerifyFile @ 179 NONAME
+ _ZTI14CIptvTestEvent @ 180 NONAME
+ _ZTI14CIptvTestTimer @ 181 NONAME
+ _ZTI14CVCXTestCommon @ 182 NONAME
+ _ZTI16CIptvTestUtilALR @ 183 NONAME
+ _ZTI17CVCXTestStatsItem @ 184 NONAME
+ _ZTI17CVCXTestTimerWait @ 185 NONAME
+ _ZTI19CIptvTestActiveWait @ 186 NONAME
+ _ZTI19CIptvTestVerifyData @ 187 NONAME
+ _ZTI19CTestUtilConnection @ 188 NONAME
+ _ZTI19CVCXTestMessageWait @ 189 NONAME
+ _ZTI19CVCXTestStatsKeeper @ 190 NONAME
+ _ZTI20CIptvTestEventWaiter @ 191 NONAME
+ _ZTI20CVCXTestPSSubscriber @ 192 NONAME
+ _ZTI21CIptvTestVideoCreator @ 193 NONAME
+ _ZTI24CIptvTestDownloadManager @ 194 NONAME
+ _ZTI24CVCXTestStatsItemSummary @ 195 NONAME
+ _ZTI25CTestUtilConnectionWaiter @ 196 NONAME
+ _ZTI27CIptvTestMobilecrashWatcher @ 197 NONAME
+ _ZTV11CVerifyFile @ 198 NONAME
+ _ZTV14CIptvTestEvent @ 199 NONAME
+ _ZTV14CIptvTestTimer @ 200 NONAME
+ _ZTV14CVCXTestCommon @ 201 NONAME
+ _ZTV16CIptvTestUtilALR @ 202 NONAME
+ _ZTV17CVCXTestStatsItem @ 203 NONAME
+ _ZTV17CVCXTestTimerWait @ 204 NONAME
+ _ZTV19CIptvTestActiveWait @ 205 NONAME
+ _ZTV19CIptvTestVerifyData @ 206 NONAME
+ _ZTV19CTestUtilConnection @ 207 NONAME
+ _ZTV19CVCXTestMessageWait @ 208 NONAME
+ _ZTV19CVCXTestStatsKeeper @ 209 NONAME
+ _ZTV20CIptvTestEventWaiter @ 210 NONAME
+ _ZTV20CVCXTestPSSubscriber @ 211 NONAME
+ _ZTV21CIptvTestVideoCreator @ 212 NONAME
+ _ZTV24CIptvTestDownloadManager @ 213 NONAME
+ _ZTV24CVCXTestStatsItemSummary @ 214 NONAME
+ _ZTV25CTestUtilConnectionWaiter @ 215 NONAME
+ _ZTV27CIptvTestMobilecrashWatcher @ 216 NONAME
+ _ZN16CIptvTestUtilALR19GetDefaultIapCenRepEv @ 217 NONAME
+ _ZN16CIptvTestUtilALR19SetDefaultIapCenRepEv @ 218 NONAME
--- a/tsrc/VCXTestCommon/inc/IptvTestUtilALR.h Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/VCXTestCommon/inc/IptvTestUtilALR.h Tue Jan 26 12:00:59 2010 +0200
@@ -36,6 +36,7 @@
// Declared in CIptvUtil.h and vcxconnutilimpl.cpp
const TUid VCXTEST_KIptvAlrCenRepUid = { 0x2000B438 };
const TInt VCXTEST_KIptvCenRepUsedSnapIdKey = 0x1;
+const TInt VCXTEST_KIptvCenRepDefaultIapIdKey = 0x2;
const TInt VCXTEST_KIptvCenRepAPModeAlwaysAsk = 0;
// CLASS DECLARATION
@@ -136,7 +137,18 @@
* Gets the default access point from connection manager
*/
IMPORT_C TUint32 GetDefaultIap( void );
+
+ /**
+ * Gets the default iap, saves it to cenrep
+ */
+ IMPORT_C TInt SetDefaultIapCenRep( void );
+
+ /**
+ * Gets the default iap id from cenrep
+ */
+ IMPORT_C TUint32 GetDefaultIapCenRep( void );
+
private: // New functions
/**
--- a/tsrc/VCXTestCommon/src/CIptvTestTimer.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/VCXTestCommon/src/CIptvTestTimer.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -132,6 +132,7 @@
if( !IsActive() )
{
+ VCXLOGLO2("CIptvTestTimer::After: Setting active. (%d)", this);
iTimer.After( iStatus, aInterval );
SetActive();
iRestartAfterCancel = EFalse;
--- a/tsrc/VCXTestCommon/src/IptvTestUtilALR.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/VCXTestCommon/src/IptvTestUtilALR.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -912,6 +912,51 @@
}
// ---------------------------------------------------------------------------
+// CIptvTestUtilALR::SetDefaultIapCenRep
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TInt CIptvTestUtilALR::SetDefaultIapCenRep()
+ {
+ TUint32 iap( 0 );
+ iap = GetDefaultIap();
+ TInt err( 0 );
+
+ if( iap != 0 )
+ {
+ VCXLOGLO1("CIptvTestUtilALR::SetDefaultIapCenRep Create cenrep.");
+ CRepository* cenRep = CRepository::NewLC( VCXTEST_KIptvAlrCenRepUid );
+ VCXLOGLO1("CIptvTestUtilALR::SetDefaultIapCenRep Set cenrep.");
+ User::LeaveIfError( cenRep->Set( VCXTEST_KIptvCenRepDefaultIapIdKey, (TInt)iap ) );
+ CleanupStack::PopAndDestroy( cenRep );
+ }
+ else
+ {
+ err = KErrNotFound;
+ }
+
+ return err;
+ }
+
+// ---------------------------------------------------------------------------
+// CIptvTestUtilALR::GetDefaultIap
+// ---------------------------------------------------------------------------
+//
+EXPORT_C TUint32 CIptvTestUtilALR::GetDefaultIapCenRep()
+ {
+ TInt iap( 0 );
+
+ VCXLOGLO1("CIptvTestUtilALR::GetDefaultIapCenRep Create cenrep.");
+ CRepository* cenRep = CRepository::NewLC( VCXTEST_KIptvAlrCenRepUid );
+ VCXLOGLO1("CIptvTestUtilALR::GetDefaultIapCenRep Set cenrep.");
+ User::LeaveIfError( cenRep->Get( VCXTEST_KIptvCenRepDefaultIapIdKey, iap) );
+ CleanupStack::PopAndDestroy( cenRep );
+
+ TUint32 iapId( iap );
+
+ return iapId;
+ }
+
+// ---------------------------------------------------------------------------
// CIptvTestUtilALR::PrintDestinationL
// ---------------------------------------------------------------------------
//
--- a/tsrc/VCXTestCommon/src/VCXTestCommon.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/VCXTestCommon/src/VCXTestCommon.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -24,6 +24,7 @@
#include <mmf/common/mmfcontrollerpluginresolver.h>
#include "VCXTestCommon.h"
+#include "IptvTestUtilALR.h"
#include "CIptvTestVerifyData.h"
#include "TestUtilConnectionWaiter.h"
#include "VCXTestLog.h"
@@ -169,7 +170,33 @@
return found;
}
#endif
-
+
+ if( aIapName == _L("default") )
+ {
+ VCXLOGLO1("CVCXTestCommon::GetIapIdL -- Searching default iap from cenrep");
+ CIptvTestUtilALR* util = CIptvTestUtilALR::NewLC();
+ aIapId = util->GetDefaultIapCenRep();
+ CleanupStack::PopAndDestroy( util );
+ if( aIapId != 0 )
+ {
+ VCXLOGLO2("CVCXTestCommon::GetIapIdL -- Got default from cenrep: %d", aIapId);
+ return ETrue;
+ }
+ }
+
+ if( aIapName == _L("default") )
+ {
+ VCXLOGLO1("CVCXTestCommon::GetIapIdL -- Getting default iap via ALR util");
+ CIptvTestUtilALR* util = CIptvTestUtilALR::NewLC();
+ aIapId = util->GetDefaultIap();
+ CleanupStack::PopAndDestroy( util );
+ if( aIapId != 0 )
+ {
+ VCXLOGLO2("CVCXTestCommon::GetIapIdL -- Got default: %d", aIapId);
+ return ETrue;
+ }
+ }
+
VCXLOGLO2("CVCXTestCommon:: Searching IAP: %S", &aIapName);
found = GetIapIdByNameL(aIapName, aIapId);
--- a/tsrc/VCXTestUtilModule/inc/IptvTestUtilModule.h Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/VCXTestUtilModule/inc/IptvTestUtilModule.h Tue Jan 26 12:00:59 2010 +0200
@@ -293,7 +293,11 @@
*/
virtual TInt SetTimeZone(CStifItemParser& aItem );
-
+ /**
+ * Sets the default iap id value to cenrep.
+ */
+ virtual TInt SetDefaultIapCenRepL(CStifItemParser& aItem );
+
/**
* Removes the used destination cenrep value.
*/
--- a/tsrc/VCXTestUtilModule/src/IptvTestUtilModuleBlocks.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/VCXTestUtilModule/src/IptvTestUtilModuleBlocks.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -175,6 +175,7 @@
ENTRY( "CheckMobilecrashes", CIptvTestUtilModule::CheckMobilecrashesL ),
ENTRY( "CheckMobilecrashesZeroTolerance", CIptvTestUtilModule::CheckMobilecrashesZeroToleranceL ),
+ ENTRY( "SetDefaultIapCenrep", CIptvTestUtilModule::SetDefaultIapCenRepL ),
ENTRY( "DeleteUsedDestinationCenRep", CIptvTestUtilModule::DeleteUsedDestinationCenRepL ),
ENTRY( "SetUsedDestination", CIptvTestUtilModule::SetUsedDestinationL ),
ENTRY( "CreateDestination", CIptvTestUtilModule::CreateDestinationL ),
@@ -1256,6 +1257,36 @@
}
// -----------------------------------------------------------------------------
+// CIptvTestUtilModule::SetDefaultIapCenRep
+// -----------------------------------------------------------------------------
+//
+TInt CIptvTestUtilModule::SetDefaultIapCenRepL(CStifItemParser& aItem )
+ {
+ VCXLOGLO1(">>>CIptvTestUtilModule::SetDefaultIapCenRep");
+ // Print to UI
+ _LIT( KIptvTestUtilConnect, "IptvTestUtilModule" );
+ _LIT( KWhere, "In SetDefaultIapCenRep" );
+ TestModuleIf().Printf( 0, KIptvTestUtilConnect, KWhere );
+ // Print to log file
+ iLog->Log( KWhere );
+
+ TInt ret( KErrNone );
+
+ if( !iTestUtilALR )
+ {
+ iTestUtilALR = CIptvTestUtilALR::NewL();
+ }
+
+ aItem.SetParsingType(CStifItemParser::EQuoteStyleParsing);
+
+ TRAP( ret, iTestUtilALR->SetDefaultIapCenRep() );
+
+ VCXLOGLO2("<<<CIptvTestUtilModule:: returning: %d", ret);
+ VCXLOGLO1("<<<CIptvTestUtilModule::SetDefaultIapCenRep");
+ return ret;
+ }
+
+// -----------------------------------------------------------------------------
// CIptvTestUtilModule::SetUsedDestinationL
// -----------------------------------------------------------------------------
//
--- a/tsrc/conf/ats_moduletests.txt Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/conf/ats_moduletests.txt Tue Jan 26 12:00:59 2010 +0200
@@ -14,6 +14,5 @@
INC ..\..\videofeeds\server\tsrc\VCXSettingsDatabaseTest\conf\atsconf.txt
INC ..\..\videofeeds\server\tsrc\VCXProvisioningTest\conf\atsconf.txt
INC ..\..\videofeeds\server\tsrc\VCXScheduledReminderTest\conf\atsconf.txt
-INC ..\..\videofeeds\server\tsrc\VCXScheduledDownloadTest\conf\atsconf.txt
INC ..\..\videofeeds\server\tsrc\VCXServiceManagementApiTest\conf\atsconf.txt
INC ..\..\videofeeds\server\tsrc\VCXVodContentApiTest\conf\atsconf.txt
--- a/tsrc/testing/inc/mpxlog.h Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/testing/inc/mpxlog.h Tue Jan 26 12:00:59 2010 +0200
@@ -25,7 +25,7 @@
#include <e32svr.h>
#include <e32property.h>
-#include "mpxvideo_debug.h"
+#include <mpxvideo_debug.h>
#ifdef _DEBUG
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/testing/ini/08-connutil/TestFramework.ini Tue Jan 26 12:00:59 2010 +0200
@@ -0,0 +1,168 @@
+#
+# 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\VCXConnUtilTestSNAP.cfg
+TestCaseFile= c:\testframework\VCXConnUtilTestMasterAndSlave.cfg
+TestCaseFile= c:\testframework\VCXConnUtilTestStates.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
--- a/tsrc/testing/sis/fusion_engine_tests.pkg Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/testing/sis/fusion_engine_tests.pkg Tue Jan 26 12:00:59 2010 +0200
@@ -96,13 +96,6 @@
"../../../videofeeds/server/tsrc/VCXScheduledReminderTest/conf/VCXScheduledReminderTest.cfg" - "c:/testframework/VCXScheduledReminderTest.cfg"
"../../../videofeeds/server/tsrc/VCXScheduledReminderTest/conf/VCXScheduledReminderTest.inc" - "c:/testframework/VCXScheduledReminderTest.inc"
-; SCHEDULED DOWNLOAD
-"/epoc32/release/armv5/udeb/VCXScheduledDownloadTest.dll" - "!:/Sys/Bin/VCXScheduledDownloadTest.dll"
-"../../../videofeeds/server/tsrc/VCXScheduledDownloadTest/conf/VCXScheduledDownloadTest.cfg" - "c:/testframework/VCXScheduledDownloadTest.cfg"
-"../../../videofeeds/server/tsrc/VCXScheduledDownloadTest/conf/VCXScheduledDownload.inc" - "c:/testframework/VCXScheduledDownload.inc"
-"../../../videofeeds/server/tsrc/VCXScheduledDownloadTest/conf/VCXScheduledDownloadTestHelium.cfg" - "C:/TestFramework/VCXScheduledDownloadTestHelium.cfg"
-
-
; MEDIASETTINGSENGINE
"/epoc32/release/armv5/udeb/mpxmediasettingsenginetest.dll" - "!:/Sys/Bin/mpxmediasettingsenginetest.dll"
"../../../mediasettings/mediasettingsengine/tsrc/mediasettingsenginetest/conf/mpxmediasettingsenginetest.cfg" - "c:/testframework/mpxmediasettingsenginetest.cfg"
--- a/tsrc/testing/sis/make_engine_test_sis.cmd Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/testing/sis/make_engine_test_sis.cmd Tue Jan 26 12:00:59 2010 +0200
@@ -216,5 +216,5 @@
call del fusion_engine_tests.sis
call pushd \VideoApp_Domain
-call \VideoApp_Domain\videoplayer\tsrc\testing\tools\tsrpkgtool.pl -a
+call \VideoApp_Domain\videoplayer\tsrc\testing\tools\tsrpkgtool.pl -r
call popd
\ No newline at end of file
--- a/tsrc/testing/tools/copylogheaders.cmd Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/testing/tools/copylogheaders.cmd Tue Jan 26 12:00:59 2010 +0200
@@ -14,8 +14,8 @@
@rem Description:
@rem
-call pushd \VideoApp_Domain\videoplayer\tsrc\testing\tools\
-call copy ..\..\inc\mpxvideo_debug.h \VideoApp_Domain\videoplayer\inc\mpxvideo_debug.h
-call copy ..\..\inc\mpxvideo_debug.h \epoc32\include\domain\middleware\mpxvideo_debug.h
-call copy ..\..\inc\mpxlog.h \epoc32\include\domain\middleware\mpxlog.h
+call pushd \VideoApp_Domain\videoplayer\tsrc\testing\inc\
+call copy mpxvideo_debug.h \VideoApp_Domain\videoplayer\inc\mpxvideo_debug.h
+call copy mpxvideo_debug.h \epoc32\include\platform\mw
+call copy mpxlog.h \epoc32\include\platform\mw
call popd
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tsrc/testing/tools/setversion.pl Tue Jan 26 12:00:59 2010 +0200
@@ -0,0 +1,60 @@
+#
+# Copyright (c) 2007 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:
+#
+
+
+#------------------------------------------------------------------------------------
+# Includes
+#------------------------------------------------------------------------------------
+#use strict;
+use warnings;
+use FindBin; # for FindBin:Bin
+
+#------------------------------------------------------------------------------------
+# GLOBAL CODE
+#------------------------------------------------------------------------------------
+
+my $version = 10.1;
+my $file = "";
+
+while(scalar(@ARGV) >= 1)
+{
+ my $argument = shift(@ARGV);
+
+ if($argument eq "-v")
+ {
+ $version = shift(@ARGV);
+ }
+
+ if($argument eq "-f")
+ {
+ $file = shift(@ARGV);
+ }
+}
+
+open(FILE_HANDLE, $file) or die ("Could not read file '$file'\n");
+my @lines = <FILE_HANDLE>;
+close(FILE_HANDLE);
+
+foreach my $line ( @lines )
+ {
+ if( $line =~ /\/epoc32([^\"]+)\.dll/i )
+ {
+ my $filename = "/epoc32" . $1 . ".dll";
+ $filename =~ s/\//\\/g;
+ print $filename . " TO VERSION " . $version . "\n";
+ system("elftran $filename -version $version");
+ }
+ }
\ No newline at end of file
--- a/tsrc/testing/tools/test_build.cmd Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/testing/tools/test_build.cmd Tue Jan 26 12:00:59 2010 +0200
@@ -15,22 +15,30 @@
@rem
@echo off
+echo ----------------------------------------
+echo LOGGING HEADERS
+echo ----------------------------------------
+call \VideoApp_Domain\videoplayer\tsrc\testing\tools\copylogheaders.cmd
+
+echo ----------------------------------------
+echo ADD COMMENTS TO .PKG AND .INF
+echo ----------------------------------------
+call pushd \VideoApp_Domain\
+call \VideoApp_Domain\videoplayer\tsrc\testing\tools\tsrpkgtool.pl -a
+call popd
+
+echo ----------------------------------------
+echo CLEANUP
+echo ----------------------------------------
call pushd \VideoApp_Domain\videoplayer\tsrc\testing\tools
call test_clean.cmd
call popd
-call pushd \VideoApp_Domain
-
-echo ----------------------------------------
-echo COPY LOG HEADERS
-echo ----------------------------------------
-call \VideoApp_Domain\videoplayer\tsrc\testing\tools\copylogheaders.cmd
-
echo ----------------------------------------
echo BUILD VIDEOUTILS
echo ----------------------------------------
-call pushd videoutils\group
+call pushd \VideoApp_Domain\videoutils\group
call bldmake bldfiles
call abld build armv5 udeb -k
call abld build winscw udeb -k
@@ -40,7 +48,7 @@
echo BUILD VIDEO
echo ----------------------------------------
-call pushd video\group
+call pushd \VideoApp_Domain\videoplayer\group
call bldmake bldfiles
call abld build armv5 udeb -k
call abld build winscw udeb -k
@@ -50,7 +58,7 @@
echo BUILD VIDEOUTILS/TSRC
echo ----------------------------------------
-call pushd videoutils\tsrc\group
+call pushd \VideoApp_Domain\videoutils\tsrc\group
call bldmake bldfiles
call abld test build armv5 udeb -k
call abld test build winscw udeb -k
@@ -60,7 +68,7 @@
echo BUILD VIDEO/TSRC
echo ----------------------------------------
-call pushd video\tsrc\group
+call pushd \VideoApp_Domain\videoplayer\tsrc\group
call bldmake bldfiles
call abld test build armv5 udeb -k
call abld test build winscw udeb -k
@@ -70,14 +78,39 @@
echo CREATE VIDEOPLAYER SIS
echo ----------------------------------------
call pushd \VideoApp_Domain\videoplayer\videoplayerapp\mpxvideoplayer\sis
-call pushd \VideoApp_Domain\videoplayer\mediasettings\sis
-call attrib -r -a -s -h *.pkg
-call perl -pi.bak -e "s/urel/udeb/g" mediasettings.pkg
-call popd
-call attrib -r -a -s -h *.pkg
-call perl -pi.bak -e "s/urel/udeb/g" VideoPlayer.pkg
-call perl -pi.bak -e "s/urel/udeb/g" disable_mediaplayer.pkg
+call \VideoApp_Domain\videoplayer\tsrc\testing\tools\setversion.pl -f VideoPlayer.pkg
call make_videoplayer_sisx.bat
call popd
+echo ----------------------------------------
+echo BUILD VIDEOPLAYER UNIT TESTS
+echo ----------------------------------------
+
+call pushd videoplayer\videoplayback\videohelix\tsrc\ut_videohelixtest\group
+call bldmake bldfiles
+call abld test build
+call popd
+
+call pushd videoplayer\videoplayback\videoplaybackcontrols\tsrc\videoplaybackcontrols_test\group
+call bldmake bldfiles
+call abld test build
+call popd
+
+call pushd videoplayer\videoplayback\videoplaybackviews\tsrc\ut_userinputhandlertest\group
+call bldmake bldfiles
+call abld test build
+call popd
+
+call pushd videoplayer\videoplayerapp\mpxvideoplayer\tsrc\ut_mpxvideoplayertest\group
+call bldmake bldfiles
+call abld test build
+call popd
+
+call popd
+
+echo ----------------------------------------
+echo REMOVE COMMENTS FROM .PKG & .INF
+echo ----------------------------------------
+call pushd \VideoApp_Domain\
+call \VideoApp_Domain\videoplayer\tsrc\testing\tools\tsrpkgtool.pl -r
call popd
\ No newline at end of file
--- a/tsrc/testing/tools/test_clean.cmd Mon Jan 18 20:21:12 2010 +0200
+++ b/tsrc/testing/tools/test_clean.cmd Tue Jan 26 12:00:59 2010 +0200
@@ -25,6 +25,15 @@
popd
echo ----------------------------------------
+echo CLEAN VIDEOPLAYER
+echo ----------------------------------------
+
+pushd \VideoApp_Domain\videoplayer\group
+call bldmake bldfiles
+call abld reallyclean
+popd
+
+echo ----------------------------------------
echo CLEAN VIDEOUTILS/TSRC
echo ----------------------------------------
@@ -34,19 +43,34 @@
popd
echo ----------------------------------------
-echo CLEAN VIDEO
-echo ----------------------------------------
-
-pushd \VideoApp_Domain\videoplayer\group
-call bldmake bldfiles
-call abld reallyclean
-popd
-
-echo ----------------------------------------
-echo CLEAN VIDEO/TSRC
+echo CLEAN VIDEOPLAYER/TSRC
echo ----------------------------------------
pushd \VideoApp_Domain\videoplayer\tsrc\group
call bldmake bldfiles
call abld test reallyclean
popd
+
+echo ----------------------------------------
+echo CLEAN VIDEOPLAYER UNIT TESTS
+echo ----------------------------------------
+
+call pushd \VideoApp_Domain\videoplayer\videoplayback\videohelix\tsrc\ut_videohelixtest\group
+call bldmake bldfiles
+call abld test reallyclean
+call popd
+
+call pushd \VideoApp_Domain\videoplayer\videoplayback\videoplaybackcontrols\tsrc\videoplaybackcontrols_test\group
+call bldmake bldfiles
+call abld test reallyclean
+call popd
+
+call pushd \VideoApp_Domain\videoplayer\videoplayback\videoplaybackviews\tsrc\ut_userinputhandlertest\group
+call bldmake bldfiles
+call abld test reallyclean
+call popd
+
+call pushd \VideoApp_Domain\videoplayer\videoplayerapp\mpxvideoplayer\tsrc\ut_mpxvideoplayertest\group
+call bldmake bldfiles
+call abld test reallyclean
+call popd
\ No newline at end of file
--- a/videocollection/hgmyvideos/group/vcxhgmyvideos.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/hgmyvideos/group/vcxhgmyvideos.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: TB92_23 %
+// Version : %version: TB92_24 %
#include <platform_paths.hrh>
#include <bldvariant.hrh>
@@ -105,14 +105,14 @@
LIBRARY charconv.lib // CnvUtfConverter
LIBRARY etel.lib // RTelServer
LIBRARY etelmm.lib // RMobilePhone
-LIBRARY SecUi.lib // CSecurityHandler
+LIBRARY secui.lib // CSecurityHandler
LIBRARY mpxcommon.lib // MPX
LIBRARY mpxcollectionutility.lib // MPX
LIBRARY iptvutil.lib // Iptv Resource Loader
-LIBRARY CommonDialogs.lib // Memory selection dialog
+LIBRARY commondialogs.lib // Memory selection dialog
LIBRARY drmhelper.lib // DRM
-LIBRARY FeatMgr.lib // Feature manager
-LIBRARY ServiceHandler.lib // AIW Service Handler
+LIBRARY featmgr.lib // Feature manager
+LIBRARY servicehandler.lib // AIW Service Handler
LIBRARY centralrepository.lib // Upnp
LIBRARY thumbnailmanager.lib // CThumbnailManager
LIBRARY caf.lib // CAF
@@ -122,7 +122,7 @@
LIBRARY playbackhelper.lib // Recognizer
LIBRARY mpxplaybackutility.lib // MPX playback utility
LIBRARY mpxviewutility.lib
-LIBRARY MPFileDetailsDialog.lib
+LIBRARY mpfiledetailsdialog.lib
LIBRARY vcxviewmessageutility.lib // CVcxViewMessageUtility
LIBRARY upnpcommand.lib
LIBRARY ganes.lib // for HgList
--- a/videocollection/hgmyvideos/inc/vcxhgmyvideosmainview.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/hgmyvideos/inc/vcxhgmyvideosmainview.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 12 %
+// Version : %version: 14 %
#ifndef VCXHGMYVIDEOSMAINVIEW_H
#define VCXHGMYVIDEOSMAINVIEW_H
--- a/videocollection/hgmyvideos/src/vcxhgmyvideosmainview.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/hgmyvideos/src/vcxhgmyvideosmainview.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: TB92_30 %
+// Version : %version: TB92_33 %
// INCLUDE FILES
#include <bldvariant.hrh>
@@ -269,6 +269,7 @@
{
ActivateVideoListL( KErrNotFound ); // Try to activate old list.
}
+ UpdateLayout();
}
// -----------------------------------------------------------------------------
--- a/videocollection/hgmyvideos/src/vcxhgmyvideosvideomodelhandler.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/hgmyvideos/src/vcxhgmyvideosvideomodelhandler.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -1366,6 +1366,7 @@
if ( iVideoArray->VideoCount() > 0 )
{
+ iScroller.Reset();
iScroller.ResizeL( iVideoArray->VideoCount() );
TInt highlight( KErrNotFound );
--- a/videocollection/hgmyvideos/src/vcxhgtelephonyclient.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/hgmyvideos/src/vcxhgtelephonyclient.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -19,8 +19,8 @@
// INCLUDE FILES
#include <mmtsy_names.h>
-#include <SecUi.h>
-#include <SecUiSecurityHandler.h>
+#include <secui.h>
+#include <secuisecurityhandler.h>
#include "vcxhgtelephonyclient.h"
--- a/videocollection/mpxmyvideoscollection/download/inc/vcxmyvideosdownloadutil.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/download/inc/vcxmyvideosdownloadutil.h Tue Jan 26 12:00:59 2010 +0200
@@ -23,7 +23,7 @@
// INCLUDES
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
#include <mpxmedia.h>
#include <vcxmyvideosdefs.h>
#include <ipvideo/vcxconnutilengineobserver.h>
--- a/videocollection/mpxmyvideoscollection/group/vcxmyvideoscollectionplugin.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/group/vcxmyvideoscollectionplugin.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -72,10 +72,10 @@
LIBRARY flogger.lib
LIBRARY mdeclient.lib
LIBRARY efsrv.lib
-LIBRARY DownloadMgr.lib
+LIBRARY downloadmgr.lib
LIBRARY charconv.lib
LIBRARY vcxconnectionutility.lib
LIBRARY mediatorclient.lib
LIBRARY centralrepository.lib
LIBRARY drmutility.lib
-LIBRARY PlatformEnv.lib
\ No newline at end of file
+LIBRARY platformenv.lib
\ No newline at end of file
--- a/videocollection/mpxmyvideoscollection/inc/vcxmyvideosvideocache.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/inc/vcxmyvideosvideocache.h Tue Jan 26 12:00:59 2010 +0200
@@ -27,6 +27,7 @@
class CVcxMyVideosCollectionPlugin;
class CMPXMedia;
class CVcxMyVideosDownloadCache;
+class CRepository;
// CONSTANTS
@@ -361,6 +362,12 @@
* My Videos collection plugin, owner of this object.
*/
CVcxMyVideosCollectionPlugin& iCollection;
+
+ /**
+ * Provides access to the sorting order key in cenrep. Own.
+ */
+ CRepository* iCenRep;
+
};
#endif // VCXMYVIDEOSVIDEOCACHE_H
--- a/videocollection/mpxmyvideoscollection/src/vcxmyvideosvideocache.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/src/vcxmyvideosvideocache.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -68,6 +68,8 @@
delete iVideoList;
delete iDownloadCache;
+ delete iCenRep;
+
DeletePartialList();
}
@@ -1317,17 +1319,18 @@
//
TVcxMyVideosSortingOrder CVcxMyVideosVideoCache::SortingOrderL()
{
- TUid uid;
- uid.iUid = KVcxMyVideosCollectionCenrepUid;
- CRepository* cenRep = CRepository::NewL( uid );
- CleanupStack::PushL( cenRep ); // 1->
+
+ if( !iCenRep )
+ {
+ TUid uid;
+ uid.iUid = KVcxMyVideosCollectionCenrepUid;
+ iCenRep = CRepository::NewL( uid );
+ }
TInt sortingOrderInCenrep;
- TInt cenRepError = cenRep->Get( KVcxMyVideosCollectionCenrepKeySortingOrder,
+ TInt cenRepError = iCenRep->Get( KVcxMyVideosCollectionCenrepKeySortingOrder,
sortingOrderInCenrep );
-
- CleanupStack::PopAndDestroy( cenRep ); // <-1
TVcxMyVideosSortingOrder sortingOrder;
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXConsts.inc Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXConsts.inc Tue Jan 26 12:00:59 2010 +0200
@@ -13,3 +13,4 @@
EMULATOR_AP "Ethernet with Daemon Dynamic IP"
BAD_AP "BadIap" // CIptvTestUtilities::GetIapIdL returns AP that does not work
INVALID_AP "invalidiap" // CIptvTestUtilities::GetIapIdL returns invalid AP ID
+DEFAULT_AP "default" // used via CIptvTestUtilALR::GetDefaultIap
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestAttributes.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestAttributes.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -50,6 +50,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30400 <not a test> Setup
+var CASE ET30400
create VCXTestUtilModule Util
@@ -85,6 +86,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30401 KMPXMediaGeneralTitle modified by 3rd party
+var CASE ET30401
// Test case
@@ -123,6 +125,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30402 Update - attribute KMPXMediaGeneralTitle
+var CASE ET30402
// Setup case
@@ -179,6 +182,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30403 Update - attribute KMPXMediaGeneralUri
+var CASE ET30403
// Setup case
@@ -232,6 +236,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30404 Update - attribute KMPXMediaGeneralSize
+var CASE ET30404
// Setup case
@@ -286,6 +291,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30405 Update - attribute KMPXMediaGeneralDate
+var CASE ET30405
// Setup case
@@ -342,6 +348,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30406 Update - attribute KMPXMediaGeneralFlags
+var CASE ET30406
// Setup case
@@ -396,6 +403,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30407 Update - attribute KMPXMediaGeneralCopyright
+var CASE ET30407
// Setup case
@@ -450,6 +458,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30408 Update - attribute KMPXMediaGeneralMimeType
+var CASE ET30408
// Setup case
@@ -505,6 +514,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30409 Update - attribute KVcxMediaMyVideosModifiedDate
+var CASE ET30409
// Setup case
@@ -559,6 +569,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30410 Update - attribute KVcxMediaMyVideosAgeProfile
+var CASE ET30410
// Setup case
@@ -613,6 +624,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30411 Update - attribute KVcxMediaMyVideosAudioLanguage
+var CASE ET30411
// Setup case
@@ -667,6 +679,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30412 Update - attribute KVcxMediaMyVideosAuthor
+var CASE ET30412
// Setup case
@@ -721,6 +734,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30413 Update - attribute KVcxMediaMyVideosOrigin
+var CASE ET30413
// Setup case
@@ -785,6 +799,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30414 Update - attribute KVcxMediaMyVideosDuration
+var CASE ET30414
// Setup case
@@ -839,6 +854,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30415 Update - attribute KMPXMediaGeneralLastPlaybackPosition
+var CASE ET30415
// Setup case
@@ -893,6 +909,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30416 Update - attribute KVcxMediaMyVideosDownloadId
+var CASE ET30416
// Setup case
@@ -948,6 +965,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30434 Update - attribute KVcxMediaMyVideosAudioFourCc
+var CASE ET30434
// Setup case
@@ -1003,6 +1021,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30417 Update - All attributes, client closed between
+var CASE ET30417
// Setup case
@@ -1124,6 +1143,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30419 Update - partial update KMPXMediaGeneralTitle
+var CASE ET30419
// Setup case
@@ -1214,6 +1234,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30420 Update - partial update KMPXMediaGeneralUri
+var CASE ET30420
// Setup case
@@ -1305,6 +1326,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30421 Update - partial update KMPXMediaGeneralSize
+var CASE ET30421
// Setup case
@@ -1393,6 +1415,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30422 Update - partial update KMPXMediaGeneralDate
+var CASE ET30422
// Setup case
@@ -1483,6 +1506,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30423 Update - partial update KMPXMediaGeneralFlags
+var CASE ET30423
// Setup case
@@ -1570,6 +1594,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30424 Update - partial update KMPXMediaGeneralCopyright
+var CASE ET30424
// Setup case
@@ -1657,6 +1682,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30425 Update - partial update KMPXMediaGeneralMimeType
+var CASE ET30425
// Setup case
@@ -1748,6 +1774,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30426 Update - partial update KVcxMediaMyVideosModifiedDate
+var CASE ET30426
// Setup case
@@ -1837,6 +1864,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30427 Update - partial update KVcxMediaMyVideosAgeProfile
+var CASE ET30427
// Setup case
@@ -1926,6 +1954,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30428 Update - partial update KVcxMediaMyVideosAudioLanguage
+var CASE ET30428
// Setup case
@@ -2015,6 +2044,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30429 Update - partial update KVcxMediaMyVideosAuthor
+var CASE ET30429
// Setup case
@@ -2104,6 +2134,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30430 Update - partial update KVcxMediaMyVideosOrigin
+var CASE ET30430
// Setup case
@@ -2191,6 +2222,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30431 Update - partial update KVcxMediaMyVideosDuration
+var CASE ET30431
// Setup case
@@ -2280,6 +2312,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30432 Update - partial update KMPXMediaGeneralLastPlaybackPosition
+var CASE ET30432
// Setup case
@@ -2369,6 +2402,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30433 Update - partial update KVcxMediaMyVideosDownloadId
+var CASE ET30433
// Setup case
@@ -2458,6 +2492,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30435 Update - partial update KVcxMediaMyVideosAudioFourCc
+var CASE ET30435
// Setup case
@@ -2548,6 +2583,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30436 Create AC3 video, check audio attribute
+var CASE ET30436
// Setup case
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestBigFiles.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestBigFiles.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -131,9 +131,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
@@ -149,6 +148,7 @@
#------------------------------------------------------------------------------------
[Test]
title 001 <not a test> Setup
+var CASE 001
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -185,6 +185,7 @@
#------------------------------------------------------------------------------------
[Test]
title 002 Setup create video
+var CASE 002
callsub Cleanup
@@ -220,6 +221,7 @@
#------------------------------------------------------------------------------------
[Test]
title 003 Move from 2nd to 1st drive
+var CASE 003
// TESTCASE START
@@ -258,6 +260,7 @@
#------------------------------------------------------------------------------------
[Test]
title 005 Copy from 2nd to 1st drive
+var CASE 005
// TESTCASE START
@@ -296,6 +299,7 @@
#------------------------------------------------------------------------------------
[Test]
title 006 Delete video from 1st drive
+var CASE 006
// TESTCASE START
@@ -338,6 +342,7 @@
#------------------------------------------------------------------------------------
[Test]
title 007 Copy from 2nd to 1st drive
+var CASE 007
// TESTCASE START
@@ -375,6 +380,7 @@
#------------------------------------------------------------------------------------
[Test]
title 008 Delete video from 2nd drive
+var CASE 008
// TESTCASE START
@@ -415,6 +421,7 @@
#------------------------------------------------------------------------------------
[Test]
title 009 Setup create videos
+var CASE 009
callsub Cleanup
@@ -447,6 +454,7 @@
#------------------------------------------------------------------------------------
[Test]
title 010 Open Other videos - one big file
+var CASE 010
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -471,6 +479,7 @@
#------------------------------------------------------------------------------------
[Test]
title 011 Open All videos - one big file, 3 small
+var CASE 011
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -497,6 +506,7 @@
#------------------------------------------------------------------------------------
[Test]
title 012 All videos, Sorting by size
+var CASE 012
// TESTCASE START
@@ -552,6 +562,7 @@
#------------------------------------------------------------------------------------
[Test]
title 013 <not a test> Cleanup
+var CASE 013
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestDelete.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestDelete.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -38,8 +38,8 @@
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
@@ -54,11 +54,13 @@
#------------------------------------------------------------------------------------
[Test]
title ET30900 <not a test> Setup
+var CASE ET30900
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
Util CopyMethod "Internet" "Internet" "Internet"
+Util SetUsedDestination "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
delete Util
@@ -102,6 +104,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30909 Delete a media from 1st drive
+var CASE ET30909
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -123,7 +126,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video0 CASE .mp4"
VCXMV RefreshContents
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
@@ -150,6 +153,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30902 Delete a media from 2nd drive
+var CASE ET30902
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -171,7 +175,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideo3Gp E_DRIVE "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideo3Gp E_DRIVE "video0 CASE .mp4"
VCXMV RefreshContents
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
@@ -199,6 +203,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30903 Delete multiple medias
+var CASE ET30903
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -220,10 +225,10 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video.mp4" 50000 5
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video CASE .mp4" 50000 5
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideo3Gp E_DRIVE "video.mp4" 50000 5
+VCXMV CreateVideoFile IptvTestVideo3Gp E_DRIVE "video CASE .mp4" 50000 5
VCXMV CheckMediaCount C_DRIVE 5
VCXMV CheckMediaCount E_DRIVE 5
@@ -248,6 +253,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30904 Delete downloaded video
+var CASE ET30904
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -294,6 +300,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30905 Delete ongoing download
+var CASE ET30905
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -341,6 +348,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30906 Delete nothing
+var CASE ET30906
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -361,7 +369,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video 1 .mp4"
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video1 CASE .mp4"
VCXMV DeleteMedias C_DRIVE 1 0 E_DRIVE 0
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDeleteResp KVCXMYVideosTestMessageCommandComplete KVCXMYVideosTestMessageDeleteStarted
@@ -385,6 +393,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30907 Cancel delete
+var CASE ET30907
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -405,7 +414,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video.mp4" 50000 30
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video CASE .mp4" 50000 30
VCXMV SetQuietMode 1
@@ -438,6 +447,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30908 Cancel delete without request
+var CASE ET30908
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -474,6 +484,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30910 Delete, no array defined
+var CASE ET30910
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -494,7 +505,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video 1 .mp4"
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video1 CASE .mp4"
VCXMV DeleteMedias C_DRIVE -4 0 E_DRIVE 0
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDeleteResp KVCXMYVideosTestMessageCommandComplete KVCXMYVideosTestMessageDeleteStarted
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestDownload.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestDownload.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -37,8 +37,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
@@ -55,12 +55,15 @@
#------------------------------------------------------------------------------------
[Test]
title ET30100 <not a test> Setup
+var CASE ET30100
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
Util CreateMobilecrashWatcher
@@ -99,6 +102,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30101 Download video, 1st drive
+var CASE ET30101
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -117,7 +121,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -160,6 +164,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30102 Download 3 videos one by one, 2nd drive
+var CASE ET30102
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -180,15 +185,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 3 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 3 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 4 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 4 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -212,6 +217,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30103 Download and open downloads category
+var CASE ET30103
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -224,7 +230,7 @@
VCXMV Create
// Create one sideloaded video
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video CASE 0.mp4"
// Get list of videos
VCXMV OpenCollection VCXCollectionMyVideos
@@ -240,7 +246,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV // Dl started
@@ -284,6 +290,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30104 Cancel download
+var CASE ET30104
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -305,7 +312,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl started
@@ -337,6 +344,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30105 Pause download
+var CASE ET30105
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -358,7 +366,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Command complete
@@ -385,6 +393,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30111 Pause and resume download
+var CASE ET30111
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -406,7 +415,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -415,7 +424,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV // Dl paused
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -437,6 +446,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30112 Pause and open downloads category
+var CASE ET30112
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -458,7 +468,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Command complete
@@ -491,7 +501,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -515,6 +525,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30113 Cancel paused download
+var CASE ET30113
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -536,7 +547,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Command complete
@@ -567,6 +578,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30106 2 downloads same time
+var CASE ET30106
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -590,11 +602,11 @@
// Check that there's no other videos
VCXMV CheckMediaCount ANY_DRIVE 0
-VCXMV Download 3G_AP SERVICE_2 3 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 3 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV // Dl started
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV // Dl started
@@ -623,6 +635,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30109 Check progress of finished download
+var CASE ET30109
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -643,7 +656,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV
@@ -674,6 +687,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30110 Check progress of download
+var CASE ET30110
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -694,7 +708,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning KVCXMYVideosTestMessageDlProgressed KVCXMYVideosTestMessageDlProgressed KVCXMYVideosTestMessageDlProgressed
waittestclass VCXMV
@@ -716,6 +730,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30114 Pause, resume, check progress
+var CASE ET30114
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -736,7 +751,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -744,7 +759,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning KVCXMYVideosTestMessageDlProgressed KVCXMYVideosTestMessageDlProgressed
waittestclass VCXMV
@@ -765,6 +780,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30115 Details of downloaded video
+var CASE ET30115
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -785,7 +801,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -811,6 +827,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30116 Details of paused video
+var CASE ET30116
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -831,7 +848,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl starts
@@ -865,6 +882,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30117 Details of ongoing download
+var CASE ET30117
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -885,7 +903,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV // Dl complete
@@ -915,6 +933,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30120 Start download with full attributes
+var CASE ET30120
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -949,7 +968,7 @@
//VCXMV SetMediaDetail EVcxTestMapping_KVcxMediaMyVideosDuration 7 8
VCXMV SetMediaDetail EVcxTestMapping_KMPXMediaGeneralLastPlaybackPosition 9 10
-VCXMV DownloadUsingMedia 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUsingMedia DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 1MINUTE KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -1005,6 +1024,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30121 Download state in DB
+var CASE ET30121
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1026,7 +1046,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl started
@@ -1068,6 +1088,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30122 Download videos to 2 drives
+var CASE ET30122
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1088,14 +1109,14 @@
VCXMV SetPreferredMemory E_DRIVE
pause 2000
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Command complete
VCXMV SetPreferredMemory C_DRIVE
pause 2000
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
@@ -1119,6 +1140,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30123 Details by MPX ID of downloaded video
+var CASE ET30123
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1139,7 +1161,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -1161,6 +1183,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30124 Details by MPX ID of paused video
+var CASE ET30124
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1181,7 +1204,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl starts
@@ -1215,6 +1238,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30125 Details by MPX ID of ongoing download
+var CASE ET30125
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1235,7 +1259,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV // Dl complete
@@ -1266,6 +1290,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30126 Start download with full attributes, get details by MPX ID
+var CASE ET30126
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1300,7 +1325,7 @@
//VCXMV SetMediaDetail EVcxTestMapping_KVcxMediaMyVideosDuration 7 8
VCXMV SetMediaDetail EVcxTestMapping_KMPXMediaGeneralLastPlaybackPosition 9 10
-VCXMV DownloadUsingMedia 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUsingMedia DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 1MINUTE KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestDownload2.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestDownload2.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -53,10 +53,12 @@
#------------------------------------------------------------------------------------
[Test]
title ET30300 <not a test> Setup
+var CASE ET30300
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination DEFAULT_DEST
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
@@ -104,6 +106,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30301 2 downloads, same url
+var CASE ET30301
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -127,11 +130,11 @@
// Check that there's no other videos
VCXMV CheckMediaCount ANY_DRIVE 0
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 5MINUTES KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV // Dl started
-VCXMV Download 3G_AP SERVICE_2 19 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 19 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 5MINUTES KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV // Dl started
@@ -161,6 +164,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30302 Download, connection disconnects
+var CASE ET30302
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -183,17 +187,17 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl started
loop 3
-Util WaitForConnectionActivity 3G_AP
+Util WaitForConnectionActivity DEFAULT_AP
allowerrorcodes KERRTIMEDOUT
waittestclass Util
allowerrorcodes KERRNOTFOUND
allowerrorcodes KERRALREADYEXISTS
-Util Attach 3G_AP
+Util Attach DEFAULT_AP
allowerrorcodes KERRNOTREADY
Util Terminate
endloop
@@ -210,6 +214,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30303 Download, connection disconnects, resume
+var CASE ET30303
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -232,17 +237,17 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl started
loop 3
-Util WaitForConnectionActivity 3G_AP
+Util WaitForConnectionActivity DEFAULT_AP
allowerrorcodes KERRTIMEDOUT
waittestclass Util
allowerrorcodes KERRNOTFOUND
allowerrorcodes KERRALREADYEXISTS
-Util Attach 3G_AP
+Util Attach DEFAULT_AP
allowerrorcodes KERRNOTREADY
Util Terminate
endloop
@@ -251,7 +256,7 @@
VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KVcxMediaMyVideosDownloadState EVcxMyVideosDlStatePaused
-VCXMV ResumeDownload 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV
@@ -268,6 +273,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30304 Client deleted before DL completes.
+var CASE ET30304
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -288,7 +294,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl started
@@ -304,6 +310,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30305 Cancel finished download
+var CASE ET30305
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -325,7 +332,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -359,6 +366,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30306 Cancel download with invalid MPX ID
+var CASE ET30306
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -380,7 +388,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -423,6 +431,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30311 Cancel download with invalid download ID
+var CASE ET30311
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -444,7 +453,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -488,6 +497,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30307 Download with long url
+var CASE ET30307
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -508,7 +518,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP VCXMYVideosTest1kURL 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUrl DEFAULT_AP VCXMYVideosTest1kURL 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -533,6 +543,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30329 Download with long url 2
+var CASE ET30329
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -553,7 +564,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP VCXMYVideosTest2kURL 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUrl DEFAULT_AP VCXMYVideosTest2kURL 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allowerrorcodes KERRARGUMENT
//allowerrorcodes -7376
@@ -580,6 +591,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30308 Download invalid url
+var CASE ET30308
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -602,7 +614,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP "http:\/\/asdfsda" 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUrl DEFAULT_AP "http:\/\/asdfsda" 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult KVCXMYVideosTestMessageDlFailed
allownextresult EObjectNotFound
@@ -630,6 +642,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30309 Download empty url
+var CASE ET30309
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -652,7 +665,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP VCXTestZeroUrl 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUrl DEFAULT_AP VCXTestZeroUrl 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult KERRARGUMENT
allownextresult KERRABORT
@@ -679,6 +692,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30310 Download video, dest folder does not exist
+var CASE ET30310
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -704,7 +718,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -758,7 +772,7 @@
//waittestclass VCXMV // Dl complete
// Lets resume it with working AP
-//VCXMV ResumeDownload 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+//VCXMV ResumeDownload DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
//VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
//waittestclass VCXMV
@@ -784,6 +798,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30313 Download video with invalid IAP
+var CASE ET30313
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -812,7 +827,7 @@
waittestclass VCXMV // Dl complete
// Lets resume it with working AP
-VCXMV ResumeDownload 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 30SECONDS KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -833,6 +848,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30314 Download video wo username nor password
+var CASE ET30314
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -853,7 +869,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult EHttpAuthenticationFailed
waittestclass VCXMV // Dl complete
@@ -876,6 +892,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30315 Download video with invalid username
+var CASE ET30315
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -896,7 +913,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0 "xxx" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "xxx" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult EHttpAuthenticationFailed
waittestclass VCXMV // Dl complete
@@ -919,6 +936,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30316 Download video with invalid password
+var CASE ET30316
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -939,7 +957,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "xxx"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "xxx"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult EHttpAuthenticationFailed
waittestclass VCXMV // Dl complete
@@ -978,6 +996,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30317 Download 404
+var CASE ET30317
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -998,7 +1017,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP "http:\/\/193.65.182.78/asdfsdafasasdf.mp3" 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUrl DEFAULT_AP "http:\/\/193.65.182.78/asdfsdafasasdf.mp3" 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult EObjectNotFound
waittestclass VCXMV // Dl complete
@@ -1018,6 +1037,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30318 Download invalid server
+var CASE ET30318
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1038,7 +1058,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP "http:\/\/111.111.111.111/asdfsdafasasdf.mp3" 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUrl DEFAULT_AP "http:\/\/111.111.111.111/asdfsdafasasdf.mp3" 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allowerrorcodes EHttpUnhandled
allowerrorcodes -7376
@@ -1062,6 +1082,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30319 Download stream
+var CASE ET30319
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1082,7 +1103,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP "rtsp:\/\/193.65.182.100/rtpencoder/WTT_ch02.sdp" 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUrl DEFAULT_AP "rtsp:\/\/193.65.182.100/rtpencoder/WTT_ch02.sdp" 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allowerrorcodes KVCXMYVideosTestErrorDownloadNotFound
allowerrorcodes -7376
@@ -1105,6 +1126,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30320 Pause paused download
+var CASE ET30320
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1126,7 +1148,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Command complete
@@ -1140,7 +1162,7 @@
//VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlPaused
//waittestclass VCXMV // Dl paused
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -1161,6 +1183,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30321 Pause finished download ( non existing )
+var CASE ET30321
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1182,7 +1205,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV
@@ -1208,6 +1231,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30323 Resume running download
+var CASE ET30323
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1229,11 +1253,11 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -1254,6 +1278,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30324 Resume with different IAP
+var CASE ET30324
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1284,7 +1309,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV // Dl paused
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -1305,6 +1330,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30325 Resume without username nor password
+var CASE ET30325
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1326,7 +1352,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -1335,7 +1361,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV // Dl paused
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult EHttpAuthenticationFailed
waittestclass VCXMV // Dl complete
@@ -1357,6 +1383,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30326 Resume with invalid username and password
+var CASE ET30326
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1378,7 +1405,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -1387,7 +1414,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV // Dl paused
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "xxx" "xxxx"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "xxx" "xxxx"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult EHttpAuthenticationFailed
waittestclass VCXMV // Dl complete
@@ -1409,6 +1436,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30327 Resume non existing download
+var CASE ET30327
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1429,7 +1457,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV
@@ -1450,6 +1478,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30328 Two downloads same time with same URL
+var CASE ET30328
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1471,12 +1500,12 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 19 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 19 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 5MINUTES KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -1500,6 +1529,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30330 Ranged download, non pausable file
+var CASE ET30330
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1518,7 +1548,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP "http:\/\/waplabdc.nokia-boston.com/browser/users/drm1.0/CD/CD_kulkurin_iltakalja.dm" 0
+VCXMV DownloadUrl DEFAULT_AP "http:\/\/waplabdc.nokia-boston.com/browser/users/drm1.0/CD/CD_kulkurin_iltakalja.dm" 0
// Wait download to start.
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestFullMemory.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestFullMemory.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -37,8 +37,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
@@ -55,12 +55,15 @@
#------------------------------------------------------------------------------------
[Test]
title ET30600 <not a test> Setup
+var CASE ET30600
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
Util CreateMobilecrashWatcher
@@ -99,6 +102,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30615 Download video to full 1st memory
+var CASE ET30615
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -122,7 +126,7 @@
Util SetDriveFreeSpace C_DRIVE FREESPACE_1MB
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult KERRDISKFULL
allownextresult EDiskFull
@@ -146,6 +150,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30602 Download video to full 2nd memory
+var CASE ET30602
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -169,7 +174,7 @@
Util SetDriveFreeSpace E_DRIVE FREESPACE_1MB
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult KERRDISKFULL
allownextresult EDiskFull
@@ -207,6 +212,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30603 Details for failed DL on Full memory
+var CASE ET30603
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -229,7 +235,7 @@
Util SetDriveFreeSpace E_DRIVE_FORCED FREESPACE_100KB
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult KERRDISKFULL
allownextresult EDiskFull
@@ -254,6 +260,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30604 Full memory DL fails, free space and resume
+var CASE ET30604
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -276,7 +283,7 @@
Util SetDriveFreeSpace E_DRIVE_FORCED FREESPACE_1MB
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allowerrorcodes KERRDISKFULL
allowerrorcodes EDiskFull
@@ -286,7 +293,7 @@
Util SetDriveFreeSpace E_DRIVE_FORCED FREESPACE_10MB
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -307,6 +314,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30605 Start download and fill memory
+var CASE ET30605
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -329,7 +337,7 @@
Util SetDriveFreeSpace E_DRIVE_FORCED FREESPACE_10MB
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -356,6 +364,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30606 Download paused, fill memory and resume
+var CASE ET30606
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -376,7 +385,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -387,7 +396,7 @@
Util SetDriveFreeSpace E_DRIVE_FORCED FREESPACE_100KB
-VCXMV ResumeDownload 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult KERRDISKFULL
allownextresult EDiskFull
@@ -410,6 +419,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30607 Download paused, fill memory and cancel
+var CASE ET30607
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -432,7 +442,7 @@
Util SetDriveFreeSpace E_DRIVE_FORCED FREESPACE_10MB
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -465,6 +475,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30608 Not enough space for 4 downloads
+var CASE ET30608
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -487,19 +498,19 @@
Util SetDriveFreeSpace E_DRIVE_FORCED FREESPACE_10MB
-VCXMV Download 3G_AP SERVICE_2 3 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 3 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 4 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 4 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 5 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 5 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 6 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 6 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -525,6 +536,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30609 Move to full memory
+var CASE ET30609
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -546,7 +558,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE_FORCED "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE_FORCED "video0 CASE .mp4"
VCXMV CheckMediaCount C_DRIVE_FORCED 1
VCXMV CheckMediaCount E_DRIVE_FORCED 0
@@ -575,6 +587,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30610 Move from full memory
+var CASE ET30610
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -596,7 +609,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideoMpeg4 E_DRIVE_FORCED "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 E_DRIVE_FORCED "video0 CASE .mp4"
VCXMV CheckMediaCount C_DRIVE_FORCED 0
VCXMV CheckMediaCount E_DRIVE_FORCED 1
@@ -621,6 +634,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30611 Copy to full memory
+var CASE ET30611
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -642,7 +656,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE_FORCED "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE_FORCED "video0 CASE .mp4"
VCXMV CheckMediaCount C_DRIVE_FORCED 1
VCXMV CheckMediaCount E_DRIVE_FORCED 0
@@ -671,6 +685,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30612 Copy from full memory
+var CASE ET30612
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -692,7 +707,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideoMpeg4 E_DRIVE_FORCED "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 E_DRIVE_FORCED "video0 CASE .mp4"
VCXMV CheckMediaCount C_DRIVE_FORCED 0
VCXMV CheckMediaCount E_DRIVE_FORCED 1
@@ -719,6 +734,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30613 Move multiple to full memory
+var CASE ET30613
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -740,7 +756,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE_FORCED "video.mp4" 50000 10
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE_FORCED "video CASE .mp4" 50000 10
VCXMV CheckMediaCount C_DRIVE_FORCED 10
VCXMV CheckMediaCount E_DRIVE_FORCED 0
@@ -775,6 +791,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30614 Copy multiple to full memory
+var CASE ET30614
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -796,7 +813,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE_FORCED "video.mp4" 50000 10
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE_FORCED "video CASE .mp4" 50000 10
VCXMV CheckMediaCount C_DRIVE_FORCED 10
VCXMV CheckMediaCount E_DRIVE_FORCED 0
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestHelium.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestHelium.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -35,7 +35,9 @@
VCXMV RemoveAllMedia
delete VCXMV
-pause 2000
+
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
[Sub SetupVideos]
@@ -112,16 +114,21 @@
delete VCXMV
[EndSub]
+[Sub CreateVideo]
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video CASE .mp4"
+[EndSub]
[Test]
title ET30200 <not a test> Setup
+var CASE ET30200
create VCXTestUtilModule Util
-
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
create VCXTestUtilModule Util
@@ -157,6 +164,7 @@
[Test]
title ET30207 Sideload video while category is open.
+var CASE ET30207
callsub Cleanup
@@ -173,7 +181,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
+callsub CreateVideo
VCXMV CheckMediaCount ANY_DRIVE 1
VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralFlags EVcxMyVideosVideoNew
@@ -185,6 +193,7 @@
[Test]
title ET30208 Sideload video 1st drive
+var CASE ET30208
callsub Cleanup
@@ -193,7 +202,7 @@
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
+callsub CreateVideo
pause PAUSE_SIDELOAD
@@ -213,6 +222,7 @@
[Test]
title ET30209 Get sideloaded video details 1st drive
+var CASE ET30209
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -232,6 +242,7 @@
[Test]
title ET30210 Delete sideloaded video 1st drive
+var CASE ET30210
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -258,6 +269,7 @@
[Test]
title ET30214 Sideload multiple videos
+var CASE ET30214
callsub Cleanup
@@ -266,16 +278,16 @@
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video1.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video2.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video3.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video4.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video5.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video6.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video7.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video8.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video9.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video1 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video2 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video3 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video4 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video5 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video6 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video7 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video8 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video9 CASE .mp4"
pause PAUSE_SIDELOAD
@@ -294,6 +306,7 @@
[Test]
title ET30909 Delete a media from 1st drive
+var CASE ET30909
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -315,7 +328,7 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video0 CASE .mp4"
VCXMV RefreshContents
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
@@ -337,6 +350,7 @@
[Test]
title ET30903 Delete multiple medias
+var CASE ET30903
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -358,10 +372,10 @@
waittestclass VCXMV
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video.mp4" 50000 5
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video CASE .mp4" 50000 5
// Create sideloaded video
-VCXMV CreateVideoFile IptvTestVideo3Gp E_DRIVE "video.mp4" 50000 5
+VCXMV CreateVideoFile IptvTestVideo3Gp E_DRIVE "video CASE .mp4" 50000 5
VCXMV CheckMediaCount C_DRIVE 5
VCXMV CheckMediaCount E_DRIVE 5
@@ -381,6 +395,7 @@
[Test]
title ET30907 Cancel delete
+var CASE ET30907
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -401,7 +416,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video.mp4" 50000 30
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video CASE .mp4" 50000 30
VCXMV SetQuietMode 1
@@ -429,6 +444,7 @@
[Test]
title ET30701 Move from 1st to 2nd drive
+var CASE ET30701
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -468,6 +484,7 @@
[Test]
title ET30702 Check attributes of moved file
+var CASE ET30702
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -556,6 +573,7 @@
[Test]
title ET30707 Move multiple
+var CASE ET30707
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -595,6 +613,7 @@
[Test]
title ET30711 Cancel move
+var CASE ET30711
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -638,6 +657,7 @@
[Test]
title ET30751 Copy from 1st to 2nd drive
+var CASE ET30751
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -677,6 +697,7 @@
[Test]
title ET30752 Check attributes of copied file
+var CASE ET30752
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -764,6 +785,7 @@
[Test]
title ET30757 Copy multiple
+var CASE ET30757
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -808,6 +830,7 @@
[Test]
title ET30761 Cancel copy
+var CASE ET30761
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -855,11 +878,7 @@
[Test]
title ET30803 EVcxMyVideosAllVideos - EVcxMyVideosSortingCreationDate
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
+var CASE ET30803
// Check video sorting
@@ -890,11 +909,7 @@
[Test]
title ET30805 EVcxMyVideosAllVideos - EVcxMyVideosSortingName
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
+var CASE ET30805
// Check sorting
@@ -924,13 +939,7 @@
[Test]
title ET30806 EVcxMyVideosAllVideos - EVcxMyVideosSortingSize
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
-
-// Get videos sorted
+var CASE ET30806
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -958,6 +967,7 @@
[Test]
title ET30843 EVcxMyVideosDownloads - EVcxMyVideosSortingName, remove video
+var CASE ET30843
callsub Cleanup
@@ -1004,6 +1014,7 @@
[Test]
title ET30846 EVcxMyVideosDownloads - EVcxMyVideosSortingCreationDate, remove video
+var CASE ET30846
callsub Cleanup
@@ -1048,6 +1059,7 @@
[Test]
title ET30848 EVcxMyVideosDownloads - EVcxMyVideosSortingSize, remove video
+var CASE ET30848
callsub Cleanup
@@ -1092,6 +1104,7 @@
[Test]
title ET30879 EVcxMyVideosOther - EVcxMyVideosSortingName, modify video
+var CASE ET30879
callsub Cleanup
@@ -1157,6 +1170,7 @@
[Test]
title ET30884 EVcxMyVideosOther - EVcxMyVideosSortingName, sideload video
+var CASE ET30884
callsub Cleanup
@@ -1237,6 +1251,7 @@
[Test]
title ET30051 Setup all origins
+var CASE ET30051
callsub Cleanup
@@ -1391,6 +1406,7 @@
[Test]
title ET30046 All videos - category details
+var CASE ET30046
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -1412,6 +1428,7 @@
[Test]
title ET30047 Downloads - category details
+var CASE ET30047
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -1433,6 +1450,7 @@
[Test]
title ET30048 TV recordings - category details
+var CASE ET30048
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -1454,6 +1472,7 @@
[Test]
title ET30049 Captured videos - category details
+var CASE ET30049
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -1475,6 +1494,7 @@
[Test]
title ET30050 Other videos - category details
+var CASE ET30050
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -1496,6 +1516,7 @@
[Test]
title ET30023 Setup, DL 2, sideload 18
+var CASE ET30023
callsub Cleanup
@@ -1553,6 +1574,7 @@
[Test]
title ET30024 GetMediasByMpxId - All videos
+var CASE ET30024
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -1580,6 +1602,7 @@
[Test]
title ET30027 GetMediasByMpxId - Few from middle
+var CASE ET30027
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -1617,6 +1640,7 @@
[Test]
title ET30102 Download 3 videos one by one, 2nd drive
+var CASE ET30102
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1637,15 +1661,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 3 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 3 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 4 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 4 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -1663,6 +1687,7 @@
[Test]
title ET30103 Download and open downloads category
+var CASE ET30103
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1675,7 +1700,7 @@
VCXMV Create
// Create one sideloaded video
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video CASE 0.mp4"
// Get list of videos
VCXMV OpenCollection VCXCollectionMyVideos
@@ -1691,7 +1716,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV // Dl started
@@ -1729,6 +1754,7 @@
[Test]
title ET30104 Cancel download
+var CASE ET30104
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1750,7 +1776,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl started
@@ -1776,6 +1802,7 @@
[Test]
title ET30105 Pause download
+var CASE ET30105
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1797,7 +1824,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Command complete
@@ -1818,6 +1845,7 @@
[Test]
title ET30111 Pause and resume download
+var CASE ET30111
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1839,7 +1867,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -1848,7 +1876,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV // Dl paused
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
waittestclass VCXMV // Dl complete
@@ -1864,6 +1892,7 @@
[Test]
title ET30113 Cancel paused download
+var CASE ET30113
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1885,7 +1914,7 @@
waittestclass VCXMV
// Start download
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Command complete
@@ -1911,6 +1940,7 @@
[Test]
title ET30110 Check progress of download
+var CASE ET30110
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1931,7 +1961,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning KVCXMYVideosTestMessageDlProgressed KVCXMYVideosTestMessageDlProgressed KVCXMYVideosTestMessageDlProgressed
waittestclass VCXMV
@@ -1948,6 +1978,7 @@
[Test]
title ET30122 Download videos to 2 drives
+var CASE ET30122
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1968,14 +1999,14 @@
VCXMV SetPreferredMemory E_DRIVE
pause 2000
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Command complete
VCXMV SetPreferredMemory C_DRIVE
pause 2000
-VCXMV Download 3G_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_SMALLVIDEOS 1 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
@@ -2004,6 +2035,7 @@
[Test]
title ET30317 Download 404
+var CASE ET30317
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -2024,7 +2056,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV DownloadUrl 3G_AP "http:\/\/193.65.182.78/asdfsdafasasdf.mp3" 0 "mediacharger" "Buran_9o"
+VCXMV DownloadUrl DEFAULT_AP "http:\/\/193.65.182.78/asdfsdafasasdf.mp3" 0 "mediacharger" "Buran_9o"
VCXMV WaitForAnyMessage 5MINUTES KVCXMYVideosTestMessageDlSucceeded KVCXMYVideosTestMessageDlFailed KVCXMYVideosTestMessageDlGeneral
allownextresult EObjectNotFound
waittestclass VCXMV // Dl complete
@@ -2039,6 +2071,7 @@
[Test]
title ET30302 Download, connection disconnects
+var CASE ET30302
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -2061,17 +2094,17 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV // Dl started
loop 3
-Util WaitForConnectionActivity 3G_AP
+Util WaitForConnectionActivity DEFAULT_AP
allowerrorcodes KERRTIMEDOUT
waittestclass Util
allowerrorcodes KERRNOTFOUND
allowerrorcodes KERRALREADYEXISTS
-Util Attach 3G_AP
+Util Attach DEFAULT_AP
allowerrorcodes KERRNOTREADY
Util Terminate
endloop
@@ -2083,6 +2116,7 @@
[Test]
title ET30653 3 downloads, Cancel first download
+var CASE ET30653
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -2102,15 +2136,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -2134,6 +2168,7 @@
[Test]
title ET30658 3 downloads, Pause and resume second download
+var CASE ET30658
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -2153,15 +2188,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -2170,7 +2205,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
@@ -2187,6 +2222,7 @@
[Test]
title ET30661 3 downloads, pause 1st, cancel 2nd, wait 3rd, resume 1st
+var CASE ET30661
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -2206,15 +2242,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -2229,7 +2265,7 @@
VCXMV WaitAllDownloads
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestLists.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestLists.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -45,8 +45,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestMediator.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestMediator.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -37,8 +37,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
@@ -55,6 +55,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30550 <not a test> Setup
+var CASE ET30550
create VCXTestUtilModule Util
@@ -100,6 +101,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30551 Mediator events - Download video
+var CASE ET30551
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -148,6 +150,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30552 Mediator events - Cancel download
+var CASE ET30552
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -203,6 +206,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30553 Mediator events - Pause download
+var CASE ET30553
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -256,6 +260,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30554 Mediator events - Pause and resume download
+var CASE ET30554
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -315,6 +320,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30555 Mediator events - Cancel paused download
+var CASE ET30555
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -375,6 +381,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30556 Mediator events - Multiple downloads, cancel one
+var CASE ET30556
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -443,6 +450,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30558 Mediator events - Multiple downloads, pause and resume
+var CASE ET30558
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -517,6 +525,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30559 Mediator events - Multiple downloads, pause and cancel
+var CASE ET30559
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -588,6 +597,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30560 Mediator events - update new video flag
+var CASE ET30560
// Setup case
@@ -656,6 +666,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30561 Mediator events - video is deleted
+var CASE ET30561
// Setup case
@@ -709,6 +720,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30562 Mediator events - video is moved
+var CASE ET30562
// Setup case
@@ -749,6 +761,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30563 Mediator events - video is copied
+var CASE ET30563
// Setup case
@@ -791,6 +804,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30564 Mediator events - video is removed
+var CASE ET30564
// Setup case
@@ -844,6 +858,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30565 Mediator events - file of video is removed
+var CASE ET30565
// Setup case
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestMoveCopy.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestMoveCopy.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -37,8 +37,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
@@ -55,6 +55,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30700 <not a test> Setup
+var CASE ET30700
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
@@ -98,6 +99,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30701 Move from 1st to 2nd drive
+var CASE ET30701
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -143,6 +145,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30702 Check attributes of moved file
+var CASE ET30702
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -236,6 +239,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30703 Move back
+var CASE ET30703
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -271,6 +275,9 @@
VCXMV CheckMediaCount C_DRIVE 0
VCXMV CheckMediaCount E_DRIVE 1
+// File is locked, pause for a while
+pause 20000
+
// Move it back
VCXMV MoveMedia E_DRIVE 0 C_DRIVE 0
@@ -291,6 +298,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30704 Move, drive has already videos
+var CASE ET30704
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -336,6 +344,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30705 Move when file with same name exists
+var CASE ET30705
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -383,6 +392,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30706 Move from 2nd to 1st drive
+var CASE ET30706
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -428,6 +438,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30707 Move multiple
+var CASE ET30707
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -472,6 +483,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30708 Move downloaded video
+var CASE ET30708
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -520,6 +532,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30709 Move ongoing download
+var CASE ET30709
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -567,6 +580,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30710 Move nothing
+var CASE ET30710
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -608,6 +622,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30711 Cancel move
+var CASE ET30711
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -656,6 +671,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30713 Cancel move without request
+var CASE ET30713
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -692,6 +708,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30712 Move to same drive
+var CASE ET30712
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -735,6 +752,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30714 Move no array specified
+var CASE ET30714
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -777,6 +795,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30751 Copy from 1st to 2nd drive
+var CASE ET30751
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -822,6 +841,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30752 Check attributes of copied file
+var CASE ET30752
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -914,6 +934,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30753 Copy back
+var CASE ET30753
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -983,6 +1004,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30754 Copy, drive has already videos
+var CASE ET30754
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1039,6 +1061,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30755 Copy when file with same name exists
+var CASE ET30755
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1096,6 +1119,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30756 Copy from 2nd to 1st drive
+var CASE ET30756
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1150,6 +1174,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30757 Copy multiple
+var CASE ET30757
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1199,6 +1224,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30758 Copy downloaded video
+var CASE ET30758
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1254,6 +1280,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30759 Copy ongoing download
+var CASE ET30759
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1310,6 +1337,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30760 Copy nothing
+var CASE ET30760
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1357,6 +1385,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30761 Cancel copy
+var CASE ET30761
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1409,6 +1438,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30762 Cancel Copy without request
+var CASE ET30762
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1450,6 +1480,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30763 Copy to same drive
+var CASE ET30763
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1502,6 +1533,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30764 Copy no array specified
+var CASE ET30764
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestMultiDrives.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestMultiDrives.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -37,8 +37,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
@@ -53,12 +53,15 @@
#------------------------------------------------------------------------------------
[Test]
title ET30160 <not a test> Setup
-create VCXTestUtilModule Util
+var CASE ET30160
+create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
create VCXTestUtilModule Util
@@ -118,6 +121,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30161 Download video to F drive
+var CASE ET30161
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -163,6 +167,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30162 3 downloads to F drive
+var CASE ET30162
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -211,6 +216,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30163 Pause and resume download on F drive
+var CASE ET30163
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -263,6 +269,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30164 Download to E and F drives
+var CASE ET30164
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -318,6 +325,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30165 Download to E and F drives, cancel E
+var CASE ET30165
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -378,6 +386,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30167 Download to E and F drives, pause and resume E
+var CASE ET30167
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -442,6 +451,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30168 Download to E and F drives, pause and resume F
+var CASE ET30168
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -506,6 +516,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30169 Download to C
+var CASE ET30169
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -553,6 +564,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30170 Sideload to multiple drives one by one
+var CASE ET30170
callsub Cleanup
@@ -590,6 +602,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30171 Sideload to multiple drives
+var CASE ET30171
callsub Cleanup
@@ -627,6 +640,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30172 Copy from C to E
+var CASE ET30172
callsub Cleanup
@@ -663,6 +677,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30173 Copy from C to F
+var CASE ET30173
callsub Cleanup
@@ -699,6 +714,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30174 Copy from F to E
+var CASE ET30174
callsub Cleanup
@@ -735,6 +751,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30175 Copy from F to C
+var CASE ET30175
callsub Cleanup
@@ -771,6 +788,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30176 Move from C to E
+var CASE ET30176
callsub Cleanup
@@ -807,6 +825,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30177 Move from C to F
+var CASE ET30177
callsub Cleanup
@@ -843,6 +862,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30178 Move from F to E
+var CASE ET30178
callsub Cleanup
@@ -879,6 +899,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30179 Move from F to C
+var CASE ET30179
callsub Cleanup
@@ -915,6 +936,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30180 Move multiple from F
+var CASE ET30180
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -958,6 +980,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30181 Move multiple to F
+var CASE ET30181
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1001,6 +1024,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30182 Move from C and E to F
+var CASE ET30182
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1047,6 +1071,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30183 Move from C, E and F to F
+var CASE ET30183
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1095,6 +1120,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30184 Copy multiple from F
+var CASE ET30184
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1138,6 +1164,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30185 Copy multiple to F
+var CASE ET30185
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1181,6 +1208,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30186 Copy from C and E to F
+var CASE ET30186
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1227,6 +1255,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30187 Copy from C, E and F to F
+var CASE ET30187
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -1275,6 +1304,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30188 Delete from C, E and F
+var CASE ET30188
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestMultipleDls.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestMultipleDls.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -37,8 +37,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
@@ -53,12 +53,15 @@
#------------------------------------------------------------------------------------
[Test]
title ET30650 <not a test> Setup
+var CASE ET30650
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
create VCXTestUtilModule Util
@@ -99,6 +102,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30651 2 downloads, pause and cancel first
+var CASE ET30651
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -118,11 +122,11 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -156,6 +160,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30652 2 downloads, pause both, cancel and resume
+var CASE ET30652
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -175,11 +180,11 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -198,7 +203,7 @@
waittestclass VCXMV // Dl canceled
// Resume download
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -223,6 +228,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30653 3 downloads, Cancel first download
+var CASE ET30653
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -242,15 +248,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -279,6 +285,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30654 3 downloads, Cancel second download
+var CASE ET30654
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -298,15 +305,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
//VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
//waittestclass VCXMV
@@ -335,6 +342,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30655 3 downloads, Cancel last download
+var CASE ET30655
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -354,15 +362,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -391,6 +399,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30656 3 downloads, Cancel all
+var CASE ET30656
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -410,15 +419,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -454,6 +463,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30657 3 downloads, Pause and resume first download
+var CASE ET30657
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -473,15 +483,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -490,7 +500,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
@@ -513,6 +523,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30658 3 downloads, Pause and resume second download
+var CASE ET30658
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -532,15 +543,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -549,7 +560,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
@@ -571,6 +582,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30659 3 downloads, Pause and resume last download
+var CASE ET30659
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -590,15 +602,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -607,7 +619,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
@@ -629,6 +641,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30660 3 downloads, Pause and resume all
+var CASE ET30660
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -648,15 +661,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 3 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 3 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -675,13 +688,13 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete KVCXMYVideosTestMessageDlPaused
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 3 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 3 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
-VCXMV ResumeDownload 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
VCXMV WaitAllDownloads
@@ -706,6 +719,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30661 3 downloads, pause 1st, cancel 2nd, wait 3rd, resume 1st
+var CASE ET30661
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -725,15 +739,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -748,7 +762,7 @@
VCXMV WaitAllDownloads
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
@@ -771,6 +785,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30662 3 downloads, cancel 1st, pause 3rd, wait 2nd, resume 3rd
+var CASE ET30662
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -790,15 +805,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -813,7 +828,7 @@
VCXMV WaitAllDownloads
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -838,6 +853,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30663 3 downloads, pause 2nd, cancel 3rd, wait 1st, resume 2nd
+var CASE ET30663
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -857,15 +873,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV
@@ -880,7 +896,7 @@
VCXMV WaitAllDownloads
waittestclass VCXMV
-VCXMV ResumeDownload 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV ResumeDownload DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitAllDownloads
waittestclass VCXMV
@@ -903,6 +919,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30664 3 downloads, pause 2nd, cancel 3rd, wait 1st, resume 2nd
+var CASE ET30664
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -922,15 +939,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 2 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageDlRunning
waittestclass VCXMV
@@ -966,6 +983,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30665 3 downloads, cancel 1st, pause 3rd, wait 2nd, cancel 3rd
+var CASE ET30665
create VCXTestUtilModule Util
Util CreateMobilecrashWatcher
@@ -985,15 +1003,15 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 20 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 1 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV
-VCXMV Download 3G_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
+VCXMV Download DEFAULT_AP SERVICE_2 0 0 "mediacharger" "Buran_9o"
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCommandComplete
waittestclass VCXMV
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestRobustness.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestRobustness.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -42,8 +42,8 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
@@ -84,9 +84,11 @@
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
print OK!
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestSideload.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestSideload.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -37,12 +37,20 @@
VCXMV RemoveAllMedia
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#************************************************************************************
+#************************************************************************************
+# Sub CreateVideo
+# Create a single video file with case id attached in the filename
+#************************************************************************************
+[Sub CreateVideo]
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video CASE .mp4"
+[EndSub]
+
#------------------------------------------------------------------------------------
#
# Does configuration for cases in this script.
@@ -54,13 +62,15 @@
#------------------------------------------------------------------------------------
[Test]
title ET30200 <not a test> Setup
+var CASE ET30200
create VCXTestUtilModule Util
-
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
create VCXTestUtilModule Util
@@ -102,6 +112,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30207 Sideload video while category is open.
+var CASE ET30207
callsub Cleanup
@@ -118,7 +129,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
+callsub CreateVideo
VCXMV CheckMediaCount ANY_DRIVE 1
VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralFlags EVcxMyVideosVideoNew
@@ -136,6 +147,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30208 Sideload video 1st drive
+var CASE ET30208
callsub Cleanup
@@ -144,7 +156,7 @@
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
+callsub CreateVideo
pause PAUSE_SIDELOAD
@@ -170,6 +182,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30209 Get sideloaded video details 1st drive
+var CASE ET30209
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -195,6 +208,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30210 Delete sideloaded video 1st drive
+var CASE ET30210
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -226,6 +240,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30211 Sideload video 2nd drive
+var CASE ET30211
callsub Cleanup
@@ -234,7 +249,7 @@
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
-VCXMV CreateVideoFile IptvTestVideoMpeg4 E_DRIVE "video0.mp4"
+callsub CreateVideo
pause PAUSE_SIDELOAD
@@ -258,6 +273,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30212 Get sideloaded video details 2nd drive
+var CASE ET30212
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -283,6 +299,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30213 Delete sideloaded video 2nd drive
+var CASE ET30213
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -315,6 +332,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30214 Sideload multiple videos
+var CASE ET30214
callsub Cleanup
@@ -323,16 +341,16 @@
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video1.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video2.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video3.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video4.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video5.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video6.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video7.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video8.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video9.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video1 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video2 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video3 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video4 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video5 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video6 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video7 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video8 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video9 CASE .mp4"
pause PAUSE_SIDELOAD
@@ -356,6 +374,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30215 Get sideloaded video details for all videos
+var CASE ET30215
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -383,6 +402,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30216 Delete multiple sideloaded videos
+var CASE ET30216
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -414,6 +434,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30217 Sideload videos to 1st and 2nd drive
+var CASE ET30217
callsub Cleanup
@@ -422,9 +443,9 @@
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video0 CASE .mp4"
pause 1000
-VCXMV CreateVideoFile IptvTestVideoMpeg4 E_DRIVE "video1.mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 E_DRIVE "video1 CASE .mp4"
pause PAUSE_SIDELOAD
@@ -448,6 +469,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30218 Delete sideloaded video from 1st and 2nd drive
+var CASE ET30218
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -480,6 +502,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30219 Sideload videos - different codecs
+var CASE ET30219
callsub Cleanup
@@ -488,15 +511,15 @@
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
-VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video1.3gp"
-VCXMV CreateVideoFile IptvTestVideo3Gp2 C_DRIVE "video2.3gp"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video3.mp4"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video4.m4v"
-VCXMV CreateVideoFile IptvTestVideoRealVideo C_DRIVE "video5.rm"
-VCXMV CreateVideoFile IptvTestVideoWmv C_DRIVE "video6.wmv"
-VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video7.mp4"
-VCXMV CreateVideoFile IptvTestVideoQuicktime C_DRIVE "video8.mp4"
-VCXMV CreateVideoFile IptvTestVideoAviAC3 C_DRIVE "video9.avi"
+VCXMV CreateVideoFile IptvTestVideo3Gp C_DRIVE "video1 CASE .3gp"
+VCXMV CreateVideoFile IptvTestVideo3Gp2 C_DRIVE "video2 CASE .3gp"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video3 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video4 CASE .m4v"
+VCXMV CreateVideoFile IptvTestVideoRealVideo C_DRIVE "video5 CASE .rm"
+VCXMV CreateVideoFile IptvTestVideoWmv C_DRIVE "video6 CASE .wmv"
+VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video7 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoQuicktime C_DRIVE "video8 CASE .mp4"
+VCXMV CreateVideoFile IptvTestVideoAviAC3 C_DRIVE "video9 CASE .avi"
//VCXMV CreateVideoFile IptvTestVideoMpeg4 C_DRIVE "video9.dcf" // Cannot be deleted so do not use.
// These are not supported.
@@ -517,7 +540,7 @@
VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
waittestclass VCXMV
-VCXMV CheckMediaCount ANY_DRIVE 8
+VCXMV CheckMediaCount ANY_DRIVE 9
print OK!
delete VCXMV
[Endtest]
@@ -529,6 +552,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30220 Get sideloaded video details - different codecs
+var CASE ET30220
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -556,6 +580,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30221 Delete sideloaded videos - different codecs
+var CASE ET30221
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -587,6 +612,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30222 Sideload videos - bad file extensions
+var CASE ET30222
callsub Cleanup
--- a/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestSorting.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestSorting.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -42,8 +42,8 @@
print Cleanup OK!
delete VCXMV
-print wait 3min
-pause 180000
+print wait 30sec
+pause 30000
print cleanup end
[EndSub]
#-----------------------------------------------------------------------------------
@@ -123,14 +123,17 @@
#
#------------------------------------------------------------------------------------
[Test]
-title ET30800 <not a test> Setup
+title ET30800 <not a test> Setup origin to downloaded
+var CASE ET30800
create VCXTestUtilModule Util
+Util SetUsedDestination "Internet"
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
create VCXTestUtilModule Util
@@ -145,6 +148,9 @@
callsub Cleanup
+var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
+callsub SetupVideos
+
Util CheckMobilecrashes
pause 1000
delete Util
@@ -157,11 +163,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30801 EVcxMyVideosAllVideos - EVcxMyVideosSortingNone
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
+var CASE ET30801
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -190,11 +192,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30802 EVcxMyVideosAllVideos - EVcxMyVideosSortingId
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
+var CASE ET30802
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -226,11 +224,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30803 EVcxMyVideosAllVideos - EVcxMyVideosSortingCreationDate
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
+var CASE ET30803
// Check video sorting
@@ -266,11 +260,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30804 EVcxMyVideosAllVideos - EVcxMyVideosSortingModified
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
+var CASE ET30804
// Check order
@@ -306,11 +296,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30805 EVcxMyVideosAllVideos - EVcxMyVideosSortingName
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
+var CASE ET30805
// Check sorting
@@ -346,13 +332,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30806 EVcxMyVideosAllVideos - EVcxMyVideosSortingSize
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
-
-// Get videos sorted
+var CASE ET30806
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
@@ -380,20 +360,458 @@
#------------------------------------------------------------------------------------
#
+# Tests that video list is in correct order in category 'Downloads' when videos are sorted by nothing.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30831 EVcxMyVideosDownloads - EVcxMyVideosSortingNone
+var CASE ET30831
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+
+VCXMV SetSortingOrder EVcxMyVideosSortingNone
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosDownloads
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+// Check count. Order can be anything.
+VCXMV CheckMediaCount ANY_DRIVE 3
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Downloads' when videos are sorted by id.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30832 EVcxMyVideosDownloads - EVcxMyVideosSortingId
+var CASE ET30832
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingId
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosDownloads
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+// Check count and sort order
+VCXMV CheckMediaCount ANY_DRIVE 3
+VCXMV GetAllMediaFullDetails
+
+// SORTING ORDER NOT SUPPORTED
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Downloads' when videos are sorted by creation date.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30833 EVcxMyVideosDownloads - EVcxMyVideosSortingCreationDate
+var CASE ET30833
+
+// Check video sorting
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingCreationDate
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosDownloads
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+// Check count and sort order
+
+VCXMV CheckMediaCount ANY_DRIVE 3
+VCXMV GetAllMediaFullDetails
+
+VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "b"
+VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "a"
+VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "c"
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Downloads' when videos are sorted by modified date.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30834 EVcxMyVideosDownloads - EVcxMyVideosSortingModified
+var CASE ET30834
+
+// Check order
+
+// ORDER NOT SUPPORTED SO NO CHECKING!
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingModified
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosDownloads
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV GetAllMediaFullDetails
+
+//VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "b"
+//VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "c"
+//VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "e"
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Downloads' when videos are sorted by name.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30835 EVcxMyVideosDownloads - EVcxMyVideosSortingName
+var CASE ET30835
+
+// Check sorting
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingName
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosDownloads
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV CheckMediaCount ANY_DRIVE 3
+
+VCXMV GetAllMediaFullDetails
+
+VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "a"
+VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "b"
+VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "c"
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Downloads' when videos are sorted by size.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30836 EVcxMyVideosDownloads - EVcxMyVideosSortingSize
+var CASE ET30836
+
+// Get videos sorted
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingSize
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosDownloads
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV CheckMediaCount ANY_DRIVE 3
+
+VCXMV GetAllMediaFullDetails
+
+VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "a"
+VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "c"
+VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "b"
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+# Setup for other origin videos
+#------------------------------------------------------------------------------------
+[Test]
+title ET30899 <not a test> Setup origin to other
+var CASE ET30899
+
+create VCXTestUtilModule Util
+
+// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
+Util CopyMethod "Internet" "Internet" "Internet"
+// Disable connection dialog for "Internet" destination.
+Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
+delete Util
+
+create VCXTestUtilModule Util
+Util CreateMobilecrashWatcher
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+
+VCXMV SetPreferredMemory E_DRIVE
+VCXMV SetSortingOrder EVcxMyVideosSortingNone
+delete VCXMV
+
+callsub Cleanup
+
+var OPTION_ORIGIN EVcxMyVideosOriginOther
+callsub SetupVideos
+
+Util CheckMobilecrashes
+pause 1000
+delete Util
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Other' when videos are sorted by nothing.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30861 EVcxMyVideosOther - EVcxMyVideosSortingNone
+var CASE ET30861
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+
+VCXMV SetSortingOrder EVcxMyVideosSortingNone
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosOther
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+// Check count. Order can be anything.
+VCXMV CheckMediaCount ANY_DRIVE 3
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Other' when videos are sorted by ID.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30862 EVcxMyVideosOther - EVcxMyVideosSortingId
+var CASE ET30862
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingId
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosOther
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+// Check count and sort order
+VCXMV CheckMediaCount ANY_DRIVE 3
+VCXMV GetAllMediaFullDetails
+
+// SORTING ORDER NOT SUPPORTED
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Other' when videos are sorted by creation date.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30863 EVcxMyVideosOther - EVcxMyVideosSortingCreationDate
+var CASE ET30863
+
+// Check video sorting
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingCreationDate
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosOther
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+// Check count and sort order
+
+VCXMV CheckMediaCount ANY_DRIVE 3
+VCXMV GetAllMediaFullDetails
+
+VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "b"
+VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "a"
+VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "c"
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Other' when videos are sorted by modified date.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30864 EVcxMyVideosOther - EVcxMyVideosSortingModified
+var CASE ET30864
+
+// Check order
+
+// ORDER NOT SUPPORTED SO NO CHECKING!
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingModified
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosOther
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV GetAllMediaFullDetails
+
+//VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "b"
+//VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "c"
+//VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "e"
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Other' when videos are sorted by name.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30865 EVcxMyVideosOther - EVcxMyVideosSortingName
+var CASE ET30865
+
+// Check sorting
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingName
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosOther
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV CheckMediaCount ANY_DRIVE 3
+
+VCXMV GetAllMediaFullDetails
+
+VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "a"
+VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "b"
+VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "c"
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
+# Tests that video list is in correct order in category 'Other' when videos are sorted by size.
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET30866 EVcxMyVideosOther - EVcxMyVideosSortingSize
+var CASE ET30866
+
+// Get videos sorted
+
+create VCXMyVideosCollectionPluginTest VCXMV
+VCXMV Create
+VCXMV SetSortingOrder EVcxMyVideosSortingSize
+
+VCXMV OpenCollection VCXCollectionMyVideos
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV OpenLevel EVcxMyVideosOther
+VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
+waittestclass VCXMV
+
+VCXMV CheckMediaCount ANY_DRIVE 3
+
+VCXMV GetAllMediaFullDetails
+
+VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "a"
+VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "c"
+VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "b"
+
+print OK!
+delete VCXMV
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
# Tests that video list is in correct order in category 'All videos' when video is removed
# and videos are sorted by name.
#
#------------------------------------------------------------------------------------
[Test]
title ET30813 EVcxMyVideosAllVideos - EVcxMyVideosSortingName, remove video
+var CASE ET30813
callsub Cleanup
var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
callsub SetupVideos
-// Get videos sorted
-
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
VCXMV SetSortingOrder EVcxMyVideosSortingName
@@ -438,14 +856,13 @@
#------------------------------------------------------------------------------------
[Test]
title ET30814 EVcxMyVideosAllVideos - EVcxMyVideosSortingNone, remove video
+var CASE ET30814
callsub Cleanup
var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
callsub SetupVideos
-// Get videos sorted
-
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
VCXMV SetSortingOrder EVcxMyVideosSortingNone
@@ -482,14 +899,13 @@
#------------------------------------------------------------------------------------
[Test]
title ET30815 EVcxMyVideosAllVideos - EVcxMyVideosSortingId, remove video
+var CASE ET30815
callsub Cleanup
var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
callsub SetupVideos
-// Get videos sorted
-
create VCXMyVideosCollectionPluginTest VCXMV
VCXMV Create
VCXMV SetSortingOrder EVcxMyVideosSortingId
@@ -533,6 +949,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30816 EVcxMyVideosAllVideos - EVcxMyVideosSortingCreationDate, remove video
+var CASE ET30816
callsub Cleanup
@@ -583,6 +1000,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30817 EVcxMyVideosAllVideos - EVcxMyVideosSortingModified, remove video
+var CASE ET30817
callsub Cleanup
@@ -635,6 +1053,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30818 EVcxMyVideosAllVideos - EVcxMyVideosSortingSize, remove video
+var CASE ET30818
callsub Cleanup
@@ -685,6 +1104,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30819 EVcxMyVideosAllVideos - EVcxMyVideosSortingName, modify video
+var CASE ET30819
callsub Cleanup
@@ -756,6 +1176,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30820 EVcxMyVideosAllVideos - EVcxMyVideosSortingNone, modify video
+var CASE ET30820
callsub Cleanup
@@ -813,6 +1234,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30821 EVcxMyVideosAllVideos - EVcxMyVideosSortingId, modify video
+var CASE ET30821
callsub Cleanup
@@ -878,6 +1300,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30822 EVcxMyVideosAllVideos - EVcxMyVideosSortingModified, modify video
+var CASE ET30822
callsub Cleanup
@@ -931,6 +1354,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30823 EVcxMyVideosAllVideos - EVcxMyVideosSortingSize, modify video
+var CASE ET30823
callsub Cleanup
@@ -1006,6 +1430,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30824 EVcxMyVideosAllVideos - EVcxMyVideosSortingName, sideload video
+var CASE ET30824
callsub Cleanup
@@ -1074,6 +1499,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30825 EVcxMyVideosAllVideos - EVcxMyVideosSortingName, download video
+var CASE ET30825
callsub Cleanup
@@ -1137,231 +1563,6 @@
#------------------------------------------------------------------------------------
#
-# Tests that video list is in correct order in category 'Downloads' when videos are sorted by nothing.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30831 EVcxMyVideosDownloads - EVcxMyVideosSortingNone
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-
-VCXMV SetSortingOrder EVcxMyVideosSortingNone
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosDownloads
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-// Check count. Order can be anything.
-VCXMV CheckMediaCount ANY_DRIVE 3
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Downloads' when videos are sorted by id.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30832 EVcxMyVideosDownloads - EVcxMyVideosSortingId
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingId
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosDownloads
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-// Check count and sort order
-VCXMV CheckMediaCount ANY_DRIVE 3
-VCXMV GetAllMediaFullDetails
-
-// SORTING ORDER NOT SUPPORTED
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Downloads' when videos are sorted by creation date.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30833 EVcxMyVideosDownloads - EVcxMyVideosSortingCreationDate
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
-
-// Check video sorting
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingCreationDate
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosDownloads
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-// Check count and sort order
-
-VCXMV CheckMediaCount ANY_DRIVE 3
-VCXMV GetAllMediaFullDetails
-
-VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "b"
-VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "a"
-VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "c"
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Downloads' when videos are sorted by modified date.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30834 EVcxMyVideosDownloads - EVcxMyVideosSortingModified
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
-
-// Check order
-
-// ORDER NOT SUPPORTED SO NO CHECKING!
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingModified
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosDownloads
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV GetAllMediaFullDetails
-
-//VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "b"
-//VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "c"
-//VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "e"
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Downloads' when videos are sorted by name.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30835 EVcxMyVideosDownloads - EVcxMyVideosSortingName
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
-
-// Check sorting
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingName
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosDownloads
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV CheckMediaCount ANY_DRIVE 3
-
-VCXMV GetAllMediaFullDetails
-
-VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "a"
-VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "b"
-VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "c"
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Downloads' when videos are sorted by size.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30836 EVcxMyVideosDownloads - EVcxMyVideosSortingSize
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginDownloaded
-callsub SetupVideos
-
-// Get videos sorted
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingSize
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosDownloads
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV CheckMediaCount ANY_DRIVE 3
-
-VCXMV GetAllMediaFullDetails
-
-VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "a"
-VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "c"
-VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "b"
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
# Tests that video list is in correct order in category 'Downloads' when video is
# removed and videos are sorted by name.
#
@@ -1369,6 +1570,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30843 EVcxMyVideosDownloads - EVcxMyVideosSortingName, remove video
+var CASE ET30843
callsub Cleanup
@@ -1421,6 +1623,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30844 EVcxMyVideosDownloads - EVcxMyVideosSortingNone, remove video
+var CASE ET30844
callsub Cleanup
@@ -1465,6 +1668,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30845 EVcxMyVideosDownloads - EVcxMyVideosSortingId, remove video
+var CASE ET30845
callsub Cleanup
@@ -1517,6 +1721,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30846 EVcxMyVideosDownloads - EVcxMyVideosSortingCreationDate, remove video
+var CASE ET30846
callsub Cleanup
@@ -1567,6 +1772,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30847 EVcxMyVideosDownloads - EVcxMyVideosSortingModified, remove video
+var CASE ET30847
callsub Cleanup
@@ -1620,6 +1826,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30848 EVcxMyVideosDownloads - EVcxMyVideosSortingSize, remove video
+var CASE ET30848
callsub Cleanup
@@ -1670,6 +1877,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30849 EVcxMyVideosDownloads - EVcxMyVideosSortingName, modify video
+var CASE ET30849
callsub Cleanup
@@ -1741,6 +1949,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30850 EVcxMyVideosDownloads - EVcxMyVideosSortingNone, modify video
+var CASE ET30850
callsub Cleanup
@@ -1798,6 +2007,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30851 EVcxMyVideosDownloads - EVcxMyVideosSortingId, modify video
+var CASE ET30851
callsub Cleanup
@@ -1863,6 +2073,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30852 EVcxMyVideosDownloads - EVcxMyVideosSortingModified, modify video
+var CASE ET30852
callsub Cleanup
@@ -1916,6 +2127,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30853 EVcxMyVideosDownloads - EVcxMyVideosSortingSize, modify video
+var CASE ET30853
callsub Cleanup
@@ -1991,6 +2203,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30854 EVcxMyVideosDownloads - EVcxMyVideosSortingName, sideload video
+var CASE ET30854
callsub Cleanup
@@ -2092,6 +2305,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30855 EVcxMyVideosDownloads - EVcxMyVideosSortingName, download video
+var CASE ET30855
callsub Cleanup
@@ -2173,237 +2387,13 @@
#------------------------------------------------------------------------------------
#
-# Tests that video list is in correct order in category 'Other' when videos are sorted by nothing.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30861 EVcxMyVideosOther - EVcxMyVideosSortingNone
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginOther
-callsub SetupVideos
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-
-VCXMV SetSortingOrder EVcxMyVideosSortingNone
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosOther
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-// Check count. Order can be anything.
-VCXMV CheckMediaCount ANY_DRIVE 3
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Other' when videos are sorted by ID.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30862 EVcxMyVideosOther - EVcxMyVideosSortingId
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginOther
-callsub SetupVideos
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingId
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosOther
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-// Check count and sort order
-VCXMV CheckMediaCount ANY_DRIVE 3
-VCXMV GetAllMediaFullDetails
-
-// SORTING ORDER NOT SUPPORTED
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Other' when videos are sorted by creation date.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30863 EVcxMyVideosOther - EVcxMyVideosSortingCreationDate
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginOther
-callsub SetupVideos
-
-// Check video sorting
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingCreationDate
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosOther
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-// Check count and sort order
-
-VCXMV CheckMediaCount ANY_DRIVE 3
-VCXMV GetAllMediaFullDetails
-
-VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "b"
-VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "a"
-VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "c"
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Other' when videos are sorted by modified date.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30864 EVcxMyVideosOther - EVcxMyVideosSortingModified
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginOther
-callsub SetupVideos
-
-// Check order
-
-// ORDER NOT SUPPORTED SO NO CHECKING!
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingModified
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosOther
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV GetAllMediaFullDetails
-
-//VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "b"
-//VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "c"
-//VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "e"
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Other' when videos are sorted by name.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30865 EVcxMyVideosOther - EVcxMyVideosSortingName
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginOther
-callsub SetupVideos
-
-// Check sorting
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingName
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosOther
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV CheckMediaCount ANY_DRIVE 3
-
-VCXMV GetAllMediaFullDetails
-
-VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "a"
-VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "b"
-VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "c"
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Tests that video list is in correct order in category 'Other' when videos are sorted by size.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET30866 EVcxMyVideosOther - EVcxMyVideosSortingSize
-
-callsub Cleanup
-
-var OPTION_ORIGIN EVcxMyVideosOriginOther
-callsub SetupVideos
-
-// Get videos sorted
-
-create VCXMyVideosCollectionPluginTest VCXMV
-VCXMV Create
-VCXMV SetSortingOrder EVcxMyVideosSortingSize
-
-VCXMV OpenCollection VCXCollectionMyVideos
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV OpenLevel EVcxMyVideosOther
-VCXMV WaitForMessages 1MINUTE KVCXMYVideosTestMessageCollectionOpened
-waittestclass VCXMV
-
-VCXMV CheckMediaCount ANY_DRIVE 3
-
-VCXMV GetAllMediaFullDetails
-
-VCXMV CheckMediaDetail ANY_DRIVE 0 EVcxTestMapping_KMPXMediaGeneralTitle "a"
-VCXMV CheckMediaDetail ANY_DRIVE 1 EVcxTestMapping_KMPXMediaGeneralTitle "c"
-VCXMV CheckMediaDetail ANY_DRIVE 2 EVcxTestMapping_KMPXMediaGeneralTitle "b"
-
-print OK!
-delete VCXMV
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
# Tests that video list is in correct order in category 'Other' when video is removed
# and videos are sorted by name.
#
#------------------------------------------------------------------------------------
[Test]
title ET30873 EVcxMyVideosOther - EVcxMyVideosSortingName, remove video
+var CASE ET30873
callsub Cleanup
@@ -2456,6 +2446,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30874 EVcxMyVideosOther - EVcxMyVideosSortingNone, remove video
+var CASE ET30874
callsub Cleanup
@@ -2500,6 +2491,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30875 EVcxMyVideosOther - EVcxMyVideosSortingId, remove video
+var CASE ET30875
callsub Cleanup
@@ -2551,6 +2543,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30876 EVcxMyVideosOther - EVcxMyVideosSortingCreationDate, remove video
+var CASE ET30876
callsub Cleanup
@@ -2601,6 +2594,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30877 EVcxMyVideosOther - EVcxMyVideosSortingModified, remove video
+var CASE ET30877
callsub Cleanup
@@ -2653,6 +2647,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30878 EVcxMyVideosOther - EVcxMyVideosSortingSize, remove video
+var CASE ET30878
callsub Cleanup
@@ -2704,6 +2699,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30879 EVcxMyVideosOther - EVcxMyVideosSortingName, modify video
+var CASE ET30879
callsub Cleanup
@@ -2775,6 +2771,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30880 EVcxMyVideosOther - EVcxMyVideosSortingNone, modify video
+var CASE ET30880
callsub Cleanup
@@ -2832,6 +2829,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30881 EVcxMyVideosOther - EVcxMyVideosSortingId, modify video
+var CASE ET30881
callsub Cleanup
@@ -2897,6 +2895,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30882 EVcxMyVideosOther - EVcxMyVideosSortingModified, modify video
+var CASE ET30882
callsub Cleanup
@@ -2950,6 +2949,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30883 EVcxMyVideosOther - EVcxMyVideosSortingSize, modify video
+var CASE ET30883
callsub Cleanup
@@ -3026,6 +3026,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30884 EVcxMyVideosOther - EVcxMyVideosSortingName, sideload video
+var CASE ET30884
callsub Cleanup
@@ -3112,6 +3113,7 @@
#------------------------------------------------------------------------------------
[Test]
title ET30885 EVcxMyVideosOther - EVcxMyVideosSortingName, download video
+var CASE ET30885
callsub Cleanup
--- a/videofeeds/clientapi/group/IptvClientApi.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/clientapi/group/IptvClientApi.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -24,7 +24,7 @@
//OPTION ARMCC --asm --interleave
ALWAYS_BUILD_AS_ARM
-TARGET IptvClientApi.dll
+TARGET iptvclientapi.dll
TARGETTYPE dll
//0x1000008D is for static dll
UID 0x1000008D IPTV_CLIENT_API_UID
@@ -84,7 +84,7 @@
LIBRARY estor.lib
LIBRARY efsrv.lib
LIBRARY flogger.lib
-LIBRARY IptvUtil.lib
+LIBRARY iptvutil.lib
// Secure provisioning, ciptvsecureprovisioningparameters.cpp uses these
LIBRARY centralrepository.lib
--- a/videofeeds/hgvodui/group/vcxhgvodui.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/hgvodui/group/vcxhgvodui.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -69,7 +69,7 @@
LIBRARY avkon.lib
LIBRARY aknlayout.lib
LIBRARY aknlayout2scalable.lib
-LIBRARY AknSkins.lib
+LIBRARY aknskins.lib
LIBRARY browserlauncher.lib
LIBRARY commonengine.lib
LIBRARY cone.lib
@@ -86,7 +86,7 @@
LIBRARY flogger.lib
LIBRARY imcm.lib
LIBRARY inetprotutil.lib
-LIBRARY IptvUtil.lib
+LIBRARY iptvutil.lib
LIBRARY mpxviewutility.lib
LIBRARY vcxnsuiengine.lib
LIBRARY sendui.lib
--- a/videofeeds/hgvodui/src/vcxhgvodlistimplbase.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/hgvodui/src/vcxhgvodlistimplbase.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -18,8 +18,8 @@
#include <ganes/HgScroller.h>
#include <aknnotewrappers.h>
-#include <BrowserLauncher.h>
-#include <BrowserOverriddenSettings.h>
+#include <browserlauncher.h>
+#include <browseroverriddensettings.h>
#include "CIptvUtil.h"
#include <uriutils.h>
#include <StringLoader.h>
--- a/videofeeds/hgvodui/src/vcxhgvodmainview.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/hgvodui/src/vcxhgvodmainview.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -14,7 +14,7 @@
* Description: HG VOD Main view implementation*
*/
-// Version : %version: REL6_37 %
+// Version : %version: REL6_39 %
#include <aknview.h>
#include <aknViewAppUi.h>
--- a/videofeeds/hgvodui/src/vcxhgvodservicelistimpl.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/hgvodui/src/vcxhgvodservicelistimpl.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 19 %
+// Version : %version: 21 %
#include <akntitle.h>
#include <aknViewAppUi.h>
--- a/videofeeds/livetvutils/group/IptvLiveUtils.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/livetvutils/group/IptvLiveUtils.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -19,7 +19,7 @@
#include <platform_paths.hrh>
-TARGET LiveTvUtils.dll
+TARGET livetvutils.dll
TARGETTYPE dll
UID 0x1000008d 0x102750E6
@@ -57,7 +57,7 @@
LIBRARY fbscli.lib // CFbsBitmap
LIBRARY downloadmgr.lib // RHttpDownloadMgr
LIBRARY imageconversion.lib // CImageDecoder
-LIBRARY AknIcon.lib // AknIconUtils
+LIBRARY aknicon.lib // AknIconUtils
LIBRARY egul.lib // CGulIcon
LIBRARY aknskins.lib //AknsUtils
LIBRARY aknskinsrv.lib //AknsUtils
--- a/videofeeds/livetvutils/inc/CIptvDownload.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/livetvutils/inc/CIptvDownload.h Tue Jan 26 12:00:59 2010 +0200
@@ -21,7 +21,7 @@
// User includes
#include <e32std.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
#include "MIptvDownloadObserver.h"
#include "MIptvLiveUITimerObserver.h"
--- a/videofeeds/mrssplugin/group/IptvRssPlugin.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/mrssplugin/group/IptvRssPlugin.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -25,7 +25,7 @@
//OPTION ARMCC --asm --interleave
ALWAYS_BUILD_AS_ARM
-TARGET IptvRssPlugin.dll
+TARGET iptvrssplugin.dll
TARGETTYPE PLUGIN
UID 0x10009D8D KIptvRssPluginDllUid
@@ -60,12 +60,12 @@
LIBRARY euser.lib
LIBRARY ecom.lib
LIBRARY efsrv.lib
-LIBRARY XMLInterface.lib
+LIBRARY xmlinterface.lib
LIBRARY esock.lib
LIBRARY commdb.lib
LIBRARY centralrepository.lib
LIBRARY charconv.lib
LIBRARY iptvutil.lib
LIBRARY sysutil.lib
-LIBRARY IptvClientApi.lib
+LIBRARY iptvclientapi.lib
LIBRARY hash.lib
--- a/videofeeds/mrssplugin/inc/CIptvRssDownload.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/mrssplugin/inc/CIptvRssDownload.h Tue Jan 26 12:00:59 2010 +0200
@@ -22,7 +22,7 @@
#define CIPTVRSSDOWNLOAD_H
#include <e32std.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
#include "CIptvUtil.h"
#include "MIptvTimerObserver.h"
--- a/videofeeds/omaprovisioning/group/IptvOmaProvisioningAdapter.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/omaprovisioning/group/IptvOmaProvisioningAdapter.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -24,7 +24,7 @@
//OPTION ARMCC --asm --interleave
ALWAYS_BUILD_AS_ARM
-TARGET IptvOmaProvisioningAdapter.dll
+TARGET iptvomaprovisioningadapter.dll
TARGETTYPE PLUGIN
UID 0x10009D8D 0x10282430
@@ -55,9 +55,9 @@
SOURCE CIptvOmaProvisioningAdapterGroupProxy.cpp
LIBRARY euser.lib
-LIBRARY ProvisioningEngine.lib
+LIBRARY provisioningengine.lib
LIBRARY bafl.lib
-LIBRARY IptvClientApi.lib
+LIBRARY iptvclientapi.lib
LIBRARY flogger.lib
LIBRARY efsrv.lib
--- a/videofeeds/provisioningappui/group/IptvProvisioningApp.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/provisioningappui/group/IptvProvisioningApp.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -25,7 +25,7 @@
//OPTION ARMCC --asm --interleave
ALWAYS_BUILD_AS_ARM
-TARGET IptvProvisioningApp.exe
+TARGET iptvprovisioningapp.exe
TARGETTYPE exe
UID 0x0 0x10281F1A
TARGETPATH PROGRAMS_DIR
@@ -72,10 +72,10 @@
LIBRARY apgrfx.lib
LIBRARY efsrv.lib
LIBRARY bafl.lib
-LIBRARY IptvClientApi.lib
-LIBRARY IptvUtil.lib // CIptvIapList
-LIBRARY IptvProvisioningProcessor.lib
-LIBRARY CommonEngine.lib // for StringLoader
+LIBRARY iptvclientapi.lib
+LIBRARY iptvutil.lib // CIptvIapList
+LIBRARY iptvprovisioningprocessor.lib
+LIBRARY commonengine.lib // for StringLoader
LIBRARY ecom.lib // for REComSession
LIBRARY flogger.lib
--- a/videofeeds/provisioningprocessor/group/IptvProvisioningProcessor.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/provisioningprocessor/group/IptvProvisioningProcessor.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -23,10 +23,10 @@
//OPTION ARMCC --asm --interleave
ALWAYS_BUILD_AS_ARM
-TARGET IptvProvisioningProcessor.dll
+TARGET iptvprovisioningprocessor.dll
TARGETTYPE DLL
UID 0x101fdfae 0x10275125
-TARGETPATH SHARED_LIB_DIR
+TARGETPATH shared_lib_dir
CAPABILITY CAP_GENERAL_DLL
VENDORID VID_DEFAULT
--- a/videofeeds/provisioningrecognizer/group/IptvProvisioningRecognizer.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/provisioningrecognizer/group/IptvProvisioningRecognizer.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -23,7 +23,7 @@
//OPTION ARMCC --asm --interleave
ALWAYS_BUILD_AS_ARM
-TARGET IptvProvRec.dll
+TARGET iptvprovrec.dll
TARGETTYPE PLUGIN
UID 0x10009D8D 0x10275126
@@ -33,7 +33,7 @@
START RESOURCE 10275126.rss
#ifdef SYMBIAN_SECURE_ECOM
-TARGET IptvProvRec.rsc
+TARGET iptvprovrec.rsc
#endif
END
@@ -45,8 +45,8 @@
USERINCLUDE ../inc
APP_LAYER_SYSTEMINCLUDE
-LIBRARY EUSER.LIB
-LIBRARY APMIME.LIB
+LIBRARY euser.lib
+LIBRARY apmime.lib
// END OF FILE
--- a/videofeeds/scheduleddlplugin/group/iptvscheduleddownloadplugin.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/scheduleddlplugin/group/iptvscheduleddownloadplugin.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -64,9 +64,9 @@
LIBRARY profileeng.lib // CProfileChangeNotifyHandler
LIBRARY commdb.lib // CCommsDatabase, CCommsDbTableView
-LIBRARY CseSchedulerClient.lib // CCseScheduledProgram
-LIBRARY IptvClientApi.lib // IPTV Server
-LIBRARY IptvUtil.lib // CIptvUtil::ConnectionTypeL
+LIBRARY cseschedulerclient.lib // CCseScheduledProgram
+LIBRARY iptvclientapi.lib // IPTV Server
+LIBRARY iptvutil.lib // CIptvUtil::ConnectionTypeL
LIBRARY etel.lib // ETel functionalities
LIBRARY etelmm.lib // ETel functionalities
--- a/videofeeds/scheduleddlplugin/src/vcnsscheduleddownloadmpxclient.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/scheduleddlplugin/src/vcnsscheduleddownloadmpxclient.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -35,7 +35,7 @@
#include <vcxmyvideosuids.h>
#include <mpxcommandgeneraldefs.h>
#include <mpxcollectioncommanddefs.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
#include <mmf/common/mmfcontrollerpluginresolver.h>
#include "vcnsscheduleddownloadmpxclient.h"
--- a/videofeeds/server/group/IptvServer.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/group/IptvServer.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -24,7 +24,7 @@
//OPTION ARMCC --asm --interleave
ALWAYS_BUILD_AS_ARM
-TARGET IptvServer.exe
+TARGET iptvserver.exe
EPOCSTACKSIZE 0x5000
EPOCHEAPSIZE 0x1000 0x1000000
@@ -106,7 +106,7 @@
LIBRARY esock.lib
LIBRARY bafl.lib // for string pools
-LIBRARY InetProtUtil.lib // for UriParser
+LIBRARY inetprotutil.lib // for UriParser
LIBRARY http.lib // for HTTP Client API
LIBRARY ecom.lib // for HTTP Client API
@@ -115,26 +115,26 @@
LIBRARY smcm.lib
LIBRARY gsmu.lib
LIBRARY mtur.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
-LIBRARY IptvClientApi.lib
+LIBRARY iptvclientapi.lib
//database stuff
LIBRARY edbms.lib
LIBRARY estor.lib
-LIBRARY LiveTvUtils.lib
+LIBRARY livetvutils.lib
LIBRARY centralrepository.lib
-LIBRARY CenRepNotifHandler.lib
+LIBRARY cenrepnotifhandler.lib
LIBRARY flogger.lib
-LIBRARY IptvUtil.lib
+LIBRARY iptvutil.lib
LIBRARY commdb.lib
-LIBRARY FeatDiscovery.lib
-LIBRARY ConnMon.lib //RConnectionMonitor
+LIBRARY featdiscovery.lib
+LIBRARY connmon.lib //RConnectionMonitor
LIBRARY caf.lib // DRM checking
-LIBRARY IptvProvisioningProcessor.lib
+LIBRARY iptvprovisioningprocessor.lib
LIBRARY apgrfx.lib
LIBRARY apparc.lib
LIBRARY cone.lib
@@ -142,5 +142,5 @@
LIBRARY sysutil.lib
LIBRARY profileeng.lib
LIBRARY apmime.lib // TDataType
-LIBRARY CseSchedulerClient.lib // common scheduler engine
+LIBRARY cseschedulerclient.lib // common scheduler engine
LIBRARY cmmanager.lib
--- a/videofeeds/server/tsrc/VCXServiceManagementApiTest/conf/VCXConsts.inc Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXServiceManagementApiTest/conf/VCXConsts.inc Tue Jan 26 12:00:59 2010 +0200
@@ -15,3 +15,4 @@
EMULATOR_AP "Ethernet with Daemon Dynamic IP"
BAD_AP "BadIap" // CIptvTestUtilities::GetIapIdL returns AP that does not work
INVALID_AP "invalidiap" // CIptvTestUtilities::GetIapIdL returns invalid AP ID
+DEFAULT_AP "default" // used via CIptvTestUtilALR::GetDefaultIap
\ No newline at end of file
--- a/videofeeds/server/tsrc/VCXServiceManagementApiTest/conf/VCXServiceManagementApiTestSnapSelection.cfg Mon Jan 18 20:21:12 2010 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,325 +0,0 @@
-#***********************************************************************************
-#
-# STIF test script file for testing service management client API.
-#
-#***********************************************************************************
-
-[StifSettings]
-CapsModifier= IptvTestClientApiCapsMod.exe
-[EndStifSettings]
-
-[Define]
-INCLUDE c:\testframework\VCXConsts.inc
-INCLUDE c:\testframework\VCXDrives.inc
-INCLUDE c:\testframework\VCXServiceManagementApiTest.inc
-INCLUDE c:\testframework\epgenginetest.inc
-INCLUDE c:\testframework\VCXServiceUpdating.inc
-INCLUDE c:\testframework\VCXServiceNames.inc
-INCLUDE c:\testframework\VCXErrors.inc
-[Enddefine]
-
-#------------------------------------------------------------------------------------
-#
-# Setup service and internet destinations for tests.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08150 <not a test> Setup
-create VCXTestUtilModule Util
-allowerrorcodes -1
-Util DeleteDestination "testdest"
-pause 1000
-Util CreateDestination "testdest"
-Util CopyMethod 3G_AP "Method3G_1" "testdest"
-Util CopyMethod 3G_AP "Method3G_2" "testdest"
-Util CopyMethod WLAN_AP "MethodWlan_1" "testdest"
-Util CopyMethod WLAN_AP "MethodWlan_2" "testdest"
-Util SetMethodPriority "testdest" "Method3G_1" 0
-Util SetMethodPriority "testdest" "Method3G_2" 1
-Util SetMethodPriority "testdest" "MethodWlan_1" 2
-Util SetMethodPriority "testdest" "MethodWlan_2" 3
-Util SetUsedDestination "testdest"
-delete Util
-
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-IptvTest DeleteAllServices SYNC
-IptvTest AddHardCodedService SYNC SERVICE_0 3G_AP 2 WLAN_AP 2
-IptvTest Destroy
-delete IptvTest
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08151 Get used AP 3G
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-IptvTest GetUsedIap SYNC SERVICE_0 "Method3G_1"
-IptvTest Destroy
-delete IptvTest
-
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08152 Get used AP WLAN
-create VCXTestUtilModule Util
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-allownextresult KERRCORRUPT
-IptvTest GetUsedIap SYNC SERVICE_0 "MethodWlan_1"
-IptvTest Destroy
-delete IptvTest
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08153 Priorize 3G and Get used AP
-create VCXTestUtilModule Util
-Util SetMethodPriority "testdest" "Method3G_1" 1
-Util SetMethodPriority "testdest" "Method3G_2" 0
-
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-IptvTest GetUsedIap SYNC SERVICE_0 "Method3G_2"
-IptvTest Destroy
-delete IptvTest
-
-Util SetMethodPriority "testdest" "Method3G_1" 0
-Util SetMethodPriority "testdest" "Method3G_2" 1
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08154 Priorize Wlan and Get used AP
-create VCXTestUtilModule Util
-Util SetMethodPriority "testdest" "MethodWlan_1" 1
-Util SetMethodPriority "testdest" "MethodWlan_2" 0
-
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-IptvTest GetUsedIap SYNC SERVICE_0 "MethodWlan_2"
-IptvTest Destroy
-delete IptvTest
-
-Util SetMethodPriority "testdest" "MethodWlan_1" 0
-Util SetMethodPriority "testdest" "MethodWlan_2" 1
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08155 Connect via 3G AP
-create VCXTestUtilModule Util
-Util SetMethodPriority "testdest" "Method3G_1" 0
-Util SetMethodPriority "testdest" "Method3G_2" 1
-
-Util Connect 3G_AP
-waittestclass Util
-
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-IptvTest GetUsedIap SYNC SERVICE_0 "Method3G_1"
-IptvTest Destroy
-delete IptvTest
-
-Util Terminate
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08159 Connect via WLAN AP, Get used AP
-pause PAUSE
-create VCXTestUtilModule Util
-Util SetMethodPriority "testdest" "MethodWlan_1" 0
-Util SetMethodPriority "testdest" "MethodWlan_2" 1
-
-Util Connect WLAN_AP
-waittestclass Util
-
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-IptvTest GetUsedIap SYNC SERVICE_0 "MethodWlan_1"
-IptvTest Destroy
-delete IptvTest
-
-Util Terminate
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08157 Connect via 3G AP, add AP with prio 0
-pause PAUSE
-create VCXTestUtilModule Util
-Util SetMethodPriority "testdest" "Method3G_1" 0
-Util SetMethodPriority "testdest" "Method3G_2" 1
-Util SetMethodPriority "testdest" "MethodWlan_1" 2
-Util SetMethodPriority "testdest" "MethodWlan_2" 3
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-
-Util Connect 3G_AP
-waittestclass Util
-
-IptvTest GetUsedIap SYNC SERVICE_0 "Method3G_1"
-
-Util CopyMethod 3G_AP "Method3G_3" "testdest"
-Util SetMethodPriority "testdest" "Method3G_3" 0
-
-IptvTest GetUsedIap SYNC SERVICE_0 "Method3G_3"
-
-IptvTest Destroy
-delete IptvTest
-
-Util DeleteMethod "testdest" "Method3G_3"
-Util Terminate
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08158 Connect via 3G AP, delete AP
-create VCXTestUtilModule Util
-Util SetMethodPriority "testdest" "Method3G_1" 0
-Util SetMethodPriority "testdest" "Method3G_2" 1
-
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-
-Util Connect 3G_AP
-waittestclass Util
-
-IptvTest GetUsedIap SYNC SERVICE_0 "Method3G_1"
-Util DeleteMethod "testdest" "Method3G_1"
-IptvTest GetUsedIap SYNC SERVICE_0 "Method3G_2"
-IptvTest Destroy
-delete IptvTest
-
-Util Terminate
-Util CopyMethod 3G_AP "Method3G_1" "testdest"
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08161 Connect 3G AP, delete all APs, get used AP
-pause PAUSE
-create VCXTestUtilModule Util
-Util SetMethodPriority "testdest" "Method3G_1" 0
-Util SetMethodPriority "testdest" "Method3G_2" 1
-Util SetMethodPriority "testdest" "MethodWlan_1" 2
-Util SetMethodPriority "testdest" "MethodWlan_2" 3
-
-Util Connect 3G_AP
-waittestclass Util
-
-Util DeleteMethod "testdest" "Method3G_1"
-Util DeleteMethod "testdest" "Method3G_2"
-Util DeleteMethod "testdest" "MethodWlan_1"
-Util DeleteMethod "testdest" "MethodWlan_2"
-
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-allownextresult -6
-IptvTest GetUsedIap SYNC SERVICE_0 "Method3G_1"
-IptvTest Destroy
-delete IptvTest
-
-pause 2000
-Util CopyMethod 3G_AP "Method3G_1" "testdest"
-Util CopyMethod 3G_AP "Method3G_2" "testdest"
-Util CopyMethod WLAN_AP "MethodWlan_1" "testdest"
-Util CopyMethod WLAN_AP "MethodWlan_2" "testdest"
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Test Iap selection via SNAP in different situations.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08162 Connect via WLAN with empty AP list
-pause PAUSE
-create VCXTestUtilModule Util
-allownextresult KERRNOTFOUND
-Util DeleteDestination "tempdest"
-Util CreateDestination "tempdest"
-Util SetUsedDestination "tempdest"
-
-Util Connect WLAN_AP
-waittestclass Util
-
-create VCXServiceManagementApiTest IptvTest
-IptvTest Create
-allownextresult EGeneralError
-allownextresult -6
-allownextresult -20
-IptvTest GetUsedIap SYNC SERVICE_0 WLAN_AP
-IptvTest Destroy
-delete IptvTest
-
-Util Terminate
-pause 2000
-Util DeleteDestination "tempdest"
-delete Util
-[Endtest]
-
-#------------------------------------------------------------------------------------
-#
-# Delete temporary destinations used in tests.
-#
-#------------------------------------------------------------------------------------
-[Test]
-title ET08173 <not a test> Cleanup destinations
-pause 5000
-create VCXTestUtilModule Util
-allownextresult -1
-allownextresult 0
-Util DeleteDestination "tempdest"
-allownextresult -1
-allownextresult 0
-Util DeleteDestination "testdest"
-Util SetUsedDestination "Internet"
-delete Util
-[Endtest]
--- a/videofeeds/server/tsrc/VCXServiceManagementApiTest/group/VCXServiceManagementApiTest.pkg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXServiceManagementApiTest/group/VCXServiceManagementApiTest.pkg Tue Jan 26 12:00:59 2010 +0200
@@ -60,7 +60,6 @@
"../conf/VCXServiceManagementApiTestSync.cfg" - "c:/testframework/VCXServiceManagementApiTestSync.cfg"
"../conf/VCXServiceManagementApiTestAsync.cfg" - "c:/testframework/VCXServiceManagementApiTestAsync.cfg"
"../conf/VCXServiceManagementApiTestServiceCustom.cfg" - "c:/testframework/VCXServiceManagementApiTestServiceCustom.cfg"
-"../conf/VCXServiceManagementApiTestSnapSelection.cfg" - "c:/testframework/VCXServiceManagementApiTestSnapSelection.cfg"
"../conf/VCXServiceManagementApiTestSyncErrorHandling.cfg" - "c:/testframework/VCXServiceManagementApiTestSyncErrorHandling.cfg"
"../conf/VCXServiceManagementApiTestAsyncR3.cfg" - "c:/testframework/VCXServiceManagementApiTestAsyncR3.cfg"
"../conf/VCXServiceManagementApiTestStressAsync.cfg" - "c:/testframework/VCXServiceManagementApiTestStressAsync.cfg"
--- a/videofeeds/server/tsrc/VCXServiceManagementApiTest/group/bld.inf Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXServiceManagementApiTest/group/bld.inf Tue Jan 26 12:00:59 2010 +0200
@@ -23,7 +23,6 @@
PRJ_TESTEXPORTS
../conf/VCXServiceManagementApiTestAsync.cfg /epoc32/winscw/c/TestFramework/VCXServiceManagementApiTestAsync.cfg
../conf/VCXServiceManagementApiTestAsyncR3.cfg /epoc32/winscw/c/TestFramework/VCXServiceManagementApiTestAsyncR3.cfg
-../conf/VCXServiceManagementApiTestSnapSelection.cfg /epoc32/winscw/c/TestFramework/VCXServiceManagementApiTestSnapSelection.cfg
../conf/VCXServiceManagementApiTestStressAsync.cfg /epoc32/winscw/c/TestFramework/VCXServiceManagementApiTestStressAsync.cfg
../conf/VCXServiceManagementApiTestStressSync.cfg /epoc32/winscw/c/TestFramework/VCXServiceManagementApiTestStressSync.cfg
../conf/VCXServiceManagementApiTestSync.cfg /epoc32/winscw/c/TestFramework/VCXServiceManagementApiTestSync.cfg
--- a/videofeeds/server/tsrc/VCXServiceManagementApiTest/init/All/TestFramework.ini Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXServiceManagementApiTest/init/All/TestFramework.ini Tue Jan 26 12:00:59 2010 +0200
@@ -86,7 +86,6 @@
TestCaseFile= c:\TestFramework\VCXServiceManagementApiTestAsync.cfg
TestCaseFile= c:\TestFramework\VCXServiceManagementApiTestAsyncR3.cfg
TestCaseFile= c:\TestFramework\VCXServiceManagementApiTestServiceCustom.cfg
-TestCaseFile= c:\TestFramework\VCXServiceManagementApiTestSnapSelection.cfg
TestCaseFile= c:\TestFramework\VCXServiceManagementApiTestSyncErrorHandling.cfg
TestCaseFile= c:\TestFramework\VCXServiceManagementApiTestStressAsync.cfg
TestCaseFile= c:\TestFramework\VCXServiceManagementApiTestStressSync.cfg
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTest.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTest.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -27,10 +27,11 @@
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
Util CopyMethod "Internet" "Internet" "Internet"
-Util SetMethodPriority DEFAULT_DEST 3G_AP 0
-Util SetUsedDestination DEFAULT_DEST
+Util SetMethodPriority "Internet" 3G_AP 0
+Util SetUsedDestination "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -38,38 +39,49 @@
ServUtil Create
ServUtil DeleteAllServices SYNC
-ServUtil AddHardCodedService ASYNC SERVICE_0 3G_AP 1 0 // OOPS
-ServUtil AddHardCodedService ASYNC SERVICE_1 3G_AP 1 1 // NokiaVideos
-ServUtil AddHardCodedService ASYNC SERVICE_10 3G_AP 1 2 // NSeries
-ServUtil AddHardCodedService ASYNC SERVICE_2 3G_AP 1 3 // Rocketboom
-ServUtil AddHardCodedService ASYNC SERVICE_3 3G_AP 1 4 // YLE Mediasali
-ServUtil AddHardCodedService ASYNC SERVICE_4 3G_AP 1 5 // Kärppäkanava
-ServUtil AddHardCodedService ASYNC SERVICE_5 3G_AP 1 6 // Rocketboom5
-ServUtil AddHardCodedService ASYNC SERVICE_6 3G_AP 1 7 // OOPS6
-ServUtil AddHardCodedService ASYNC SERVICE_7 3G_AP 1 8 // NokiaVideos7
-ServUtil AddHardCodedService ASYNC SERVICE_8 3G_AP 1 9 // Rocketboom8
+ServUtil AddHardCodedService SYNC SERVICE_0 3G_AP 1 0 // OOPS
+ServUtil AddHardCodedService SYNC SERVICE_1 3G_AP 1 1 // NokiaVideos
+ServUtil AddHardCodedService SYNC SERVICE_10 3G_AP 1 2 // NSeries
+ServUtil AddHardCodedService SYNC SERVICE_2 3G_AP 1 3 // Rocketboom
+ServUtil AddHardCodedService SYNC SERVICE_3 3G_AP 1 4 // YLE Mediasali
+ServUtil AddHardCodedService SYNC SERVICE_4 3G_AP 1 5 // Kärppäkanava
+ServUtil AddHardCodedService SYNC SERVICE_5 3G_AP 1 6 // Rocketboom5
+ServUtil AddHardCodedService SYNC SERVICE_6 3G_AP 1 7 // OOPS6
+ServUtil AddHardCodedService SYNC SERVICE_7 3G_AP 1 8 // NokiaVideos7
+ServUtil AddHardCodedService SYNC SERVICE_8 3G_AP 1 9 // Rocketboom8
+
+ServUtil UpdateServiceField SYNC SERVICE_0 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_1 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_2 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_3 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_4 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_5 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_6 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_7 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_8 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_10 ESetIapList WLAN_AP 1 3G_AP 1
// EXTRA_SERVICE_9 is reserved for cases to change it's address at will
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/multiurl.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10 // OOPS9
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/multiurl.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_1
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/allmimetypes.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10 // OOPS9
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/allmimetypes.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_2
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/preview.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/preview.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_3
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/ecg_parental_control.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/ecg_parental_control.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_4
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/dvbtest/xmltv/xmltv_1day.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/dvbtest/xmltv/xmltv_1day.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_5
ServUtil GetServices SYNC 0 250
@@ -93,7 +105,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -116,7 +128,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11001
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
test Destroy
delete test
@@ -138,7 +150,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11002
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
test Destroy
delete test
@@ -160,7 +172,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11003
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 0 5
test Destroy
delete test
@@ -182,7 +194,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11004
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CategoryDetails 1
test Destroy
delete test
@@ -203,7 +215,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 0
test Destroy
delete test
@@ -225,7 +237,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11006
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 0
test Destroy
delete test
@@ -267,7 +279,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11029
@@ -290,7 +302,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -312,7 +324,7 @@
create VCXVodContentApiTest test
test Create SERVICE_1
test EnableVerifying ET11008
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
test Verify ET11008
test Destroy
@@ -334,7 +346,7 @@
create VCXVodContentApiTest test
test Create SERVICE_1
test EnableVerifying ET11009
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
test Verify ET11009
test Destroy
@@ -356,7 +368,7 @@
create VCXVodContentApiTest test
test Create SERVICE_1
test EnableVerifying ET11010
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 0 5
test Verify ET11010
test Destroy
@@ -378,7 +390,7 @@
create VCXVodContentApiTest test
test Create SERVICE_1
test EnableVerifying ET11011
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CategoryDetails 1
test Verify ET11011
test Destroy
@@ -399,7 +411,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 0
test Destroy
delete test
@@ -420,7 +432,7 @@
create VCXVodContentApiTest test
test Create SERVICE_1
test EnableVerifying ET11013
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 0
test Verify ET11013
test Destroy
@@ -441,7 +453,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test VerifyAllCategoryContent 0
@@ -463,7 +475,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -484,7 +496,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
test Destroy
delete test
@@ -505,7 +517,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
test EnableVerifying ET11016
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test VerifyAllCategoryContent 0
test Verify ET11016
test Destroy
@@ -526,7 +538,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EnableVerifying ET11017
test GetEcgList 1 "Amazing Spaces - Adam" 0 10
test GetEcgList 3 "Nokia B" 0 10
@@ -551,7 +563,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
test EnableVerifying ET11018
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
test Destroy
delete test
@@ -572,7 +584,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
test EnableVerifying ET11019
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 0 50
test Destroy
delete test
@@ -592,7 +604,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "Amazing Spaces - Adam" 0 10
test EcgEcgAllList "Nokia B" 0 10
test EcgEcgAllList "Wedding" 0 10
@@ -614,7 +626,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CategoryDetails 1
test Destroy
delete test
@@ -634,7 +646,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 0
test Destroy
delete test
@@ -654,7 +666,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 0
test Destroy
delete test
@@ -674,7 +686,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 5 2
test Destroy
delete test
@@ -694,7 +706,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 15 3
test Destroy
delete test
@@ -714,7 +726,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 500 10
test Destroy
delete test
@@ -734,7 +746,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -756,7 +768,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
pause 100
test SetSpecialAction EIgnoreUpdateNotStarted
@@ -784,7 +796,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
Util WaitForConnectionActivity 3G_AP
waittestclass Util
@@ -807,7 +819,7 @@
pause 2000
create VCXVodContentApiTest test
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -819,7 +831,7 @@
Util CreateMobilecrashWatcher
create VCXVodContentApiTest test
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
Util WaitForConnectionActivity 3G_AP
waittestclass Util
@@ -845,7 +857,7 @@
test DeleteEpgDb
test Create SERVICE_0
test GetUpdateTime // database is empty
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test GetUpdateTime 1
@@ -876,7 +888,7 @@
test Create SERVICE_0
pause 2000
test EnableVerifying ET11034-1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// ECG is updated with old address
test UpdateEcg
SMUtil UpdateServiceField ASYNC SERVICE_0 EAddress "http:\/\/193.65.182.78/nseries.xml"
@@ -891,7 +903,7 @@
test Create SERVICE_0
test EnableVerifying ET11034-2
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// try again, this time ECG is updated with new address
test UpdateEcg
waittestclass test
@@ -925,7 +937,7 @@
create VCXVodContentApiTest test
test Create SERVICE_9
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -953,7 +965,7 @@
#create VCXVodContentApiTest test
#test Create SERVICE_9
-#test SelectIap 3G_AP
+#test SelectIap DEFAULT_AP
#allownextresult -4 // too long url, 256 is maximum
#test UpdateEcg
#test Destroy
@@ -979,7 +991,7 @@
#
#create VCXVodContentApiTest test
#test Create SERVICE_9
-#test SelectIap 3G_AP
+#test SelectIap DEFAULT_AP
#test UpdateEcg
#waittestclass test
#test EnableVerifying ET11040
@@ -1004,7 +1016,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_3
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11042
@@ -1029,7 +1041,7 @@
create VCXVodContentApiTest test
test SetParentalControlAge 0
test Create EXTRA_SERVICE_4
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11043
@@ -1053,7 +1065,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
allownextresult KIptvRssParserError
waittestclass test
@@ -1071,6 +1083,7 @@
[Test]
title ET11046 UpdateEcg SERVICE_0 WLAN
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -1095,12 +1108,45 @@
#------------------------------------------------------------------------------------
#
+# Check that updating ecg works
+#
+#------------------------------------------------------------------------------------
+[Test]
+title ET11060 UpdateEcg SERVICE_0 default IAP
+create VCXTestUtilModule Util
+Util CreateMobilecrashWatcher
+pause PAUSE
+create VCXVodContentApiTest test
+test EnableThumbnails
+test DeleteEpgDb
+test Create SERVICE_0
+test SelectIap DEFAULT_AP
+test UpdateEcg
+waittestclass test
+test Destroy
+delete test
+Util CheckMobilecrashes
+delete Util
+[Endtest]
+
+#------------------------------------------------------------------------------------
+#
# Setup services in service database and delete the EPG db.
#
# CaseClass: core
#------------------------------------------------------------------------------------
[Test]
title <not a test> Setup services
+create VCXTestUtilModule Util
+// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util CopyMethod "Internet" "Internet" "Internet"
+Util SetMethodPriority "Internet" 3G_AP 0
+Util SetUsedDestination "Internet"
+// Disable connection dialog for "Internet" destination.
+Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
+delete Util
+
pause PAUSE
create VCXServiceManagementApiTest SMUtil
SMUtil Create
@@ -1133,7 +1179,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// This launches automatic update.
test GetEcgList 1 "" 0 10
@@ -1186,7 +1232,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// Right after update
test UpdateEcg
@@ -1218,7 +1264,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
@@ -1243,13 +1289,14 @@
[Test]
title ET11052 Last update failed - Is update needed
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// Update succeeds
test UpdateEcg
@@ -1300,7 +1347,7 @@
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test SetMsgWhichToSignal KIptvVodUpdateStarted
test UpdateEcg
@@ -1364,7 +1411,7 @@
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test SetMsgWhichToSignal KIptvVodUpdateStarted
test UpdateEcg
@@ -1413,7 +1460,7 @@
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// Cancel update
test SetMsgWhichToSignal KIptvVodUpdateStarted
@@ -1473,7 +1520,7 @@
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// Cancel search
test Search Nokia
@@ -1534,7 +1581,7 @@
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// Cancel search
test Search Nokia
@@ -1581,7 +1628,7 @@
Util Connect 3G_AP
waittestclass Util
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test SetMsgWhichToSignal KIptvVodUpdateStarted
test UpdateEcg
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestCategoriesR3.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestCategoriesR3.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -32,6 +32,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -41,38 +42,47 @@
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_cat_unorganised.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_cat_and_channels.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_1st_channel_with_cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_2nd_channel_with_cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_6
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_20cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_7
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_20cat_and_3channels.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_8
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_21cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_9
ServUtil GetServices SYNC 0 250
@@ -97,7 +107,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11901
@@ -124,7 +134,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_2
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11902
@@ -151,7 +161,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_3
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11903
@@ -178,7 +188,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_4
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11904
@@ -204,7 +214,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11905
@@ -230,7 +240,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_6
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11906
@@ -256,7 +266,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_7
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11907
@@ -282,7 +292,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_8
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11908
@@ -308,7 +318,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_9
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11909
@@ -344,7 +354,7 @@
create VCXVodContentApiTest test
test SetParentalControlAge 0
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
@@ -381,7 +391,7 @@
create VCXVodContentApiTest test
test SetParentalControlAge 0
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
@@ -419,7 +429,7 @@
test SetParentalControlAge 0
test DisableThumbnails
test Create EXTRA_SERVICE_5 10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
@@ -457,7 +467,7 @@
test DisableThumbnails
test SetParentalControlAge 0
test Create EXTRA_SERVICE_5 10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
@@ -495,7 +505,7 @@
test SetParentalControlAge 0
test DisableThumbnails
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
@@ -533,7 +543,7 @@
test SetParentalControlAge 0
test DisableThumbnails
test Create EXTRA_SERVICE_5 10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
@@ -571,7 +581,7 @@
test SetParentalControlAge 0
test DisableThumbnails
test Create EXTRA_SERVICE_5 10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestDb.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestDb.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -30,6 +30,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -37,6 +38,7 @@
ServUtil Create
ServUtil DeleteAllServices SYNC
ServUtil AddHardCodedService ASYNC SERVICE_0 3G_AP 1 0 // OOPS
+ServUtil UpdateServiceField ASYNC SERVICE_0 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil Destroy
delete ServUtil
pause 3000
@@ -54,7 +56,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
waittestclass test
test GetEcgList 1 "" 0 10
@@ -76,7 +78,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
waittestclass test
test EcgCategoryList 0
@@ -98,7 +100,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 0 5
waittestclass test
test ContentDetailsList 0
@@ -120,7 +122,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// this starts ecg update
test CategoryDetails 1
waittestclass test
@@ -143,7 +145,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 0
waittestclass test
test ParentCategory 0
@@ -165,7 +167,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// this will start ecg update
test ContentDetailsList 0
waittestclass test
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestErrors.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestErrors.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -31,6 +31,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -38,27 +39,37 @@
IptvTest Create
IptvTest DeleteAllServices SYNC
-IptvTest AddHardCodedService ASYNC SERVICE_0 3G_AP 1 0
-IptvTest AddHardCodedService ASYNC SERVICE_1 3G_AP 1 1
-IptvTest AddHardCodedService ASYNC SERVICE_2 3G_AP 1 1
+IptvTest AddHardCodedService ASYNC SERVICE_0 3G_AP 1 0
+IptvTest UpdateServiceField ASYNC SERVICE_0 ESetIapList WLAN_AP 1 3G_AP 1
+
+IptvTest AddHardCodedService ASYNC SERVICE_1 3G_AP 1 1
+IptvTest UpdateServiceField ASYNC SERVICE_1 ESetIapList WLAN_AP 1 3G_AP 1
+
+IptvTest AddHardCodedService ASYNC SERVICE_2 3G_AP 1 1
+IptvTest UpdateServiceField ASYNC SERVICE_2 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest AddHardCodedService ASYNC SERVICE_10 3G_AP 1 3 // invalid service
+IptvTest UpdateServiceField ASYNC SERVICE_10 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest UpdateServiceField ASYNC SERVICE_10 EName SERVICE_INVALID_URL1
IptvTest UpdateServiceField ASYNC SERVICE_INVALID_URL1 EAddress "http:\/\/www.google.com/test123456789.xml"
IptvTest AddHardCodedService ASYNC SERVICE_10 3G_AP 1 4 // invalid service
+IptvTest UpdateServiceField ASYNC SERVICE_10 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest UpdateServiceField ASYNC SERVICE_10 EName SERVICE_INVALID_URL2
IptvTest UpdateServiceField ASYNC SERVICE_INVALID_URL2 EAddress "http:\/\/www.xxx12346567xxxabc.fi/test123456789.xml"
IptvTest AddHardCodedService ASYNC SERVICE_10 3G_AP 1 5 // invalid service
+IptvTest UpdateServiceField ASYNC SERVICE_10 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest UpdateServiceField ASYNC SERVICE_10 EName SERVICE_INVALID_PASSWORD
IptvTest UpdateServiceField ASYNC SERVICE_INVALID_PASSWORD EPassword "Invaliidipw"
IptvTest AddHardCodedService ASYNC SERVICE_10 3G_AP 1 6 // invalid service
+IptvTest UpdateServiceField ASYNC SERVICE_10 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest UpdateServiceField ASYNC SERVICE_10 EName SERVICE_INVALID_URL3
IptvTest UpdateServiceField ASYNC SERVICE_INVALID_URL3 EAddress "hXttp:\/\/www.kaatuilee.com/test123456789.xml"
IptvTest AddHardCodedService ASYNC SERVICE_10 3G_AP 1 2 // nseries
+IptvTest UpdateServiceField ASYNC SERVICE_10 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest GetServices 0 0 200
@@ -225,7 +236,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -284,7 +295,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 100 "" 0 10
test GetEcgList 0 "" 5 10
test GetEcgList 100 "" 10 1
@@ -307,7 +318,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 100
test Destroy
delete test
@@ -327,7 +338,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CategoryDetails 100
test Destroy
delete test
@@ -347,7 +358,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 100
test Destroy
delete test
@@ -367,7 +378,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 1000
test Destroy
delete test
@@ -405,7 +416,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_INVALID_URL1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
allownextresult EIptvDlContentNotFound
waittestclass test
@@ -427,7 +438,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_INVALID_URL2
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
//allownextresult EIptvDlGeneral
allownextresult EIptvDlContentNotFound
@@ -450,7 +461,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_INVALID_PASSWORD
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
allownextresult EIptvDlAuthFailed
waittestclass test
@@ -484,7 +495,7 @@
allownextresult EIptvDlConnectionFailed
waittestclass test
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test GetEcgList 1 "" 0 10
@@ -510,7 +521,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
test GetEcgList 1 "" 0 10
test Destroy
@@ -532,7 +543,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_INVALID_URL3
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
//allownextresult EIptvDlGeneral
@@ -563,11 +574,12 @@
IptvTest Create
IptvTest DeleteAllServices SYNC
IptvTest AddHardCodedService ASYNC SERVICE_1 3G_AP 1
+IptvTest UpdateServiceField ASYNC SERVICE_1 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest UpdateServiceField ASYNC SERVICE_1 EAddress "http:\/\/www.edcba/abcd.xml"
IptvTest UpdateServiceField ASYNC SERVICE_1 EName SERVICE_1
create VCXVodContentApiTest IptvVCTest
IptvVCTest Create SERVICE_1
-IptvVCTest SelectIap 3G_AP
+IptvVCTest SelectIap DEFAULT_AP
IptvVCTest UpdateEcg
allownextresult EIptvDlContentNotFound
waittestclass IptvVCTest
@@ -593,12 +605,13 @@
IptvTest Create
IptvTest DeleteAllServices SYNC
IptvTest AddHardCodedService ASYNC SERVICE_1 3G_AP 1
+IptvTest UpdateServiceField ASYNC SERVICE_1 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest UpdateServiceField ASYNC SERVICE_1 EAddress "http:\/\/193.65.182.78/oops.xml"
create VCXVodContentApiTest IptvVCTest
IptvVCTest Create SERVICE_1
-IptvVCTest SelectIap 3G_AP
+IptvVCTest SelectIap DEFAULT_AP
IptvVCTest UpdateEcg
waittestclass IptvVCTest
@@ -636,10 +649,11 @@
IptvTest Create
IptvTest DeleteAllServices SYNC
IptvTest AddHardCodedService ASYNC SERVICE_1 3G_AP 1
+IptvTest UpdateServiceField ASYNC SERVICE_1 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest UpdateServiceField ASYNC SERVICE_1 EAddress "http:\/\/193.65.182.78/nokia_vod/bar.JPG"
create VCXVodContentApiTest IptvVCTest
IptvVCTest Create SERVICE_1
-IptvVCTest SelectIap 3G_AP
+IptvVCTest SelectIap DEFAULT_AP
IptvVCTest UpdateEcg
allownextresult KIptvRssParserError
waittestclass IptvVCTest
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestHelium.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestHelium.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -28,10 +28,11 @@
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
Util CopyMethod "Internet" "Internet" "Internet"
-Util SetMethodPriority DEFAULT_DEST 3G_AP 0
-Util SetUsedDestination DEFAULT_DEST
+Util SetMethodPriority "Internet" 3G_AP 0
+Util SetUsedDestination "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -39,44 +40,55 @@
ServUtil Create
ServUtil DeleteAllServices SYNC
-ServUtil AddHardCodedService ASYNC SERVICE_0 3G_AP 1 0 // OOPS
-ServUtil AddHardCodedService ASYNC SERVICE_1 3G_AP 1 1 // NokiaVideos
-ServUtil AddHardCodedService ASYNC SERVICE_10 3G_AP 1 2 // NSeries
-ServUtil AddHardCodedService ASYNC SERVICE_2 3G_AP 1 3 // Rocketboom
-ServUtil AddHardCodedService ASYNC SERVICE_3 3G_AP 1 4 // YLE Mediasali
-ServUtil AddHardCodedService ASYNC SERVICE_4 3G_AP 1 5 // Kärppäkanava
-ServUtil AddHardCodedService ASYNC SERVICE_5 3G_AP 1 6 // Rocketboom5
-ServUtil AddHardCodedService ASYNC SERVICE_6 3G_AP 1 7 // OOPS6
-ServUtil AddHardCodedService ASYNC SERVICE_7 3G_AP 1 8 // NokiaVideos7
-ServUtil AddHardCodedService ASYNC SERVICE_8 3G_AP 1 9 // Rocketboom8
+ServUtil AddHardCodedService SYNC SERVICE_0 3G_AP 1 0 // OOPS
+ServUtil AddHardCodedService SYNC SERVICE_1 3G_AP 1 1 // NokiaVideos
+ServUtil AddHardCodedService SYNC SERVICE_10 3G_AP 1 2 // NSeries
+ServUtil AddHardCodedService SYNC SERVICE_2 3G_AP 1 3 // Rocketboom
+ServUtil AddHardCodedService SYNC SERVICE_3 3G_AP 1 4 // YLE Mediasali
+ServUtil AddHardCodedService SYNC SERVICE_4 3G_AP 1 5 // Kärppäkanava
+ServUtil AddHardCodedService SYNC SERVICE_5 3G_AP 1 6 // Rocketboom5
+ServUtil AddHardCodedService SYNC SERVICE_6 3G_AP 1 7 // OOPS6
+ServUtil AddHardCodedService SYNC SERVICE_7 3G_AP 1 8 // NokiaVideos7
+ServUtil AddHardCodedService SYNC SERVICE_8 3G_AP 1 9 // Rocketboom8
+
+ServUtil UpdateServiceField SYNC SERVICE_0 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_1 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_2 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_3 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_4 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_5 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_6 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_7 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_8 ESetIapList WLAN_AP 1 3G_AP 1
+ServUtil UpdateServiceField SYNC SERVICE_10 ESetIapList WLAN_AP 1 3G_AP 1
// EXTRA_SERVICE_9 is reserved for cases to change it's address at will
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/multiurl.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10 // OOPS9
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/multiurl.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_1
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/allmimetypes.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10 // OOPS9
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/allmimetypes.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_2
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/preview.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/preview.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_3
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/ecg_parental_control.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/ecg_parental_control.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_4
-ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
-ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/dvbtest/xmltv/xmltv_1day.xml"
-ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
+ServUtil AddHardCodedService SYNC SERVICE_9 3G_AP 1 10
+ServUtil UpdateServiceField SYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/dvbtest/xmltv/xmltv_1day.xml"
+ServUtil UpdateServiceField SYNC SERVICE_9 EName EXTRA_SERVICE_5
ServUtil GetServices SYNC 0 250
ServUtil Destroy
delete ServUtil
-pause 3000
+pause 30000
[Endtest]
[Test]
@@ -88,7 +100,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -105,7 +117,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11001
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
test Destroy
delete test
@@ -121,7 +133,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11002
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
test Destroy
delete test
@@ -137,7 +149,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11003
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 0 5
test Destroy
delete test
@@ -153,7 +165,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11004
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CategoryDetails 1
test Destroy
delete test
@@ -168,7 +180,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 0
test Destroy
delete test
@@ -184,7 +196,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
test EnableVerifying ET11006
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 0
test Destroy
delete test
@@ -214,7 +226,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11029
@@ -235,7 +247,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
Util WaitForConnectionActivity 3G_AP
waittestclass Util
@@ -258,7 +270,7 @@
pause 2000
create VCXVodContentApiTest test
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -270,7 +282,7 @@
Util CreateMobilecrashWatcher
create VCXVodContentApiTest test
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
Util WaitForConnectionActivity 3G_AP
waittestclass Util
@@ -290,7 +302,7 @@
test DeleteEpgDb
test Create SERVICE_0
test GetUpdateTime // database is empty
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test GetUpdateTime 1
@@ -315,7 +327,7 @@
test Create SERVICE_0
pause 2000
test EnableVerifying ET11034-1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// ECG is updated with old address
test UpdateEcg
SMUtil UpdateServiceField ASYNC SERVICE_0 EAddress "http:\/\/193.65.182.78/nseries.xml"
@@ -330,7 +342,7 @@
test Create SERVICE_0
test EnableVerifying ET11034-2
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// try again, this time ECG is updated with new address
test UpdateEcg
waittestclass test
@@ -347,6 +359,16 @@
[Test]
title <not a test> Setup services
+create VCXTestUtilModule Util
+// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util CopyMethod "Internet" "Internet" "Internet"
+Util SetMethodPriority "Internet" 3G_AP 0
+Util SetUsedDestination "Internet"
+// Disable connection dialog for "Internet" destination.
+Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
+delete Util
+
pause PAUSE
create VCXServiceManagementApiTest SMUtil
SMUtil Create
@@ -373,7 +395,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// This launches automatic update.
test GetEcgList 1 "" 0 10
@@ -414,7 +436,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// Right after update
test UpdateEcg
@@ -440,7 +462,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
@@ -459,13 +481,14 @@
[Test]
title ET11052 Last update failed - Is update needed
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
// Update succeeds
test UpdateEcg
@@ -510,7 +533,7 @@
test DeleteEpgDb
test Create SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test SetMsgWhichToSignal KIptvVodUpdateStarted
test UpdateEcg
@@ -574,35 +597,41 @@
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=nseries.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
// no search address
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
// nseries test search, second
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=nseries.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
// search url length is 256 chars
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl EAddress_256charsLongSearchUrl
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
// search service with parental rating information
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/ecg_parental_control.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=ecg_parental_control.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
// search service with preview videos
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/preview.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=preview.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_6
//SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/video.google.com/videofeed?type=search&q=#search#&so=0&num=10&output=rss"
@@ -619,6 +648,7 @@
[Test]
title ET11201 Search NSeries 3G
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -640,12 +670,13 @@
[Test]
title ET11239 Search - GetEcgList
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
test DisableThumbnails
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test GetEcgList KIptvTestSearchCategoryId "" 0 10
@@ -663,7 +694,7 @@
create VCXVodContentApiTest test
test DisableThumbnails
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test EcgCategoryList KIptvTestSearchCategoryId
@@ -682,7 +713,7 @@
test DisableThumbnails
test Create EXTRA_SERVICE_1
test EnableVerifying ET11241
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test CategoryDetails KIptvTestSearchCategoryId
@@ -700,7 +731,7 @@
create VCXVodContentApiTest test
test DisableThumbnails
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test ParentCategory 0 //KIptvTestSearchCategoryId
@@ -719,7 +750,7 @@
test DisableThumbnails
test Create EXTRA_SERVICE_1
test EnableVerifying ET11243
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test ContentDetailsList KIptvRssSearchContentId1
@@ -739,7 +770,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
pause 100
@@ -795,7 +826,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_PASSWORD
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
allownextresult EIptvDlAuthFailed
waittestclass test
@@ -825,38 +856,47 @@
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_cat_unorganised.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_cat_and_channels.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_1st_channel_with_cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_2nd_channel_with_cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_6
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_20cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_7
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_20cat_and_3channels.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_8
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_21cat.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_9
ServUtil GetServices SYNC 0 250
@@ -875,7 +915,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11901
@@ -896,7 +936,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_2
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11902
@@ -917,7 +957,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_3
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11903
@@ -938,7 +978,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_4
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11904
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestInterference.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestInterference.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -31,6 +31,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -53,22 +54,27 @@
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/multiurl.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/allmimetypes.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/preview.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/ecg_parental_control.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/dvbtest/xmltv/xmltv_1day.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
ServUtil GetServices SYNC 0 250
@@ -93,7 +99,7 @@
test DeleteEpgDb
test Create SERVICE_0
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
testinterference interference1 stop
@@ -117,7 +123,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -139,7 +145,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
testinterference interference1 stop
test Destroy
@@ -161,7 +167,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
testinterference interference1 stop
test Destroy
@@ -183,7 +189,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 0 5
testinterference interference1 stop
test Destroy
@@ -205,7 +211,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CategoryDetails 1
testinterference interference1 stop
test Destroy
@@ -227,7 +233,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 0
testinterference interference1 stop
test Destroy
@@ -249,7 +255,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 0
testinterference interference1 stop
test Destroy
@@ -292,7 +298,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -314,7 +320,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "Amazing Spaces - Adam" 0 10
test GetEcgList 3 "Nokia B" 0 10
test GetEcgList 5 "Wedding" 0 10
@@ -338,7 +344,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
testinterference interference1 stop
test Destroy
@@ -360,7 +366,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 0
testinterference interference1 stop
test Destroy
@@ -384,7 +390,7 @@
test DeleteEpgDb
test Create SERVICE_0
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
testinterference interference1 stop
@@ -408,7 +414,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -430,7 +436,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
testinterference interference1 stop
test Destroy
@@ -452,7 +458,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
testinterference interference1 stop
test Destroy
@@ -474,7 +480,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgEcgAllList "" 0 5
testinterference interference1 stop
test Destroy
@@ -496,7 +502,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CategoryDetails 1
testinterference interference1 stop
test Destroy
@@ -518,7 +524,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 0
testinterference interference1 stop
test Destroy
@@ -540,7 +546,7 @@
create VCXVodContentApiTest test
test Create SERVICE_0
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 0
testinterference interference1 stop
test Destroy
@@ -583,7 +589,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -605,7 +611,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "Amazing Spaces - Adam" 0 10
test GetEcgList 3 "Nokia B" 0 10
test GetEcgList 5 "Wedding" 0 10
@@ -629,7 +635,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList 0
testinterference interference1 stop
test Destroy
@@ -651,7 +657,7 @@
create VCXVodContentApiTest test
test Create SERVICE_10
testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList 0
testinterference interference1 stop
test Destroy
@@ -675,7 +681,7 @@
test DeleteEpgDb
test Create SERVICE_0
testinterference interference1 start thread filesystemwritec 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
testinterference interference1 stop
@@ -700,7 +706,7 @@
test DeleteEpgDb
test Create SERVICE_0
testinterference interference1 start thread filesystemreadc 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
testinterference interference1 stop
@@ -725,7 +731,7 @@
test DeleteEpgDb
test Create SERVICE_0
testinterference interference1 start activeobject filesystemwritec 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
testinterference interference1 stop
@@ -750,7 +756,7 @@
test DeleteEpgDb
test Create SERVICE_0
testinterference interference1 start activeobject filesystemreadc 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
testinterference interference1 stop
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestMimeTypes.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestMimeTypes.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -31,6 +31,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -42,30 +43,37 @@
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/multiurl.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/allmimetypes.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/allmimetypes_stream.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/general.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/general_stream.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/general_wmv.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_6
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/mimetype_tests/mediagroup.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_7
ServUtil GetServices 0 0 500
@@ -87,7 +95,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11700
@@ -111,7 +119,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_2
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11701
@@ -135,7 +143,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_3
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11702
@@ -159,7 +167,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_4
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11703
@@ -183,7 +191,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11704
@@ -207,7 +215,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_6
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11705
@@ -231,7 +239,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_7
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test EnableVerifying ET11706
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestParental.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestParental.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -31,6 +31,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -40,6 +41,7 @@
ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10
ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/ecg_parental_control.xml"
+ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
//ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/EpgRatingTst.xml"
ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
@@ -64,7 +66,7 @@
create VCXVodContentApiTest test
test SetParentalControlAge 0
test Create EXTRA_SERVICE_4
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -246,7 +248,7 @@
create VCXVodContentApiTest test
test SetParentalControlAge 0
test Create EXTRA_SERVICE_4
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
pause 1000
test SetParentalControlAge 30
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestSearch2R3.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestSearch2R3.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -31,6 +31,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -39,34 +40,38 @@
SMTest DeleteAllServices SYNC
// nseries test search
-SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
+SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=nseries.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
// google test search
-SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
+SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/video.google.com/videofeed?type=top100new&num=20&output=rss"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/video.google.com/videofeed?type=search&q=#search#&so=0&num=20&output=rss"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
// blip test search
-SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
+SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/blip.tv/?1=1&s=posts&skin=rss"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/blip.tv/?1=1&file_type=mpeg1%2Cmpeg2%2Cmpeg4;search=#search#;page=1;s=posts&skin=rss"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
// yahoo test search
-SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
+SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/rss.ent.yahoo.com/movies/thisweek.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/api.search.yahoo.com/VideoSearchService/rss/videoSearch.xml?appid=ysearchblog&adult_ok=0&results=50&format=mpeg&query=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
// dailymotion test search
-SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
+SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/www.dailymotion.com/rss/featured/1"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/www.dailymotion.com/rss/relevance/search/#search#/1"
-
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
SMTest GetServices SYNC 0 250
@@ -92,7 +97,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList KIptvTestSearchCategoryId "" 0 10
test Destroy
delete test
@@ -112,7 +117,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test EcgCategoryList KIptvTestSearchCategoryId
test Destroy
delete test
@@ -132,7 +137,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CategoryDetails KIptvTestSearchCategoryId
test Destroy
delete test
@@ -152,7 +157,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ParentCategory 0 //KIptvTestSearchCategoryId
test Destroy
delete test
@@ -172,7 +177,7 @@
pause PAUSE
create VCXVodContentApiTest test
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test ContentDetailsList SEARCH_CONTENT_1
test Destroy
delete test
@@ -208,6 +213,7 @@
[Test]
title ET19008 Search Blip 3G
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -236,6 +242,7 @@
[Test]
title ET19010 Search Dailymotion 3G
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestSearchR3.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestSearchR3.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -33,6 +33,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -44,35 +45,41 @@
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=nseries.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
// no search address
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_2
// nseries test search, second
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=nseries.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_3
// search url length is 256 chars
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl EAddress_256charsLongSearchUrl
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_4
// search service with parental rating information
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/ecg_parental_control.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=ecg_parental_control.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5
// search service with preview videos
SMTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
SMTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/preview.xml"
SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=preview.xml&q=#search#"
+SMTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
SMTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_6
//SMTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/video.google.com/videofeed?type=search&q=#search#&so=0&num=10&output=rss"
@@ -95,6 +102,7 @@
[Test]
title ET11201 Search NSeries 3G
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -121,6 +129,7 @@
[Test]
title ET11224 Search NSeries WLAN and update ECG afterwards
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -154,12 +163,13 @@
[Test]
title ET11239 Search - GetEcgList
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
test DisableThumbnails
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test GetEcgList KIptvTestSearchCategoryId "" 0 10
@@ -183,7 +193,7 @@
create VCXVodContentApiTest test
test DisableThumbnails
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test EcgCategoryList KIptvTestSearchCategoryId
@@ -208,7 +218,7 @@
test DisableThumbnails
test Create EXTRA_SERVICE_1
test EnableVerifying ET11241
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test CategoryDetails KIptvTestSearchCategoryId
@@ -232,7 +242,7 @@
create VCXVodContentApiTest test
test DisableThumbnails
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test ParentCategory 0 //KIptvTestSearchCategoryId
@@ -257,7 +267,7 @@
test DisableThumbnails
test Create EXTRA_SERVICE_1
test EnableVerifying ET11243
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test ContentDetailsList KIptvRssSearchContentId1
@@ -281,7 +291,7 @@
create VCXVodContentApiTest test
test DisableThumbnails
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test SetLastPosition KIptvRssSearchContentId1 0 0
@@ -305,7 +315,7 @@
create VCXVodContentApiTest test
test DisableThumbnails
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
waittestclass test
test SetLastPosition KIptvRssSearchContentId1 55 0
@@ -330,7 +340,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search cantfindthis
waittestclass test
test EnableVerifying ET11232
@@ -357,7 +367,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
pause 100
@@ -386,7 +396,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search N
pause 4000
@@ -415,7 +425,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
test SetMsgWhichToSignal KIptvContentThumbnailDownloaded
@@ -448,7 +458,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search N
@@ -482,7 +492,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
waittestclass test
test EnableVerifying ET11203
@@ -530,7 +540,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
allownextresult KERRNOTREADY
test Search Amaz
@@ -556,7 +566,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
pause 2000
test Destroy
@@ -646,7 +656,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_PASSWORD
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
allownextresult EIptvDlAuthFailed
waittestclass test
@@ -671,7 +681,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
pause 200
test UpdateEcg
@@ -699,7 +709,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
pause 200
test Search Promo
@@ -727,7 +737,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
loop 5
print Search 1 - LOOP_COUNTER of 5
@@ -764,7 +774,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Promo
waittestclass test
@@ -794,7 +804,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_2
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
allownextresult KERRNOTSUPPORTED
test Search Amaz
@@ -845,7 +855,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_URL1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
allownextresult EIptvDlContentNotFound
waittestclass test
@@ -888,7 +898,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_URL1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
allownextresult EIptvDlContentNotFound
waittestclass test
@@ -931,7 +941,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_URL1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
allownextresult EIptvDlContentNotFound
waittestclass test
@@ -974,7 +984,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_URL1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
allownextresult EIptvDlContentNotFound
allownextresult KIptvRssParserError
@@ -1032,7 +1042,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_URL1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
//allownextresult EIptvDlContentNotFound
//allownextresult KIptvRssParserError
@@ -1077,7 +1087,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_URL1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
allownextresult KIptvRssParserError
allownextresult EIptvDlContentNotFound
@@ -1121,7 +1131,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create SERVICE_INVALID_URL1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search Amaz
allownextresult EIptvDlContentNotFound
allownextresult KIptvRssParserError
@@ -1147,7 +1157,7 @@
test DisableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search KBadCharacters
waittestclass test
test Search "@£${[]}\\!#¤%&/()="
@@ -1177,7 +1187,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CancelSearch
@@ -1201,7 +1211,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test CancelSearch
test CancelSearch
@@ -1226,7 +1236,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
pause 2000
@@ -1255,7 +1265,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
pause 500
@@ -1281,6 +1291,7 @@
[Test]
title ET11230 Search 3G and update ECG WLAN
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -1314,6 +1325,7 @@
[Test]
title ET11231 Delete client while ECG search and update are ongoing
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -1321,7 +1333,7 @@
test DeleteEpgDb
test Create EXTRA_SERVICE_1
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
pause 1000
@@ -1350,7 +1362,7 @@
test DeleteEpgDb
test Create EXTRA_SERVICE_1
test GetUpdateTime // database is empty
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Search Amaz
@@ -1382,8 +1394,8 @@
test Create EXTRA_SERVICE_1
test2 Create EXTRA_SERVICE_3
-test SelectIap 3G_AP
-test2 SelectIap 3G_AP
+test SelectIap DEFAULT_AP
+test2 SelectIap DEFAULT_AP
test Search Amaz
test2 Search Pro
@@ -1421,7 +1433,7 @@
test DeleteEpgDb
test SetParentalControlAge 18
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search "1" // returns few videos, couple with age rating 18 or over
waittestclass test
test VerifyAllCategoryContent KIptvTestSearchCategoryId
@@ -1446,7 +1458,7 @@
test DeleteEpgDb
test SetParentalControlAge 1
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search "1" // returns few videos, couple with age rating 18 or over
waittestclass test
test VerifyAllCategoryContent KIptvTestSearchCategoryId
@@ -1471,7 +1483,7 @@
test DeleteEpgDb
test SetParentalControlAge 0
test Create EXTRA_SERVICE_5
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search "1" // returns few videos, couple with age rating 18 or over
waittestclass test
test VerifyAllCategoryContent KIptvTestSearchCategoryId
@@ -1495,7 +1507,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_6
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test Search "preview download"
waittestclass test
test VerifyAllCategoryContent KIptvTestSearchCategoryId
@@ -1527,7 +1539,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_4
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
//allownextresult KERROVERFLOW
test Search AmazingAmazingAma
waittestclass test
@@ -1561,7 +1573,7 @@
test EnableThumbnails
test DeleteEpgDb
test Create EXTRA_SERVICE_4
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
//allownextresult KERROVERFLOW
test Search AmazingAmazingAma
allownextresult EIptvDlContentNotFound
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestSearchStressR3.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestSearchStressR3.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -31,6 +31,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause PAUSE
@@ -41,6 +42,7 @@
IptvTest AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9
IptvTest UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.xml"
IptvTest UpdateServiceField ASYNC SERVICE_9 ESearchUrl "http:\/\/193.65.182.78/search.php?file=nseries.xml&q=#search#"
+IptvTest UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_1
pause PAUSE
@@ -55,6 +57,7 @@
[Test]
title ET11150 Same client - Nseries 3G
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -101,6 +104,7 @@
[Test]
title ET11152 Diff client - Nseries 3G
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
loop LOOP_CNT_3G
@@ -148,6 +152,7 @@
[Test]
title ET11154 Same client - Nseries WLAN
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
create VCXVodContentApiTest test
@@ -194,6 +199,7 @@
[Test]
title ET11156 Diff client - Nseries WLAN
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
@@ -242,6 +248,7 @@
[Test]
title ET11158 STRESS Cancel search
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
@@ -284,6 +291,7 @@
[Test]
title ET11159 STRESS Update and Search
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause PAUSE
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentEpgUpdateTest.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentEpgUpdateTest.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -31,6 +31,7 @@
Util SetUsedDestination DEFAULT_DEST
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
pause 3000
@@ -41,6 +42,9 @@
IptvTest AddHardCodedService ASYNC SERVICE_1 3G_AP 1 1 // Nokia
IptvTest AddHardCodedService ASYNC SERVICE_2 3G_AP 1 2 // Rocketboom
//IptvTest UpdateServiceField ASYNC 1 EAddress "http:\/\/193.65.182.78/invalid_feeds/invalid_feed_channel2.xml"
+smtest UpdateServiceField SYNC SERVICE_0 ESetIapList WLAN_AP 1 3G_AP 1
+smtest UpdateServiceField SYNC SERVICE_1 ESetIapList WLAN_AP 1 3G_AP 1
+smtest UpdateServiceField SYNC SERVICE_2 ESetIapList WLAN_AP 1 3G_AP 1
IptvTest GetServices 0 0 5000
IptvTest Destroy
delete IptvTest
@@ -56,6 +60,7 @@
title ET11100 UpdateSame SERVICE_0 WLAN_AP
pause 3000
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
create VCXVodContentApiTest test
test Create SERVICE_0
@@ -84,6 +89,7 @@
[Test]
title ET11101 UpdateSame SERVICE_1 WLAN_AP
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause 3000
create VCXVodContentApiTest test
@@ -113,6 +119,7 @@
[Test]
title ET11102 UpdateSame SERVICE_2 WLAN_AP
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause 3000
create VCXVodContentApiTest test
@@ -142,6 +149,7 @@
[Test]
title ET11103 UpdateNew SERVICE_0 WLAN_AP
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause 3000
create VCXVodContentApiTest test
@@ -171,6 +179,7 @@
[Test]
title ET11104 UpdateNew SERVICE_2 WLAN_AP
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST WLAN_AP 0
Util CreateMobilecrashWatcher
pause 3000
create VCXVodContentApiTest test
@@ -200,6 +209,7 @@
[Test]
title ET11105 UpdateSame SERVICE_0 3G_AP
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause 3000
create VCXVodContentApiTest test
@@ -229,6 +239,7 @@
[Test]
title ET11106 UpdateSame SERVICE_2 3G_AP
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause 3000
create VCXVodContentApiTest test
@@ -258,6 +269,7 @@
[Test]
title ET11107 UpdateNew SERVICE_0 3G_AP
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
Util CreateMobilecrashWatcher
pause 3000
create VCXVodContentApiTest test
@@ -287,6 +299,8 @@
[Test]
title ET11108 UpdateNew SERVICE_2 3G_AP
create VCXTestUtilModule Util
+Util SetMethodPriority DEFAULT_DEST 3G_AP 0
+Util SetDefaultIapCenrep
Util CreateMobilecrashWatcher
pause 3000
create VCXVodContentApiTest test
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentModificationCheckTest.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentModificationCheckTest.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -22,7 +22,7 @@
[Sub SyncTime]
print >>>SyncTime
-observer Download "http:\/\/193.65.182.78/time.php" "c:\testing\data\iptvtestsynctime.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "http:\/\/193.65.182.78/time.php" "c:\testing\data\iptvtestsynctime.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
observer SyncTimeWithServer "c:\testing\data\iptvtestsynctime.txt"
pause 2000
@@ -30,7 +30,7 @@
[Sub TouchFeed]
print >>TouchFeed
-observer Download "KIptvTestUrlUpdateAll" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrlUpdateAll" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
pause 2000
[EndSub]
@@ -39,7 +39,7 @@
print >>>EcgForcedUpdate
create VCXVodContentApiTest test
test Create SERVICE_TN
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test UpdateEcg
waittestclass test
test Destroy
@@ -51,7 +51,7 @@
print >>>EcgUpdate
create VCXVodContentApiTest test
test Create SERVICE_TN
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
waittestclass test
test Destroy
@@ -63,7 +63,7 @@
print >>>EcgUpdate
create VCXVodContentApiTest test
test Create SERVICE_TN
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
test GetEcgList 1 "" 0 10
allownextresult KIptvVodUpdateNotStarted
waittestclass test
@@ -82,9 +82,11 @@
create VCXTestUtilModule Util
// Copies some known 3G AP to "Internet" destination with "Internet" name for the AP.
+Util SetUsedDestination "Internet"
Util CopyMethod "Internet" "Internet" "Internet"
// Disable connection dialog for "Internet" destination.
Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
delete Util
create VCXTestUtilModule Util
@@ -98,7 +100,7 @@
smtest UpdateServiceField ASYNC SERVICE_3 EAddress "http:\/\/193.65.182.78/misc/nfpthumbnailtest/test_engine.xml"
smtest UpdateServiceField ASYNC SERVICE_3 EName SERVICE_TN
-smtest UpdateServiceField SYNC SERVICE_TN ESetIapList 3G_AP 1
+smtest UpdateServiceField SYNC SERVICE_TN ESetIapList WLAN_AP 1 3G_AP 1
smtest UpdateServiceField SYNC SERVICE_TN EFlags 13
smtest UpdateServiceField SYNC SERVICE_TN EScheduleDlNetwork EAlways
delete smtest
@@ -159,7 +161,7 @@
callsub SyncTime
callsub TouchFeed
-observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgForcedUpdate
@@ -173,7 +175,7 @@
observer CheckFileState
observer GetFileDate
-observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
Util AdvanceSystemTimeHours 2
@@ -204,7 +206,7 @@
callsub SyncTime
callsub TouchFeed
-observer Download "KIptvTestUrl4" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl4" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgForcedUpdate
@@ -220,7 +222,7 @@
Util AdvanceSystemTimeHours 2
-observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgUpdate
@@ -250,7 +252,7 @@
callsub TouchFeed
-observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgForcedUpdate
@@ -266,7 +268,7 @@
Util AdvanceSystemTimeHours 2
-observer Download "KIptvTestUrl9" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl9" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgUpdate
@@ -295,7 +297,7 @@
callsub TouchFeed
-observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgForcedUpdate
@@ -309,7 +311,7 @@
observer CheckFileState
observer GetFileDate
-observer Download "KIptvTestUrl3" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl3" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
Util AdvanceSystemTimeHours 2
@@ -341,7 +343,7 @@
callsub TouchFeed
-observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
observer SetObservedServicePath SERVICE_TN
@@ -354,7 +356,7 @@
create VCXVodContentApiTest test
test DeleteEpgDb
test Create SERVICE_TN
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
observer CheckFileState 0 0 0 0 0
@@ -388,7 +390,7 @@
callsub TouchFeed
-observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl1" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgForcedUpdate
@@ -402,7 +404,7 @@
observer CheckFileState
observer GetFileDate
-observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgUpdateNotNeeded
@@ -432,7 +434,7 @@
callsub TouchFeed
-observer Download "KIptvTestUrl5" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl5" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgForcedUpdate
@@ -448,7 +450,7 @@
Util AdvanceSystemTimeHours 2
-observer Download "KIptvTestUrl5" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl5" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgUpdate
@@ -476,7 +478,7 @@
callsub SyncTime
callsub TouchFeed
-observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
callsub EcgForcedUpdate
@@ -492,7 +494,7 @@
observer CheckFileState
observer GetFileDate
-observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" 3G_AP
+observer Download "KIptvTestUrl2" "c:\testing\data\vcxenginetesttemp.txt" "mediacharger" "Buran_9o" DEFAULT_AP
waittestclass observer
Util AdvanceSystemTimeHours 2
--- a/videofeeds/utils/group/IptvUtil.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/utils/group/IptvUtil.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -24,7 +24,7 @@
//OPTION ARMCC --asm --interleave
ALWAYS_BUILD_AS_ARM
-TARGET IptvUtil.dll
+TARGET iptvutil.dll
TARGETTYPE dll
UID 0x1000008d 0x10281F1E
@@ -72,7 +72,7 @@
LIBRARY efsrv.lib
LIBRARY bafl.lib
LIBRARY cone.lib
-LIBRARY PlatformEnv.lib // PathInfo
+LIBRARY platformenv.lib // PathInfo
LIBRARY imageconversion.lib
LIBRARY apgrfx.lib // RApaLsSession
LIBRARY apmime.lib // TDataType
@@ -80,14 +80,14 @@
LIBRARY iaupdateapi.lib
-LIBRARY TNEEngine.lib
+LIBRARY tneengine.lib
LIBRARY commdb.lib
LIBRARY sysutil.lib
-LIBRARY FeatMgr.lib // Feature manager
+LIBRARY featmgr.lib // Feature manager
LIBRARY egul.lib
LIBRARY bitgdi.lib
LIBRARY aknicon.lib
LIBRARY fbscli.lib
LIBRARY etel.lib
LIBRARY etelmm.lib
-LIBRARY SecUi.lib
+LIBRARY secui.lib
--- a/videofeeds/utils/src/vcxhgvodtelephonyclient.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/utils/src/vcxhgvodtelephonyclient.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -19,8 +19,8 @@
// INCLUDE FILES
#include <mmtsy_names.h>
-#include <SecUi.h>
-#include <SecUiSecurityHandler.h>
+#include <secui.h>
+#include <secuisecurityhandler.h>
#include "vcxhgvodtelephonyclient.h"
--- a/videofeeds/vccommon/group/bld.inf Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/vccommon/group/bld.inf Tue Jan 26 12:00:59 2010 +0200
@@ -35,12 +35,12 @@
../conf/videocenteralr.confml APP_LAYER_CONFML(videocenteralr.confml)
../conf/videocenteralr_2000B438.crml APP_LAYER_CRML(videocenteralr_2000B438.crml)
-../data/services_rom.xml /epoc32/data/z/private/102750D5/services.xml
-../data/services_sis.xml /epoc32/data/c/private/102750D5/services.xml
-../data/services_sis.xml /epoc32/winscw/c/private/102750D5/services.xml
+../data/services_rom.xml /epoc32/data/z/private/102750d5/services.xml
+../data/services_sis.xml /epoc32/data/c/private/102750d5/services.xml
+../data/services_sis.xml /epoc32/winscw/c/private/102750d5/services.xml
-../data/backup_registration_eng.xml /epoc32/data/z/private/102750D5/backup_registration.xml
-../data/cenrep/backup_registration_eng.xml /epoc32/data/z/private/102750E2/backup_registration.xml
+../data/backup_registration_eng.xml /epoc32/data/z/private/102750d5/backup_registration.xml
+../data/cenrep/backup_registration_eng.xml /epoc32/data/z/private/102750e2/backup_registration.xml
// engineering english loc file export
../loc/ipvideo.loc APP_LAYER_LOC_EXPORT_PATH( ipvideo.loc )
--- a/videofeeds/vcnsscheduleview/group/vcxnsscheduleview.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/vcnsscheduleview/group/vcxnsscheduleview.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -73,7 +73,7 @@
LIBRARY eikdlg.lib
LIBRARY euser.lib
LIBRARY flogger.lib
-LIBRARY IptvClientApi.lib
+LIBRARY iptvclientapi.lib
LIBRARY iptvutil.lib
LIBRARY mpxviewutility.lib
LIBRARY vcxnsuiengine.lib
--- a/videofeeds/vcnsuiengine/group/vcxnsuiengine.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/vcnsuiengine/group/vcxnsuiengine.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -68,8 +68,8 @@
LIBRARY estor.lib
LIBRARY euser.lib
LIBRARY flogger.lib
-LIBRARY IptvUtil.lib
-LIBRARY IptvClientApi.lib
+LIBRARY iptvutil.lib
+LIBRARY iptvclientapi.lib
LIBRARY mpxcommon.lib
LIBRARY mpxcollectionutility.lib
LIBRARY vcxconnectionutility.lib
--- a/videofeeds/vcnsuiengine/src/vcxnsmpxcollectionclienthandler.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/vcnsuiengine/src/vcxnsmpxcollectionclienthandler.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -35,7 +35,7 @@
#include <vcxmyvideosuids.h>
#include <mpxcommandgeneraldefs.h>
#include <mpxcollectioncommanddefs.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
#include "CIptvMyVideosGlobalFileId.h"
#include "vcxnsmpxcollectionclienthandler.h"
--- a/videofeeds/vcnsuiengine/src/vcxnsuiengine.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/vcnsuiengine/src/vcxnsuiengine.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -50,7 +50,7 @@
const TInt KVcxNsUiEngineInstance = 0x2000B43D;
-// Version : %version: tr1ido#REL6_54 %
+// Version : %version: REL6_56 %
// -----------------------------------------------------------------------------
// CVcxNsUiEngine::CVcxNsUiEngine()
--- a/videofeeds/vcxnotifier/group/vcxnotifierplugin.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/vcxnotifier/group/vcxnotifierplugin.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -51,21 +51,21 @@
LANGUAGE_IDS
END // RESOURCE
-LIBRARY ECOM.LIB
-LIBRARY EUSER.LIB
-LIBRARY AKNNOTIFIERWRAPPER.LIB
-LIBRARY FLOGGER.LIB
-LIBRARY COMMONENGINE.LIB
-LIBRARY CONE.LIB
-LIBRARY EIKSRV.LIB
-LIBRARY AVKON.LIB
-LIBRARY EIKCDLG.LIB
-LIBRARY EIKCTL.LIB
-LIBRARY APGRFX.LIB
-LIBRARY APPARC.LIB
-LIBRARY WS32.lib
-LIBRARY EIKCOCTL.LIB
-LIBRARY EIKDLG.LIB
-LIBRARY EIKCORE.LIB
-LIBRARY IptvUtil.lib
+LIBRARY ecom.lib
+LIBRARY euser.lib
+LIBRARY aknnotifierwrapper.lib
+LIBRARY flogger.lib
+LIBRARY commonengine.lib
+LIBRARY cone.lib
+LIBRARY eiksrv.lib
+LIBRARY avkon.lib
+LIBRARY eikcdlg.lib
+LIBRARY eikctl.lib
+LIBRARY apgrfx.lib
+LIBRARY apparc.lib
+LIBRARY ws32.lib
+LIBRARY eikcoctl.lib
+LIBRARY eikdlg.lib
+LIBRARY eikcore.lib
+LIBRARY iptvutil.lib
--- a/videoplayback/inc/mpxvideoplaybackmediadetailsviewer.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/inc/mpxvideoplaybackmediadetailsviewer.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 3 %
+// Version : %version: e003sa33#4 %
#ifndef MPXVIDEOPLAYBACKMEDIADETAILSVIEWER_H_
#define MPXVIDEOPLAYBACKMEDIADETAILSVIEWER_H_
@@ -142,14 +142,14 @@
* @since 9.2
* @return the number of rows to be created
*/
- TInt NumOfItemsShownInViewer();
+ TInt NumOfItemsShownInViewerL();
/**
* Dynamically calculate determine the viewer rectangle dyanmically
* @since 9.2
* @return the viewer rect
*/
- TRect CalculateViewerRect();
+ TRect CalculateViewerRectL();
private: // Data
--- a/videoplayback/inc/mpxvideoplaybackviewfiledetails.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/inc/mpxvideoplaybackviewfiledetails.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 9 %
+// Version : %version: e003sa33#10 %
--- a/videoplayback/videohelix/inc/mpxvideoplaybackstate.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videohelix/inc/mpxvideoplaybackstate.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 16 %
+// Version : %version: 17 %
#ifndef _CMPXVIDEOPLAYBACKSTATE_H_
@@ -129,6 +129,10 @@
*/
void ConstructL(CMPXVideoPlaybackController* aVideoPlaybackCtlr);
+ void IssuePlayCommand( TMPXVideoPlaybackState aState,
+ MMPXPlaybackPluginObserver::TEvent aEvent,
+ TBool aSendEvent = ETrue );
+
protected:
//
// Data
--- a/videoplayback/videohelix/inc/mpxvideoplayerutility.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videohelix/inc/mpxvideoplayerutility.h Tue Jan 26 12:00:59 2010 +0200
@@ -12,10 +12,10 @@
* Contributors:
*
* Description: This class is the interface between the playback plugin and RMMFController
- *
+*
*/
-// Version : %version: 8 %
+// Version : %version: 9 %
#ifndef __MPXVIDEOPLAYERUTILITY__
@@ -91,7 +91,7 @@
const TDesC8& aDataTo2 );
void Prepare();
- void Play();
+ void PlayL();
void PauseL();
void Close();
TInt Stop();
--- a/videoplayback/videohelix/src/mpxvideoplaybackcontroller.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videohelix/src/mpxvideoplaybackcontroller.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 39 %
+// Version : %version: 40 %
//
@@ -1170,7 +1170,9 @@
switch ( aChangeToState )
{
case EMPXVideoPlaying:
+ {
iState = iPlayingState;
+
//
// If clip is audio only, stop the backlight timer and break switch
// If clip has audio and video, proceed to the next case which will
@@ -1184,34 +1186,50 @@
{
CancelBackLightTimer();
}
+
break;
+ }
case EMPXVideoPaused:
+ {
iState = iPausedState;
CancelBackLightTimer();
break;
+ }
case EMPXVideoInitializing:
+ {
iState = iInitialisingState;
StartBackLightTimer();
break;
+ }
case EMPXVideoInitialized:
+ {
iState = iInitialisedState;
break;
+ }
case EMPXVideoBuffering:
+ {
iState = iBufferingState;
StartBackLightTimer();
break;
+ }
case EMPXVideoSeeking:
+ {
iState = iSeekingState;
break;
+ }
case EMPXVideoStopped:
+ {
iState = iStoppedState;
CancelBackLightTimer();
break;
+ }
case EMPXVideoNotInitialized:
+ {
ResetMemberVariables();
iState = iNotIntialisedState;
CancelBackLightTimer();
break;
+ }
}
}
}
--- a/videoplayback/videohelix/src/mpxvideoplaybackstate.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videohelix/src/mpxvideoplaybackstate.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 30 %
+// Version : %version: 31 %
//
@@ -277,7 +277,7 @@
{
MPX_DEBUG(_L("CMPXVideoPlaybackState::HandleVolumeChange()"));
- MPX_TRAPD(err, iVideoPlaybackCtlr->SetVolumeMMFL());
+ MPX_TRAPD( err, iVideoPlaybackCtlr->SetVolumeMMFL() );
}
// ------------------------------------------------------------------------------------------------
@@ -665,6 +665,33 @@
return 100;
}
+// ------------------------------------------------------------------------------------------------
+// CMPXVideoPlaybackState::IssuePlayCommand()
+// ------------------------------------------------------------------------------------------------
+void CMPXVideoPlaybackState::IssuePlayCommand( TMPXVideoPlaybackState aState,
+ MMPXPlaybackPluginObserver::TEvent aEvent,
+ TBool aSendEvent )
+{
+ MPX_ENTER_EXIT(_L("CMPXVideoPlaybackState::CMPXVideoPlaybackState::IssuePlayCommand()"),
+ _L("aState = %d, aEvent = %d, aSendEvent = %d"), aState, aEvent, aSendEvent );
+
+ MPX_TRAPD( err, iVideoPlaybackCtlr->iPlayer->PlayL() );
+
+ if ( err == KErrNone )
+ {
+ iVideoPlaybackCtlr->ChangeState( aState );
+
+ if ( aSendEvent )
+ {
+ iVideoPlaybackCtlr->iMPXPluginObs->HandlePluginEvent( aEvent, 0, KErrNone );
+ }
+ }
+ else
+ {
+ TRAP_IGNORE( SendErrorToViewL( err ) );
+ }
+}
+
// *************************************************************************************************
//
// STATE SUB-CLASSES
@@ -1064,7 +1091,7 @@
}
// ------------------------------------------------------------------------------------------------
-// CMPXInitialisedState::HandlePlay()
+// CMPXInitialisedState::HandlePlay()
// ------------------------------------------------------------------------------------------------
void CMPXInitialisedState::HandlePlay()
{
@@ -1074,13 +1101,7 @@
{
iVideoPlaybackCtlr->iForegroundPause = EFalse;
- iVideoPlaybackCtlr->iPlayer->Play();
-
- iVideoPlaybackCtlr->ChangeState( EMPXVideoBuffering );
-
- iVideoPlaybackCtlr->iMPXPluginObs->HandlePluginEvent( MMPXPlaybackPluginObserver::EPBufferingStarted,
- 0,
- KErrNone );
+ IssuePlayCommand( EMPXVideoBuffering, MMPXPlaybackPluginObserver::EPBufferingStarted );
}
else
{
@@ -1293,11 +1314,17 @@
pos *= KPbMilliMultiplier;
//
- // Helix can't handle setposition in playing state
+ // Helix can't handle set position in playing state
//
iVideoPlaybackCtlr->iPlayer->PauseL();
iVideoPlaybackCtlr->iPlayer->SetPositionL( pos );
- iVideoPlaybackCtlr->iPlayer->Play();
+
+ MPX_TRAPD( err, iVideoPlaybackCtlr->iPlayer->PlayL() );
+
+ if ( err != KErrNone )
+ {
+ SendErrorToViewL( err );
+ }
}
else
{
@@ -1376,7 +1403,7 @@
}
// ------------------------------------------------------------------------------------------------
-// CMPXPausedState::HandlePlay()
+// CMPXPausedState::HandlePlay()
// ------------------------------------------------------------------------------------------------
void CMPXPausedState::HandlePlay()
{
@@ -1386,13 +1413,7 @@
{
iVideoPlaybackCtlr->iForegroundPause = EFalse;
- iVideoPlaybackCtlr->iPlayer->Play();
-
- iVideoPlaybackCtlr->ChangeState(EMPXVideoPlaying);
-
- iVideoPlaybackCtlr->iMPXPluginObs->HandlePluginEvent( MMPXPlaybackPluginObserver::EPPlaying,
- 0,
- KErrNone );
+ IssuePlayCommand( EMPXVideoPlaying, MMPXPlaybackPluginObserver::EPPlaying );
}
}
@@ -1488,8 +1509,9 @@
}
// ------------------------------------------------------------------------------------------------
-// CMPXPausedState::HandleCustomPlay()
-// Handle the custom play command only when in paused state
+// CMPXPausedState::HandleCustomPlay()
+// Handle the custom play command only when in paused state.
+// No state change is sent to the framework
// ------------------------------------------------------------------------------------------------
void CMPXPausedState::HandleCustomPlay()
{
@@ -1499,9 +1521,7 @@
{
iVideoPlaybackCtlr->iForegroundPause = EFalse;
- iVideoPlaybackCtlr->iPlayer->Play();
-
- iVideoPlaybackCtlr->ChangeState(EMPXVideoPlaying);
+ IssuePlayCommand( EMPXVideoPlaying, MMPXPlaybackPluginObserver::EPPlaying, EFalse );
}
}
@@ -1541,13 +1561,7 @@
if ( iVideoPlaybackCtlr->iPlaybackMode->CanPlayNow() )
{
- iVideoPlaybackCtlr->iPlayer->Play();
-
- iVideoPlaybackCtlr->ChangeState(EMPXVideoPlaying);
-
- iVideoPlaybackCtlr->iMPXPluginObs->HandlePluginEvent( MMPXPlaybackPluginObserver::EPPlaying,
- 0,
- KErrNone );
+ IssuePlayCommand( EMPXVideoPlaying, MMPXPlaybackPluginObserver::EPPlaying );
}
}
@@ -1781,7 +1795,7 @@
}
// ------------------------------------------------------------------------------------------------
-// CMPXSeekingState::HandlePlay()
+// CMPXSeekingState::HandlePlay()
// ------------------------------------------------------------------------------------------------
void CMPXSeekingState::HandlePlay()
{
@@ -1789,13 +1803,7 @@
if ( iVideoPlaybackCtlr->iPlaybackMode->CanPlayNow() )
{
- iVideoPlaybackCtlr->iPlayer->Play();
-
- iVideoPlaybackCtlr->ChangeState( EMPXVideoPlaying );
-
- iVideoPlaybackCtlr->iMPXPluginObs->HandlePluginEvent( MMPXPlaybackPluginObserver::EPPlaying,
- 0,
- KErrNone );
+ IssuePlayCommand( EMPXVideoPlaying, MMPXPlaybackPluginObserver::EPPlaying );
}
else
{
--- a/videoplayback/videohelix/src/mpxvideoplayerutility.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videohelix/src/mpxvideoplayerutility.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 12 %
+// Version : %version: 13 %
#include <AudioPreference.h>
@@ -307,11 +307,11 @@
MPX_DEBUG(_L("CMpxVideoPlayerUtility::GetVideoLoadingProgressL(%d)"), aPercentageProgress );
}
-void CMpxVideoPlayerUtility::Play()
+void CMpxVideoPlayerUtility::PlayL()
{
- MPX_ENTER_EXIT(_L("CMpxVideoPlayerUtility::Play()"));
+ MPX_ENTER_EXIT(_L("CMpxVideoPlayerUtility::PlayL()"));
- TInt err = iController.Play();
+ User::LeaveIfError( iController.Play() );
}
void CMpxVideoPlayerUtility::PauseL()
--- a/videoplayback/videohelix/tsrc/ut_videohelixtest/inc/mpxvideoplayerutility_stub.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videohelix/tsrc/ut_videohelixtest/inc/mpxvideoplayerutility_stub.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 8 %
+// Version : %version: 9 %
#ifndef __MPXVIDEOPLAYERUTILITY__
@@ -91,7 +91,7 @@
const TDesC8& aDataTo2 );
void Prepare();
- void Play();
+ void PlayL();
void PauseL();
void Close();
TInt Stop();
--- a/videoplayback/videohelix/tsrc/ut_videohelixtest/src/mpxvideoplayerutility_stub.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videohelix/tsrc/ut_videohelixtest/src/mpxvideoplayerutility_stub.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 10 %
+// Version : %version: 11 %
#include <audiopreference.h>
#include <mmf/server/mmffile.h>
@@ -287,9 +287,9 @@
MPX_DEBUG(_L("CMpxVideoPlayerUtility::GetVideoLoadingProgressL(%d)"), aPercentageProgress );
}
-void CMpxVideoPlayerUtility::Play()
+void CMpxVideoPlayerUtility::PlayL()
{
- MPX_ENTER_EXIT(_L("CMpxVideoPlayerUtility::Play()"));
+ MPX_ENTER_EXIT(_L("CMpxVideoPlayerUtility::PlayL()"));
if ( iFirstPlayCmd )
{
--- a/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackmediadetailsviewer.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/src/mpxvideoplaybackmediadetailsviewer.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 8 %
+// Version : %version: e003sa33#10 %
// INCLUDE FILES
@@ -51,6 +51,7 @@
const TInt KMediaDetailsViewerFilenameMedium = 45;
const TInt KMediaDetailsViewerOffsetDivisorMedium = 12;
const TInt KMediaDetailsViewerOffsetDivisorMax = 20;
+const TInt KMediaDetailsViewerMaxBufLen = 255;
// UID of this interface
const TUid KFileDetailsCntlPluginUid = {0x2002A59D};
@@ -83,7 +84,7 @@
{
MPX_DEBUG(_L("CMPXVideoPlaybackMediaDetailsViewer::ConstructL()"));
- iViewerRect = CalculateViewerRect();
+ iViewerRect = CalculateViewerRectL();
SetRect( TRect(0, 0, iViewerRect.Width(), iViewerRect.Height()) );
CreateLabelsL();
@@ -301,7 +302,9 @@
iLicenseLabel->SetExtent( TPoint(Rect().iTl.iX, Rect().iTl.iY + (labelHeight*rowsAdded) ) ,
TSize(labelWidth,labelHeight) );
HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_LICENSE_HEADING );
- TBuf<255> licenseField;
+ CleanupStack::PushL( heading );
+
+ TBuf<KMediaDetailsViewerMaxBufLen> licenseField;
licenseField.Append(KLeftMargin);
licenseField.Append( *heading );
iLicenseLabel->OverrideColorL(EColorLabelText, KRgbDarkBlue);
@@ -311,7 +314,8 @@
iLicenseLabel->SetUnderlining(ETrue);
iLicenseLabel->MakeVisible( ETrue );
rowsAdded++;
- delete heading;
+
+ CleanupStack::PopAndDestroy( heading );
}
// Filename
@@ -332,16 +336,20 @@
iFormatLabel->SetExtent( TPoint(Rect().iTl.iX, Rect().iTl.iY + (labelHeight*rowsAdded) ) ,
TSize(labelWidth,labelHeight) );
HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_FORMAT_HEADING );
- TBuf<255> formatField;
+ CleanupStack::PushL( heading );
+
+ TBuf<KMediaDetailsViewerMaxBufLen> formatField;
formatField.Append(KLeftMargin);
formatField.Append( *heading );
formatField.Append( KHeadingValueSeperator );
- formatField.Append( *(iController->FileDetails()->iMimeType) );
+ TInt allowLen = KMediaDetailsViewerMaxBufLen-formatField.Length();
+ formatField.Append( (iController->FileDetails()->iMimeType)->Left(allowLen) );
iFormatLabel->SetTextL(formatField);
iFormatLabel->SetAllMarginsTo(KMediaDetailsViewerItemMargin);
iFormatLabel->MakeVisible( ETrue );
rowsAdded++;
- delete heading;
+
+ CleanupStack::PopAndDestroy( heading );
}
// Resolution
@@ -351,7 +359,9 @@
iResolutionLabel->SetExtent( TPoint(Rect().iTl.iX, Rect().iTl.iY + (labelHeight*rowsAdded) ) ,
TSize(labelWidth,labelHeight) );
HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_RESOLUTION_HEADING );
- TBuf<255> resolutionField;
+ CleanupStack::PushL( heading );
+
+ TBuf<KMediaDetailsViewerMaxBufLen> resolutionField;
resolutionField.Append(KLeftMargin);
resolutionField.Append( *heading );
resolutionField.Append( KHeadingValueSeperator );
@@ -363,7 +373,8 @@
iResolutionLabel->SetAllMarginsTo(KMediaDetailsViewerItemMargin);
iResolutionLabel->MakeVisible( ETrue );
rowsAdded++;
- delete heading;
+
+ CleanupStack::PopAndDestroy( heading );
}
// Duration
@@ -372,7 +383,9 @@
iDurationLabel->SetExtent( TPoint(Rect().iTl.iX, Rect().iTl.iY + (labelHeight*rowsAdded) ) ,
TSize(labelWidth,labelHeight) );
HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_DURATION_HEADING );
- TBuf<255> durationField;
+ CleanupStack::PushL( heading );
+
+ TBuf<KMediaDetailsViewerMaxBufLen> durationField;
durationField.Append(KLeftMargin);
durationField.Append( *heading );
durationField.Append( KHeadingValueSeperator );
@@ -399,8 +412,10 @@
iDurationLabel->SetAllMarginsTo(KMediaDetailsViewerItemMargin);
iDurationLabel->MakeVisible( ETrue );
rowsAdded++;
- delete heading;
- CleanupStack::PopAndDestroy(); // unitFormatString
+
+ CleanupStack::PopAndDestroy( unitFormatString ); // unitFormatString
+ CleanupStack::PopAndDestroy( heading );
+
}
@@ -410,7 +425,9 @@
iBitrateLabel->SetExtent( TPoint(Rect().iTl.iX, Rect().iTl.iY + (labelHeight*rowsAdded) ) ,
TSize(labelWidth,labelHeight) );
HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_BITRATE_HEADING );
- TBuf<255> bitrateField;
+ CleanupStack::PushL( heading );
+
+ TBuf<KMediaDetailsViewerMaxBufLen> bitrateField;
bitrateField.Append(KLeftMargin);
bitrateField.Append( *heading );
bitrateField.Append( KHeadingValueSeperator );
@@ -423,8 +440,9 @@
iBitrateLabel->SetAllMarginsTo(KMediaDetailsViewerItemMargin);
iBitrateLabel->MakeVisible( ETrue );
rowsAdded++;
- delete heading;
- CleanupStack::PopAndDestroy(); // formattedBitrate
+
+ CleanupStack::PopAndDestroy( formattedBitrate ); // formattedBitrate
+ CleanupStack::PopAndDestroy( heading );
}
// Title
@@ -433,17 +451,20 @@
iTitleLabel->SetExtent( TPoint(Rect().iTl.iX, Rect().iTl.iY + (labelHeight*rowsAdded) ) ,
TSize(labelWidth,labelHeight) );
HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_TITLE_HEADING );
- TBuf<255> titleField;
+ CleanupStack::PushL( heading );
+
+ TBuf<KMediaDetailsViewerMaxBufLen> titleField;
titleField.Append(KLeftMargin);
titleField.Append( *heading );
titleField.Append( KHeadingValueSeperator );
- titleField.Append( *(iController->FileDetails()->iTitle) );
+ TInt allowLen = KMediaDetailsViewerMaxBufLen-titleField.Length();
+ titleField.Append( (iController->FileDetails()->iTitle)->Left(allowLen) );
iTitleLabel->SetTextL(titleField);
iTitleLabel->SetAllMarginsTo(KMediaDetailsViewerItemMargin);
iTitleLabel->MakeVisible( ETrue );
rowsAdded++;
- delete heading;
+ CleanupStack::PopAndDestroy( heading );
}
// Artist
@@ -452,17 +473,20 @@
iArtistLabel->SetExtent( TPoint(Rect().iTl.iX, Rect().iTl.iY + (labelHeight*rowsAdded) ) ,
TSize(labelWidth,labelHeight) );
HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_ARTIST_HEADING );
- TBuf<255> artistField;
+ CleanupStack::PushL( heading );
+
+ TBuf<KMediaDetailsViewerMaxBufLen> artistField;
artistField.Append(KLeftMargin);
artistField.Append( *heading );
artistField.Append( KHeadingValueSeperator );
- artistField.Append( *(iController->FileDetails()->iArtist) );
+ TInt allowLen = KMediaDetailsViewerMaxBufLen-artistField.Length();
+ artistField.Append( (iController->FileDetails()->iArtist)->Left( allowLen ) );
iArtistLabel->SetTextL(artistField);
iArtistLabel->SetAllMarginsTo(KMediaDetailsViewerItemMargin);
iArtistLabel->MakeVisible( ETrue );
rowsAdded++;
- delete heading;
+ CleanupStack::PopAndDestroy( heading );
}
@@ -472,9 +496,10 @@
iAdditionalLabel->SetExtent( TPoint(Rect().iTl.iX, Rect().iTl.iY + (labelHeight*rowsAdded) ) ,
TSize(labelWidth,labelHeight) );
- TBuf<255> titleField;
+ TBuf<KMediaDetailsViewerMaxBufLen> titleField;
titleField.Append(KLeftMargin);
- titleField.Append( *iAdditionalString );
+ TInt allowLen = KMediaDetailsViewerMaxBufLen-titleField.Length();
+ titleField.Append( iAdditionalString->Left(allowLen) );
iAdditionalLabel->SetTextL(titleField);
iAdditionalLabel->SetAllMarginsTo(KMediaDetailsViewerItemMargin);
iAdditionalLabel->MakeVisible( ETrue );
@@ -648,7 +673,9 @@
//
TInt CMPXVideoPlaybackMediaDetailsViewer::ScrollFilenameTimer( TAny* aPtr )
{
- static_cast<CMPXVideoPlaybackMediaDetailsViewer*>(aPtr)->HandleScrollFilenameTimerL();
+ TRAP_IGNORE(
+ static_cast<CMPXVideoPlaybackMediaDetailsViewer*>(aPtr)->HandleScrollFilenameTimerL()
+ );
return KErrNone;
}
@@ -669,7 +696,9 @@
TInt length = iController->FileDetails()->iClipName->Length();
HBufC* heading = iEikonEnv->AllocReadResourceL( R_MPX_FILENAME_HEADING );
- TBuf<255> filenameField;
+ CleanupStack::PushL( heading );
+
+ TBuf<KMediaDetailsViewerMaxBufLen> filenameField;
filenameField.Append(KLeftMargin);
filenameField.Append( *heading );
filenameField.Append( KHeadingValueSeperator );
@@ -699,7 +728,7 @@
iClipnameLabel->SetTextL(filenameField);
DrawNow();
- delete heading;
+ CleanupStack::PopAndDestroy( heading );
}
}
@@ -709,7 +738,7 @@
// CMPXVideoPlaybackMediaDetailsViewer::NumOfItemsShownInViewer
// -------------------------------------------------------------------------------------------------
//
-TInt CMPXVideoPlaybackMediaDetailsViewer::NumOfItemsShownInViewer()
+TInt CMPXVideoPlaybackMediaDetailsViewer::NumOfItemsShownInViewerL()
{
TInt numOfItems = 0;
@@ -784,9 +813,9 @@
// CMPXVideoPlaybackMediaDetailsViewer::CalculateViewerRect
// -------------------------------------------------------------------------------------------------
//
-TRect CMPXVideoPlaybackMediaDetailsViewer::CalculateViewerRect()
+TRect CMPXVideoPlaybackMediaDetailsViewer::CalculateViewerRectL()
{
- TInt numOfItems = NumOfItemsShownInViewer();
+ TInt numOfItems = NumOfItemsShownInViewerL();
TRect viewerRect;
// optimize viewer's width for the clipname
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/conf/ui_videoplaybackcontrolstest.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/conf/ui_videoplaybackcontrolstest.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -811,5 +811,26 @@
pause 2000
[Endtest]
+[Test]
+title [34] Open Close Media Details Viewer (with long details)
+bringtoforeground
+create ui_videoplaybackcontrolstest ControlsTest
+ControlsTest CreateControls test.3gp EMPXVideoLocal
+pause 100
+ControlsTest AddLongFileDetails
+pause 100
+ControlsTest SetState EPbStatePlaying
+pause 100
+ControlsTest ShowControls
+pause 1000
+ControlsTest ShowMediaDetailsViewer
+pause 3000
+ControlsTest CloseMediaDetailsViewer
+pause 100
+ControlsTest DeleteControls
+delete ControlsTest
+sendtobackground
+pause 2000
+[Endtest]
// End of file
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group/videoplaybackcontrolstest.mmp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/group/videoplaybackcontrolstest.mmp Tue Jan 26 12:00:59 2010 +0200
@@ -2,9 +2,9 @@
* 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 "Symbian Foundation License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: ou1cpsw#8 %
+// Version : %version: e003sa33#8 %
@@ -89,5 +89,6 @@
LIBRARY playbackhelper.lib
LIBRARY RemConInterfaceBase.lib
LIBRARY RemConCoreApi.lib
+LIBRARY ecom.lib
// End of File
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/mpxvpbc_stub.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/mpxvpbc_stub.h Tue Jan 26 12:00:59 2010 +0200
@@ -2,9 +2,9 @@
* 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 "Symbian Foundation License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: ou1cpsw#7 %
+// Version : %version: e003sa33#7 %
@@ -103,6 +103,11 @@
CMPXVideoPlaybackUserInputHandler* UserInputHandler();
+ /**
+ * add long file details
+ */
+ void AddLongFileDetailsL( TBool aHasVideoTrack = ETrue );
+
private:
// Data
TInt iCommand;
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/videoplaybackcontrolstest.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/inc/videoplaybackcontrolstest.h Tue Jan 26 12:00:59 2010 +0200
@@ -2,9 +2,9 @@
* 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 "Symbian Foundation License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: ou1cpsw#8 %
+// Version : %version: e003sa33#8 %
@@ -203,6 +203,12 @@
virtual TInt AddAudioOnlyFileDetails();
/**
+ * Add long file details
+ * @return Symbian OS error code.
+ */
+ virtual TInt AddLongFileDetails();
+
+ /**
* Create controller
*/
void CreateController( const TDesC& aFileName, TInt aMode );
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/mpxvpbc_stub.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/mpxvpbc_stub.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -2,9 +2,9 @@
* 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 "Symbian Foundation License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: ou1cpsw#11 %
+// Version : %version: e003sa33#11 %
// INCLUDES
@@ -35,6 +35,13 @@
#include "mpxcommonvideoplaybackview.hrh"
#include "mpxvideo_debug.h"
+// CONSTANTS
+
+_LIT( KFileTitle, "asdfasdfasdfasdfasdfasd asdfasdfasdfasdfasdfasd" );
+
+const TInt KMaxFileTitleLength = 2048;
+
+
// ============================ MEMBER FUNCTIONS ===================================================
// -------------------------------------------------------------------------------------------------
@@ -324,4 +331,44 @@
}
+// -------------------------------------------------------------------------------------------------
+// CMPXVideoPlaybackContainer::AddLongFileDetailsL()
+// -------------------------------------------------------------------------------------------------
+//
+void CMPXVideoPlaybackContainer::AddLongFileDetailsL( TBool aHasVideoTrack )
+{
+ MPX_DEBUG(_L("CMPXVideoPlaybackContainer::AddFileDetailsL() "));
+
+ iFileDetails->iAudioEnabled = ETrue;
+ iFileDetails->iVideoEnabled = aHasVideoTrack;
+ iFileDetails->iSeekable = ETrue;
+
+ HBufC* temp = HBufC::NewLC(KMaxFileTitleLength);
+ TPtr fileTitlePtr = temp->Des();
+
+ const int loop = 10;
+ for ( int i=0; i<loop; i++ )
+ {
+ fileTitlePtr.Append( KFileTitle() );
+ }
+ iFileDetails->iTitle = fileTitlePtr.Alloc();
+ CleanupStack::PopAndDestroy(); //temp
+
+ if ( iFileDetails->iVideoEnabled )
+ {
+ iFileDetails->iVideoHeight = 176;
+ iFileDetails->iVideoWidth = 144;
+
+ iFileDetails->iBitRate = 8000;
+ iFileDetails->iMimeType = _L("video/3gp").Alloc();
+ }
+
+ if ( iFileDetails->iPlaybackMode == EMPXVideoLiveStreaming )
+ {
+ iFileDetails->iSeekable = EFalse;
+ }
+
+ iControlsController->AddFileDetailsL( iFileDetails );
+}
+
// End of File
--- a/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/videoplaybackcontrolstestblocks.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/videoplaybackcontrolstestblocks.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -2,9 +2,9 @@
* 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 "Symbian Foundation License v1.0"
* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+* at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
*
* Initial Contributors:
* Nokia Corporation - initial contribution.
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: ou1cpsw#8 %
+// Version : %version: e003sa33#8 %
// [INCLUDE FILES] - do not remove
@@ -69,6 +69,7 @@
ENTRY( "SetVolume", CVideoPlaybackControlsTest::SetVolume ),
ENTRY( "SetState", CVideoPlaybackControlsTest::SetState ),
ENTRY( "AddDefaultFileDetails", CVideoPlaybackControlsTest::AddDefaultFileDetails ),
+ ENTRY( "AddLongFileDetails", CVideoPlaybackControlsTest::AddLongFileDetails ),
ENTRY( "AddAudioOnlyFileDetails", CVideoPlaybackControlsTest::AddAudioOnlyFileDetails ),
ENTRY( "SetDuration", CVideoPlaybackControlsTest::SetDuration ),
ENTRY( "SoftkeyPressed", CVideoPlaybackControlsTest::SoftkeyPressed ),
@@ -484,6 +485,19 @@
}
// -------------------------------------------------------------------------------------------------
+// CVideoPlaybackControlsTest::AddLongFileDetails
+// -------------------------------------------------------------------------------------------------
+//
+TInt CVideoPlaybackControlsTest::AddLongFileDetails()
+{
+ MPX_DEBUG(_L("CVideoPlaybackControlsTest::AddLongFileDetails()"));
+
+ TRAPD( result, iContainer->AddLongFileDetailsL() );
+
+ return result;
+}
+
+// -------------------------------------------------------------------------------------------------
// CVideoPlaybackControlsTest::ParseType
// -------------------------------------------------------------------------------------------------
//
--- a/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 56 %
+// Version : %version: 57 %
// Include Files
@@ -1354,14 +1354,18 @@
if ( aMedia.IsSupported( KMPXMediaVideoError ) )
{
TInt error = aMedia.ValueTObjectL<TInt>( KMPXMediaVideoError );
+
// Reset the controls
iContainer->HandleCommandL( EMPXPbvCmdResetControls );
+
// Set the iMediaRequested flag to false
iMediaRequested = EFalse;
+
+ // Handle the plugin error
+ HandlePluginErrorL( error );
+
// Reset the playback state to stopped
iPlaybackState = EPbStateStopped;
- // Handle the plugin error
- HandlePluginErrorL( error );
}
else
{
@@ -1840,7 +1844,13 @@
{
MPX_ENTER_EXIT(_L("CMPXVideoBasePlaybackView::HandleDrmErrorsL()"));
- if ( IsMultiItemPlaylist() )
+ //
+ // If we receive an error when we are initialized, let the DRM UI Handler
+ // process the error. If we have been playing, display the error message
+ // and close the playback
+ //
+ if ( IsMultiItemPlaylist() || iPlaybackState != EPbStateInitialised )
+
{
DisplayErrorMessageL( R_MPX_DRM_RIGHTS_MISSING );
}
--- a/videoplayer_plat/video_player_file_details_dialog_api/inc/MPFileDetailsDialog.h Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayer_plat/video_player_file_details_dialog_api/inc/MPFileDetailsDialog.h Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*/
-// Version : %version: 6 %
+// Version : %version: 7 %
@@ -24,14 +24,14 @@
#define MPFILEDETAILSDIALOG_H
// INCLUDES
-#include <aknPopup.h>
+#include <aknpopup.h>
#ifdef SYMBIAN_BUILD_GCE
#include <videoplayer2.h>
#else
#include <videoplayer.h>
#endif //SYMBIAN_BUILD_GCE
#include <mdaaudiosampleplayer.h>
-#include <MPFileDetails.h>
+#include <mpfiledetails.h>
// FORWARD DECLARATIONS
class CAknDoublePopupMenuStyleListBox;
--- a/videoplayer_plat/videoplayer_startup_api/tsrc/conf/ui_VideoPlayerStartupApiTest.cfg Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayer_plat/videoplayer_startup_api/tsrc/conf/ui_VideoPlayerStartupApiTest.cfg Tue Jan 26 12:00:59 2010 +0200
@@ -128,6 +128,7 @@
allowerrorcodes -1
test ActivationMessage ELaunchVideoToPlayer EMatrixMenu 10000
pause 5000
+allowerrorcodes -1
test KillFusion
delete test
[Endtest]
--- a/videoplayerapp/mpxvideoplayer/src/mpxvideoplayerappui.cpp Mon Jan 18 20:21:12 2010 +0200
+++ b/videoplayerapp/mpxvideoplayer/src/mpxvideoplayerappui.cpp Tue Jan 26 12:00:59 2010 +0200
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: da1mmcf#33 %
+// Version : %version: 34 %
#include <hlplch.h> // Help launcher
@@ -26,7 +26,7 @@
#include <AknQueryDialog.h>
#include <aknview.h>
#include <aknconsts.h>
-#include <akndef.h>
+#include <AknDef.h>
#include <AiwGenericParam.h>
#include <coeutils.h>