--- 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