--- a/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/conf/mpxvideoplayertest.cfg Fri Feb 19 22:52:52 2010 +0200
+++ b/videoplayerapp/mpxvideoplayer/tsrc/ut_mpxvideoplayertest/conf/mpxvideoplayertest.cfg Fri Mar 12 15:43:00 2010 +0200
@@ -23,14 +23,10 @@
NewFile 1
NewFileAfterError 2
-NO_AP 0
-AP_GPRS_1 3
+AP_USEDEFAULT -1
+
AP_GPRS_2 4
AP_WLAN_1 5
-AP_WLAN_2 6
-AP_SNAP 7
-AP_QUERY 8
-AP_QUERY2 9
LocalLinks 0
StreamingLinks 1
@@ -115,8 +111,7 @@
title 3) AppUiEngine OpenFile w/ File Handle - SDP
create mpxvideoplayertest enginetest
enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseHandle sdp_test.sdp EAddPath ESdpFile AP_GPRS_1
+enginetest OpenFile UseHandle sdp_test.sdp EAddPath ESdpFile AP_USEDEFAULT
delete enginetest
pause 1000
[Endtest]
@@ -130,8 +125,7 @@
title 4) AppUiEngine OpenFile w/ File Handle - RAM file
create mpxvideoplayertest enginetest
enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseHandle test_streaming.ram EAddPath ERamFile AP_GPRS_1 StreamingLinks
+enginetest OpenFile UseHandle test_streaming.ram EAddPath ERamFile AP_USEDEFAULT StreamingLinks
delete enginetest
pause 1000
[Endtest]
@@ -145,8 +139,7 @@
title 5) AppUiEngine OpenFile w/ File Handle - RAM file
create mpxvideoplayertest enginetest
enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseHandle test_local.ram EAddPath ERamFile AP_GPRS_1 LocalLinks
+enginetest OpenFile UseHandle test_local.ram EAddPath ERamFile AP_USEDEFAULT LocalLinks
delete enginetest
pause 1000
[Endtest]
@@ -154,7 +147,6 @@
[Test]
//
// Test the Access Point Selection with OpenFile file handle API
-// - Default GPRS Access Point
// - GenericParameters with WLAN Access Point
// - Launch an embedded SDP file
// - WLAN access point should be used
@@ -162,7 +154,6 @@
title 6) AppUiEngine Access Point Selection
create mpxvideoplayertest enginetest
enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint AP_GPRS_1
enginetest SetGenericParamAccessPoint AP_WLAN_1
enginetest OpenFile UseHandle sdp_test.sdp EAddPath ESdpFile AP_WLAN_1
delete enginetest
@@ -172,33 +163,13 @@
[Test]
//
// Test the Access Point Selection with OpenFile file handle API
-// - Default GPRS Access Point
// - GenericParameters with GPRS Access Point
// - Launch an embedded SDP file
-// - Default access point should be used
+// - GPRS access point should be used
//
title 7) AppUiEngine Access Point Selection
create mpxvideoplayertest enginetest
enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest SetGenericParamAccessPoint AP_GPRS_2
-enginetest OpenFile UseHandle sdp_test.sdp EAddPath ESdpFile AP_GPRS_1
-delete enginetest
-pause 1000
-[Endtest]
-
-[Test]
-//
-// Test the Access Point Selection with OpenFile file handle API
-// - No Default Access Point
-// - GenericParameters with GPRS Access Point
-// - Launch an embedded SDP file
-// - Default access point should be used
-//
-title 8) AppUiEngine Access Point Selection
-create mpxvideoplayertest enginetest
-enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint NO_AP
enginetest SetGenericParamAccessPoint AP_GPRS_2
enginetest OpenFile UseHandle sdp_test.sdp EAddPath ESdpFile AP_GPRS_2
delete enginetest
@@ -207,28 +178,10 @@
[Test]
//
-// Test the Access Point Selection with OpenFile file handle API
-// - No Default Access Point
-// - No GenericParameters
-// - Launch an embedded SDP file
-// - Use the Internet SNAP Access Point for STIF Testing
-//
-title 9) AppUiEngine Access Point Selection
-create mpxvideoplayertest enginetest
-enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint NO_AP
-enginetest SetQueryAccessPoint AP_SNAP
-enginetest OpenFile UseHandle sdp_test.sdp EAddPath ESdpFile AP_SNAP
-delete enginetest
-pause 1000
-[Endtest]
-
-[Test]
-//
// Test the OpenFile with a file name API
// - Launch a local clip
//
-title 10) AppUiEngine OpenFile w/ File Name - Local
+title 8) AppUiEngine OpenFile w/ File Name - Local
create mpxvideoplayertest enginetest
enginetest CreateEngine Embedded
enginetest OpenFile UseName local.3gp EAddPath ELocalFile
@@ -242,11 +195,10 @@
// - No GenericParameters
// - Launch an SDP file
//
-title 11) AppUiEngine OpenFile w/ File Name - SDP
+title 9) AppUiEngine OpenFile w/ File Name - SDP
create mpxvideoplayertest enginetest
enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseName sdp_test.sdp EAddPath ESdpFile AP_GPRS_1
+enginetest OpenFile UseName sdp_test.sdp EAddPath ESdpFile AP_USEDEFAULT
delete enginetest
pause 1000
[Endtest]
@@ -257,28 +209,10 @@
// - No GenericParameters
// - Launch an RAM file with streaming links
//
-title 12) AppUiEngine OpenFile w/ File Name - RAM file
+title 10) AppUiEngine OpenFile w/ File Name - RAM file
create mpxvideoplayertest enginetest
enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseName test_streaming.ram EAddPath ERamFile AP_GPRS_1 StreamingLinks
-delete enginetest
-pause 1000
-[Endtest]
-
-[Test]
-//
-// Test the OpenFile with a file name API
-// - No GenericParameters
-// - Launch an URL
-// - Test the PrepareCloseMpx API
-//
-title 13) AppUiEngine OpenFile w/ URL
-create mpxvideoplayertest enginetest
-enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseName rtsp:\/\/stream.3gp ENoPath EUrl AP_GPRS_1
-enginetest PrepareCloseMpx
+enginetest OpenFile UseName test_streaming.ram EAddPath ERamFile AP_USEDEFAULT StreamingLinks
delete enginetest
pause 1000
[Endtest]
@@ -287,7 +221,7 @@
//
// Test the StartStandAloneL method
//
-title 14) AppUiEngine StartStandAloneL
+title 11) AppUiEngine StartStandAloneL
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest StartStandAlone
@@ -299,7 +233,7 @@
//
// Test the HandleCollectionMessage method
//
-title 15) AppUiEngine HandleCollectionMessage
+title 12) AppUiEngine HandleCollectionMessage
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest HandleCollectionMessage EPathChanged EMcPathChangedByOpen EMcItemOpened
@@ -311,7 +245,7 @@
//
// Test the HandleCollectionMedia method
//
-title 16) AppUiEngine HandleCollectionMedia
+title 13) AppUiEngine HandleCollectionMedia
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest HandleCollectionMedia local.3gp EAddPath
@@ -330,7 +264,7 @@
// - Call HandleSoftKeyL
// - AppUi should StepBackCollectionPathL
//
-title 17) AppUiEngine HandleSoftkeyBackL
+title 14) AppUiEngine HandleSoftkeyBackL
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest HandleSoftkeyBack ViewDepth_1
@@ -347,7 +281,7 @@
// - Call HandleOpenL
// - PlaybackUtility should receive InitL with Playlist
//
-title 18) AppUiEngine HandleOpenPlaylist
+title 15) AppUiEngine HandleOpenPlaylist
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest StartStandAlone
@@ -363,7 +297,7 @@
// - Call HandleOpenL
// - CollectionUtility should receive OpenL with new collection path
//
-title 19) AppUiEngine HandleOpenMedia
+title 16) AppUiEngine HandleOpenMedia
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest StartStandAlone
@@ -374,35 +308,10 @@
[Test]
//
-// Test ProcessActivationMessageL
-// - Test with small Message, function Leaves
-// - Test with Open Internet Videos, View Utility receives view activation
-// - Test with Open Video Storage, View Utility receives view activation
-// - Test with Matrix Launch Video, local file callbacks are received
-// - Test with Notification Launch Video, local file callbacks are received
-//
-title 20) AppUiEngine ProcessActivationMessageL
-create mpxvideoplayertest enginetest
-enginetest CreateEngine StandAlone
-enginetest StartStandAlone
-enginetest ProcessActivationMessage ENoMsg
-enginetest ProcessActivationMessage EMatrix EOpenInternetVideos
-enginetest ProcessActivationMessage EMatrix EOpenVideoStorage
-enginetest ProcessActivationMessage EMatrix ELaunchVideo local.3gp EAddPath EDefined
-enginetest ProcessActivationMessage EMatrix ELaunchVideo local.3gp EAddPath EUndefined
-allownextresult KErrNotFound
-enginetest ProcessActivationMessage EMatrix ELaunchVideo not_fuond.3gp EAddPath EDefined
-enginetest ProcessActivationMessage EMatrix ELaunchVideo not_fuond.3gp EAddPath EUndefined
-delete enginetest
-pause 1000
-[Endtest]
-
-[Test]
-//
// Test HandleViewActivation
// - No callback is received
//
-title 21) AppUiEngine HandleViewActivation
+title 17) AppUiEngine HandleViewActivation
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest StartStandAlone
@@ -428,10 +337,9 @@
// - Open with document name and file that doesn't exist
// - file exists is false
//
-title 22) AppUiEngine ProcessCommandParameters
+title 18) AppUiEngine ProcessCommandParameters
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
-enginetest ProcessCommandParameters EApaCommandTail EMatrix EOpenVideoStorage
enginetest ProcessCommandParameters EApaCommandRun
enginetest ProcessCommandParameters EApaCommandOpen rtsp:\/\/stream.3gp ENoPath ETrue
enginetest ProcessCommandParameters EApaCommandOpen local.3gp EAddPath ETrue
@@ -442,53 +350,14 @@
[Test]
//
-// Test Access Point Dialog withSelection
-// - No GenericParameters
-// - No Default Access Point
-// - Set Query Access Point to 0 to simulate a cancel button press
-// - Launch an embedded SDP file
-// - OpenFile leaves with KErrCancel
-//
-title 23) AppUiEngine Access Point Selection
-create mpxvideoplayertest enginetest
-enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint NO_AP
-enginetest SetQueryAccessPoint AP_QUERY
-enginetest OpenFile UseHandle sdp_test.sdp EAddPath ESdpFile AP_QUERY2
-delete enginetest
-pause 1000
-[Endtest]
-
-[Test]
-//
-// Test Access Point Dialog Cancel without Selection
-// - No GenericParameters
-// - No Default Access Point
-// - Set Query Access Point to 0 to simulate a cancel button press
-// - Launch an embedded SDP file
-// - OpenFile leaves with KErrCancel
-//
-title 24) AppUiEngine Access Point Selection
-create mpxvideoplayertest enginetest
-enginetest CreateEngine Embedded
-enginetest SetDefaultAccessPoint NO_AP
-enginetest SetQueryAccessPoint NO_AP
-enginetest OpenFile UseHandle sdp_test.sdp EAddPath ESdpFile KErrCancel
-delete enginetest
-pause 1000
-[Endtest]
-
-[Test]
-//
// Test Playlist functionality
// Open Multilink ram file
// HandleCollectionMessage for playlist
//
-title 25) AppUiEngine HandleCollectionMessage RAM Playlist
+title 19) AppUiEngine HandleCollectionMessage RAM Playlist
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseHandle test_multilocal.ram EAddPath EMultiLinkFile AP_GPRS_1 LocalLinks
+enginetest OpenFile UseHandle test_multilocal.ram EAddPath EMultiLinkFile AP_USEDEFAULT LocalLinks
enginetest HandleCollectionMessage EPathChanged EMcPathChangedByOpen EMcContainerOpened
delete enginetest
pause 1000
@@ -500,11 +369,10 @@
// Open Multilink ASX file
// HandleCollectionMessage for playlist
//
-title 26) AppUiEngine HandleCollectionMessage ASX Playlist
+title 20) AppUiEngine HandleCollectionMessage ASX Playlist
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseHandle test_multilink_v2.asx EAddPath EMultiLinkFile AP_GPRS_1 StreamingLinks
+enginetest OpenFile UseHandle test_multilink_v2.asx EAddPath EMultiLinkFile AP_USEDEFAULT StreamingLinks
enginetest HandleCollectionMessage EPathChanged EMcPathChangedByOpen EMcContainerOpened
delete enginetest
pause 1000
@@ -516,11 +384,10 @@
// Open Multilink ASX file
// HandleCollectionMessage for playlist
//
-title 27) AppUiEngine UpdatePbPluginMediaL ASX V3
+title 21) AppUiEngine UpdatePbPluginMediaL ASX V3
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
-enginetest SetDefaultAccessPoint AP_GPRS_1
-enginetest OpenFile UseHandle test_seekSingle_v3.asx EAddPath EAsxFile AP_GPRS_1 StreamingLinks
+enginetest OpenFile UseHandle test_seekSingle_v3.asx EAddPath EAsxFile AP_USEDEFAULT StreamingLinks
delete enginetest
pause 1000
[Endtest]
@@ -530,10 +397,9 @@
// Test OpenMediaL functionality
// Open valid Media
//
-title 28) AppUiEngine OpenMediaL
+title 22) AppUiEngine OpenMediaL
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
-enginetest SetDefaultAccessPoint AP_GPRS_1
enginetest OpenMedia local.3gp EAddPath
delete enginetest
pause 1000
@@ -544,10 +410,9 @@
// Test OpenMediaL functionality
// Open bad Media
//
-title 29) AppUiEngine OpenMediaL bad file path
+title 23) AppUiEngine OpenMediaL bad file path
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
-enginetest SetDefaultAccessPoint AP_GPRS_1
enginetest OpenMedia no_existing_file.ram EAddPath
delete enginetest
pause 1000
@@ -557,7 +422,7 @@
//
// Test View Depth functionality
//
-title 30) AppUiEngine GetView Depth
+title 24) AppUiEngine GetView Depth
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest GetViewDepth ViewDepth_2
@@ -571,40 +436,10 @@
// - Launch a stand alone instance of engine
// - Handle a message to start feeds PDL playback
//
-title 31) AppUiEngine Feeds PDL
+title 25) AppUiEngine Feeds PDL
create mpxvideoplayertest enginetest
enginetest CreateEngine StandAlone
enginetest HandleCollectionMedia local.3gp EAddPath DownloadId_1
delete enginetest
pause 1000
[Endtest]
-
-[Test]
-//
-// Test the handling of messages
-//
-title 32) AppUiEngine Messages
-create mpxvideoplayertest enginetest
-enginetest CreateEngine StandAlone
-enginetest HandleMessageActivationMessageL ENoMsg EOpenInternetVideos EFalse
-enginetest HandleMessageActivationMessageL EMatrix EOpenInternetVideos EFalse
-delete enginetest
-pause 1000
-[Endtest]
-
-[Test]
-//
-// Test the handling of messages
-// - Set the active view type to playback view type
-// - Send Message from KVideoPlayerVodStartPlayer
-// - Message should be ignored
-//
-title 33) AppUiEngine Messages
-create mpxvideoplayertest enginetest
-enginetest CreateEngine StandAlone
-enginetest HandleMessageActivationMessageL ENoMsg EOpenInternetVideos ETrue
-enginetest HandleMessageActivationMessageL EMatrix EOpenInternetVideos ETrue
-delete enginetest
-pause 1000
-[Endtest]
-