From 6be59e5454858a28b7f08efb52b8c1fbb2e360d0 Mon Sep 17 00:00:00 2001 From: "nguyen.vtan" Date: Wed, 20 Jun 2018 11:13:32 +0700 Subject: [PATCH] [DPTTIZEN-3078][MediaPlayer] Add precondition ADAPTIVE_STREAMING_URL Change-Id: I41d2ef0b566750963c908a4d0525c6bea29d302e --- .../resource/tct-testconfig-3.0.zip | Bin 50706 -> 50529 bytes .../resource/tct-testconfig/preconfigure.json | 3 ++- .../resource/tct-testconfig/tct-testconfig.ini | 3 ++- .../resource/tct-testconfig/tests.xml | 3 +++ .../testcase/support/PreconditionUtil.cs | 5 +++++ tool/script/tct-testconfig/preconfigure.json | 3 ++- tool/script/tct-testconfig/tct-testconfig-3.0.zip | Bin 50706 -> 50529 bytes tool/script/tct-testconfig/tct-testconfig.ini | 3 ++- tool/script/tct-testconfig/tests.xml | 3 +++ 9 files changed, 19 insertions(+), 4 deletions(-) diff --git a/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig-3.0.zip b/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig-3.0.zip index fe25108811fc1824d9511d6525be7496dd6edb42..37a114e9d4b400540a80dde0a1b7a1dc890ce683 100755 GIT binary patch delta 4424 zcmcgwTTqi%5GGKx{(@YLNeChQ1`1M15NH)G1Y?AX0;XI_XDr4je>Ek0aOC24@ zLR}y&AXbGr?FgF~^btlO>ms65W<~ zT(;!lDWSZE46G#NY7nENA%=XW;0B?;2q~;GDZ`SNO20@~US3pcEGsErTA`YkoryAQ zLV}MqV~()eXjP(v(4Doj5NFH7VnRD?v+%R6)F)45pAV5;fj@?$@UcA`{dPS>4t;l# zW1>i!>Bgz7swmPC1>QAQSCpvcsj#p|XHbqjTds*?AMjANxriBu)Wv-}#4HPxAH zy!jK3b@C3*)L^!*X4g3^DrRdfV^|XLnmCNUsQVIX3-qUp!@?*jP<}~*j*&@da;BkD zIyaul=Q$^Dtm8g1Tg|+AtyPN-DU0cR7T)96L!^_}hY?T(* zWldO~(1)&MG2tbV--#%!iG)?Y-oukeYv+TCHUmCV#qGt*fhJ$uB(GDZ%Y63oFK$EciQxbmukFLd)2J}4gSySx-4`s3Cw$<$XQjPsW~03ozo~7 zerscbwT|XBjmq*fa?Ea;;mcyB-;`j4oJeh+>e1p~nHvOpihp#WN?=GT#{Dm8hE!q2 zS2eHB<8Gi>=v&1C*pIFM14-a=`&V`Kz@%OtKk5h#NP;`Zq6HHde5(xx$$JfW9pChw zDHLSUAsLEK#JHQ6YA8+!Cm(E;9@jkuI!Ow4|9je{P$UM%9|Gs^%P*loXtZOPc`{yb zYU{~G!8oZ_Pex? zb@OA<+x0A`XfNC1nt{y0Nl>4TAC-Sw;49H`+Gmp$jL&v;%V0li#FOs8xi;o>yn$GL z#%BW?9C931T#TZ@Xg});=D@~h!AroC16jMfSCdRaSHE#aed2h+X z_SeJ0D7_)fUk^s&akMu91HDQ3wYM;wNkObdhS_~eMD^#RwJ!%FeZ|7}lK%PhlZyOe zQ4o<>JnoMdF<=H%P!Gt+H~Oe?ASZ%hmf_|WMR+YEh#Ci?aeE*Qkrxa(43ol^bNu?X zj(S#SV6CPGGB$ENPliS(v#iRziL+`v>+aT}7N1{8NB4y++#@t~P(^ThY>B8COqbKm zY7CV=Ho}xPd2}s97LA4ldZW%zfNORQ9uCgKjG@_N3)7HH?8PfH*_<9Q2HEE%NEl8g zB3Fiz!-*lvW+^qq!4?eJa~ogq$`~Q9XP#b6jnuH*1}#?hq-Yr5gF0J4w-N?* zGL^GtE4zksa12r|{W_JuKB7~b7)PaBUpvGme3GPO?=1fPqi=LB1N1i=R* KstJyZbmbq~-H@>W delta 2653 zcmbVOdrVVT7%#6*&NQ+hbTC(%a+p0QZiX%Zl9 zmq`LGrdaw(fuz^81<7Z$RG2rRXN5Tqtmd^mzim1EXih}xA#*a4_h>mwOMyik?*|o@ zsI*$Orns?W1B2=TR}Z93`L^HG+-GfERDYz$oa%fE494nV^Bl!56pCp&7YHLZXfL&+f z)@(O587Qljs?Vr^tU56$J}rU=R1$bkaACSx>R+M&X4+8MT8a>}0CagWkSZm>Ke&}1 zllgi6l}g~nms|*K6~pGb7(Z78G`H?p#G`7fSj02aMyWwd5j0<_EOd<#qr7&0^q`? zW5NYCMX$uqb%X`^%0S*Jg38X<;QonN91HB|=c8b>VC~(rBy~LKorr^oj`n zr8^XNr`qD{PCo5^*lvpQcc$)iE4x~H&&ml`o>|8x{OTFatMFW1lY?n|9MBJE^N~sN zf=mm+R#Up5x&L$93|!;E@je0T)odSb8>XNd^j?L+#sMjK`^8HNi}jlsU3ak*h6mhk_oyq~$^>rln87W7vOmazm{it%*jN+etxj)b@C)`4R9+`q8c zHWI^n`o%~IYf<)f&nmGET#I5YX8YuD-W>*)+l9z7P&{%p3OsIfC|xJ$*qC_9(R5~v z3m0{RfQ(ULP&S-WC(yem-lxe?0VLi?V1Uq7Z%WSDbqfInQ>81&qf2uk;xQVd8YwFc@VtKCSd zbfl%mY#`AAPc>NTkS8bIafo@yy%EU=?o1^ArseA%8Kya8O@MmOM%sxkj|lzmgOQC`#N$fz(lCvrOh`*P;fgEFV9T5CrAYRZ2}WMn@9os_kS+A=rv8M$;CGm o4kwYmxA?@1LwW~{J0$RIGLl?Y<3+%lF$9c5B~RiePvV(>000K8I{*Lx diff --git a/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/preconfigure.json b/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/preconfigure.json index cc345d0..8ced9b5 100755 --- a/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/preconfigure.json +++ b/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/preconfigure.json @@ -33,5 +33,6 @@ "WPS_PBC_AP":"Set name of available AP with WPS PBC function", "WPS_PIN_AP":"Set name of available AP with WPS PIN function", "PIN_NUMBER_OF_WPS_PIN_AP":"Set pin number of WPS_PIN_AP. The pin number should be generated with the checksum defined in WSC spec (Wi-Fi Simple Configuration Technical Specification). If you are not familiar with it, please use an example number, 47363533.", - "STREAMING_URI":"Set the streaming uri such as http://www.samsung.com/xx/xx/aa.mp4" + "STREAMING_URI":"Set the streaming uri such as http://www.samsung.com/xx/xx/aa.mp4", + "ADAPTIVE_STREAMING_URL":"Set the adaptive streaming url" }] diff --git a/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/tct-testconfig.ini b/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/tct-testconfig.ini index fbb67d2..ff39429 100755 --- a/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/tct-testconfig.ini +++ b/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/tct-testconfig.ini @@ -53,4 +53,5 @@ HERE_MAPS_PROVIDER_KEY_FOR_XAMARIN = Set the HERE_MAPS_PROVIDER_KEY.(for xamarin # MediaPlayer test key settings [Tizen.MediaPlayer.Tests] -STREAMING_URI = set the uri in here. ex>http://www.samsung.com/xx/xx/aa.mp4 \ No newline at end of file +STREAMING_URI = set the uri in here. ex>http://www.samsung.com/xx/xx/aa.mp4 +ADAPTIVE_STREAMING_URL = set the url in here diff --git a/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/tests.xml b/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/tests.xml index f65a029..8102fde 100755 --- a/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/tests.xml +++ b/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig/tests.xml @@ -395,6 +395,9 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install Set the streaming uri such as http://www.samsung.com/xx/xx/aa.mp4. + + Set the adaptive streaming uri. + diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/support/PreconditionUtil.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/support/PreconditionUtil.cs index 11e78f6..e839c88 100644 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/support/PreconditionUtil.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/support/PreconditionUtil.cs @@ -23,6 +23,7 @@ namespace Tizen.Multimedia.Tests public class PreconditionUtils { public static string STREAMING_URI = null; + public static string ADAPTIVE_STREAMING_URL = null; public static void SetPrecondition() { @@ -38,6 +39,10 @@ namespace Tizen.Multimedia.Tests resultArray[index + 1] = resultArray[index + 1].Replace("\\", ""); STREAMING_URI = resultArray[index + 1]; break; + case "ADAPTIVE_STREAMING_URL": + resultArray[index + 2] = resultArray[index + 2].Replace("\\", ""); + ADAPTIVE_STREAMING_URL = resultArray[index + 2]; + break; default: break; } diff --git a/tool/script/tct-testconfig/preconfigure.json b/tool/script/tct-testconfig/preconfigure.json index cc345d0..8ced9b5 100755 --- a/tool/script/tct-testconfig/preconfigure.json +++ b/tool/script/tct-testconfig/preconfigure.json @@ -33,5 +33,6 @@ "WPS_PBC_AP":"Set name of available AP with WPS PBC function", "WPS_PIN_AP":"Set name of available AP with WPS PIN function", "PIN_NUMBER_OF_WPS_PIN_AP":"Set pin number of WPS_PIN_AP. The pin number should be generated with the checksum defined in WSC spec (Wi-Fi Simple Configuration Technical Specification). If you are not familiar with it, please use an example number, 47363533.", - "STREAMING_URI":"Set the streaming uri such as http://www.samsung.com/xx/xx/aa.mp4" + "STREAMING_URI":"Set the streaming uri such as http://www.samsung.com/xx/xx/aa.mp4", + "ADAPTIVE_STREAMING_URL":"Set the adaptive streaming url" }] diff --git a/tool/script/tct-testconfig/tct-testconfig-3.0.zip b/tool/script/tct-testconfig/tct-testconfig-3.0.zip index fe25108811fc1824d9511d6525be7496dd6edb42..37a114e9d4b400540a80dde0a1b7a1dc890ce683 100755 GIT binary patch delta 4424 zcmcgwTTqi%5GGKx{(@YLNeChQ1`1M15NH)G1Y?AX0;XI_XDr4je>Ek0aOC24@ zLR}y&AXbGr?FgF~^btlO>ms65W<~ zT(;!lDWSZE46G#NY7nENA%=XW;0B?;2q~;GDZ`SNO20@~US3pcEGsErTA`YkoryAQ zLV}MqV~()eXjP(v(4Doj5NFH7VnRD?v+%R6)F)45pAV5;fj@?$@UcA`{dPS>4t;l# zW1>i!>Bgz7swmPC1>QAQSCpvcsj#p|XHbqjTds*?AMjANxriBu)Wv-}#4HPxAH zy!jK3b@C3*)L^!*X4g3^DrRdfV^|XLnmCNUsQVIX3-qUp!@?*jP<}~*j*&@da;BkD zIyaul=Q$^Dtm8g1Tg|+AtyPN-DU0cR7T)96L!^_}hY?T(* zWldO~(1)&MG2tbV--#%!iG)?Y-oukeYv+TCHUmCV#qGt*fhJ$uB(GDZ%Y63oFK$EciQxbmukFLd)2J}4gSySx-4`s3Cw$<$XQjPsW~03ozo~7 zerscbwT|XBjmq*fa?Ea;;mcyB-;`j4oJeh+>e1p~nHvOpihp#WN?=GT#{Dm8hE!q2 zS2eHB<8Gi>=v&1C*pIFM14-a=`&V`Kz@%OtKk5h#NP;`Zq6HHde5(xx$$JfW9pChw zDHLSUAsLEK#JHQ6YA8+!Cm(E;9@jkuI!Ow4|9je{P$UM%9|Gs^%P*loXtZOPc`{yb zYU{~G!8oZ_Pex? zb@OA<+x0A`XfNC1nt{y0Nl>4TAC-Sw;49H`+Gmp$jL&v;%V0li#FOs8xi;o>yn$GL z#%BW?9C931T#TZ@Xg});=D@~h!AroC16jMfSCdRaSHE#aed2h+X z_SeJ0D7_)fUk^s&akMu91HDQ3wYM;wNkObdhS_~eMD^#RwJ!%FeZ|7}lK%PhlZyOe zQ4o<>JnoMdF<=H%P!Gt+H~Oe?ASZ%hmf_|WMR+YEh#Ci?aeE*Qkrxa(43ol^bNu?X zj(S#SV6CPGGB$ENPliS(v#iRziL+`v>+aT}7N1{8NB4y++#@t~P(^ThY>B8COqbKm zY7CV=Ho}xPd2}s97LA4ldZW%zfNORQ9uCgKjG@_N3)7HH?8PfH*_<9Q2HEE%NEl8g zB3Fiz!-*lvW+^qq!4?eJa~ogq$`~Q9XP#b6jnuH*1}#?hq-Yr5gF0J4w-N?* zGL^GtE4zksa12r|{W_JuKB7~b7)PaBUpvGme3GPO?=1fPqi=LB1N1i=R* KstJyZbmbq~-H@>W delta 2653 zcmbVOdrVVT7%#6*&NQ+hbTC(%a+p0QZiX%Zl9 zmq`LGrdaw(fuz^81<7Z$RG2rRXN5Tqtmd^mzim1EXih}xA#*a4_h>mwOMyik?*|o@ zsI*$Orns?W1B2=TR}Z93`L^HG+-GfERDYz$oa%fE494nV^Bl!56pCp&7YHLZXfL&+f z)@(O587Qljs?Vr^tU56$J}rU=R1$bkaACSx>R+M&X4+8MT8a>}0CagWkSZm>Ke&}1 zllgi6l}g~nms|*K6~pGb7(Z78G`H?p#G`7fSj02aMyWwd5j0<_EOd<#qr7&0^q`? zW5NYCMX$uqb%X`^%0S*Jg38X<;QonN91HB|=c8b>VC~(rBy~LKorr^oj`n zr8^XNr`qD{PCo5^*lvpQcc$)iE4x~H&&ml`o>|8x{OTFatMFW1lY?n|9MBJE^N~sN zf=mm+R#Up5x&L$93|!;E@je0T)odSb8>XNd^j?L+#sMjK`^8HNi}jlsU3ak*h6mhk_oyq~$^>rln87W7vOmazm{it%*jN+etxj)b@C)`4R9+`q8c zHWI^n`o%~IYf<)f&nmGET#I5YX8YuD-W>*)+l9z7P&{%p3OsIfC|xJ$*qC_9(R5~v z3m0{RfQ(ULP&S-WC(yem-lxe?0VLi?V1Uq7Z%WSDbqfInQ>81&qf2uk;xQVd8YwFc@VtKCSd zbfl%mY#`AAPc>NTkS8bIafo@yy%EU=?o1^ArseA%8Kya8O@MmOM%sxkj|lzmgOQC`#N$fz(lCvrOh`*P;fgEFV9T5CrAYRZ2}WMn@9os_kS+A=rv8M$;CGm o4kwYmxA?@1LwW~{J0$RIGLl?Y<3+%lF$9c5B~RiePvV(>000K8I{*Lx diff --git a/tool/script/tct-testconfig/tct-testconfig.ini b/tool/script/tct-testconfig/tct-testconfig.ini index fbb67d2..ff39429 100755 --- a/tool/script/tct-testconfig/tct-testconfig.ini +++ b/tool/script/tct-testconfig/tct-testconfig.ini @@ -53,4 +53,5 @@ HERE_MAPS_PROVIDER_KEY_FOR_XAMARIN = Set the HERE_MAPS_PROVIDER_KEY.(for xamarin # MediaPlayer test key settings [Tizen.MediaPlayer.Tests] -STREAMING_URI = set the uri in here. ex>http://www.samsung.com/xx/xx/aa.mp4 \ No newline at end of file +STREAMING_URI = set the uri in here. ex>http://www.samsung.com/xx/xx/aa.mp4 +ADAPTIVE_STREAMING_URL = set the url in here diff --git a/tool/script/tct-testconfig/tests.xml b/tool/script/tct-testconfig/tests.xml index f65a029..8102fde 100755 --- a/tool/script/tct-testconfig/tests.xml +++ b/tool/script/tct-testconfig/tests.xml @@ -395,6 +395,9 @@ The tct-bt-helper is included in the tct-bluetooth-tizen-tests package. Install Set the streaming uri such as http://www.samsung.com/xx/xx/aa.mp4. + + Set the adaptive streaming uri. + -- 2.7.4