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