diff -r 96612d01cf9f -r 6711b85517b7 videocollection/mpxmyvideoscollection/tsrc/mpxmvcolltest/conf/VCXMyVideosCollectionPluginTestSorting.cfg
--- 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