diff -r 96612d01cf9f -r 6711b85517b7 videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestSearchR3.cfg --- 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