[DPTTIZEN-3078][MediaPlayer] Add precondition ADAPTIVE_STREAMING_URL

Change-Id: I41d2ef0b566750963c908a4d0525c6bea29d302e

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 fe25108..37a114e 100755 (executable)
Binary files a/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig-3.0.zip and b/release/csharp-tct_5.0_dotnet/csharp-tct_5.0_dotnet/resource/tct-testconfig-3.0.zip differ

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 (executable)
--- 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 (executable)
--- 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 (executable)
--- 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
             <step order="1">
               <step_desc> Set the streaming uri such as http://www.samsung.com/xx/xx/aa.mp4.</step_desc>
             </step>
+           <step order="2">
+              <step_desc> Set the adaptive streaming uri.</step_desc>
+            </step>
           </steps>
           <test_script_entry test_script_expected_result="0" timeout="90"/>
         </description>

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 (file)
--- 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 (executable)
--- 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 fe25108..37a114e 100755 (executable)
Binary files a/tool/script/tct-testconfig/tct-testconfig-3.0.zip and b/tool/script/tct-testconfig/tct-testconfig-3.0.zip differ

diff --git a/tool/script/tct-testconfig/tct-testconfig.ini b/tool/script/tct-testconfig/tct-testconfig.ini
index fbb67d2..ff39429 100755 (executable)
--- 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 (executable)
--- 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
             <step order="1">
               <step_desc> Set the streaming uri such as http://www.samsung.com/xx/xx/aa.mp4.</step_desc>
             </step>
+           <step order="2">
+              <step_desc> Set the adaptive streaming uri.</step_desc>
+            </step>
           </steps>
           <test_script_entry test_script_expected_result="0" timeout="90"/>
         </description>