From 9a64f135570098eb9b15f9e81701f8bc34b37f38 Mon Sep 17 00:00:00 2001 From: nam Date: Mon, 2 Jul 2018 14:15:56 +0900 Subject: [PATCH] [MediaPlayer][Non-ACR] fix the wrong descriptions Change-Id: I03948a120f4fd11785394dbad265883156dbb33f --- .../resource/tct-testconfig/preconfigure.json | 2 +- .../resource/tct-testconfig/tct-testconfig.ini | 2 +- .../testcase/TSAdaptiveVariants.cs | 2 +- .../testcase/TSAudioEffect.cs | 4 +-- .../testcase/TSDownloadProgress.cs | 2 +- .../testcase/TSMediaBufferSource.cs | 4 +-- .../TSMediaStreamConfiguration.Assigned.cs | 4 +-- .../testcase/TSMediaStreamSource.WithPlayer.cs | 2 +- .../Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs | 40 +++++++++++----------- .../testcase/TSSphericalVideo.cs | 4 +-- .../testcase/support/PreconditionUtil.cs | 6 ++-- tool/script/tct-testconfig/preconfigure.json | 2 +- tool/script/tct-testconfig/tct-testconfig.ini | 2 +- 13 files changed, 38 insertions(+), 38 deletions(-) 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 8ced9b5..d2ad8cd 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 @@ -34,5 +34,5 @@ "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", - "ADAPTIVE_STREAMING_URL":"Set the adaptive streaming url" + "ADAPTIVE_STREAMING_URI":"Set the adaptive streaming uri" }] 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 ff39429..e76bbc2 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 @@ -54,4 +54,4 @@ 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 -ADAPTIVE_STREAMING_URL = set the url in here +ADAPTIVE_STREAMING_URI = set the uri in here diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAdaptiveVariants.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAdaptiveVariants.cs index 78fe8af..1f3e5ce 100644 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAdaptiveVariants.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAdaptiveVariants.cs @@ -15,7 +15,7 @@ namespace Tizen.Multimedia.Tests { PreconditionUtils.SetPrecondition(); } - internal static readonly MediaUriSource AdaptiveStreamingSource = new MediaUriSource(PreconditionUtils.ADAPTIVE_STREAMING_URL); + internal static readonly MediaUriSource AdaptiveStreamingSource = new MediaUriSource(PreconditionUtils.ADAPTIVE_STREAMING_URI); [Test] [Category("P1")] diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAudioEffect.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAudioEffect.cs index 7949d34..7694c66 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAudioEffect.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSAudioEffect.cs @@ -39,10 +39,10 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] - [Description("Indexer throws if the index is invalid")] + [Description("Indexer throws exception if the index is invalid")] [Property("SPEC", "Tizen.Multimedia.AudioEffect.this[int] A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void this_THROWS_IF_INDEX_INVALID() { diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSDownloadProgress.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSDownloadProgress.cs index 458eb17..62ac8e5 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSDownloadProgress.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSDownloadProgress.cs @@ -62,7 +62,7 @@ namespace Tizen.Multimedia.Tests [Description("GetDownloadProgress current position")] [Property("SPEC", "Tizen.Multimedia.DownloadProgress.Current A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MR")] + [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public async Task Current_CHECK() { diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaBufferSource.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaBufferSource.cs index 7a17943..26c12ee 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaBufferSource.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaBufferSource.cs @@ -64,10 +64,10 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] - [Description("Constructor throws if the specified buffer is null")] + [Description("Constructor throws exceptions if the specified buffer is null")] [Property("SPEC", "Tizen.Multimedia.MediaBufferSource.MediaBufferSource C")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "CONSTX")] [Property("COVPARAM", "byte[]")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public static void MediaBufferSource_THROWS_IF_PARAM_NULL() diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamConfiguration.Assigned.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamConfiguration.Assigned.cs index d410a5c..6b49001 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamConfiguration.Assigned.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamConfiguration.Assigned.cs @@ -41,7 +41,7 @@ namespace Tizen.Multimedia.Tests [Description("BufferMaxSize negative test")] [Property("SPEC", "Tizen.Multimedia.MediaStreamConfiguration.BufferMaxSize A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void BufferMaxSize_THROWS_IF_VALUE_IS_ZERO() { @@ -106,7 +106,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("SeekingOccurred test")] - [Property("SPEC", "Tizen.Multimedia.MediaStreamConfiguration.SeekingOccurred A")] + [Property("SPEC", "Tizen.Multimedia.MediaStreamConfiguration.SeekingOccurred E")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs index 6bfb594..9aed7b3 100644 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs @@ -161,7 +161,7 @@ namespace Tizen.Multimedia.Tests [Description("MediaStreamSource can't be assigned to multiple player at one time")] [Property("SPEC", "Tizen.Multimedia.MediaStreamSource.MediaStreamSource C")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "PDV")] + [Property("CRITERIA", "CONSTX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] [Property("COVPARAM", "AudioMediaFormat")] public void MediaStreamSource_NOT_ASSIGNED_TO_MULTIPLE() diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs index be6bc92..a9313f8 100644 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs @@ -367,10 +367,10 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] - [Description("AudioLatencyMode throws if the specified value is invalid")] + [Description("AudioLatencyMode throws exception if the specified value is invalid")] [Property("SPEC", "Tizen.Multimedia.Player.AudioLatencyMode A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void AudioLatencyMode_THROWS_IF_VALUE_INVALID() { @@ -444,7 +444,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("AudioEffect default value")] - [Property("SPEC", "Tizen.Multimedia.Player.AudioEffect M")] + [Property("SPEC", "Tizen.Multimedia.Player.AudioEffect A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -504,10 +504,10 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] - [Description("Cookie to set throws if the specified value is null")] + [Description("Cookie to set throws exception if the specified value is null")] [Property("SPEC", "Tizen.Multimedia.Player.Cookie A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void Cookie_THROWS_IF_NULL() { @@ -516,10 +516,10 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] - [Description("Cookie to set throws if the player is in a not valid state")] + [Description("Cookie to set throws exception if the player is in a not valid state")] [Property("SPEC", "Tizen.Multimedia.Player.Cookie A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public async Task Cookie_THROWS_IF_STATE_NOT_VALID() { @@ -561,10 +561,10 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] - [Description("UserAgent to set throws if the specified value is null")] + [Description("UserAgent to set throws exception if the specified value is null")] [Property("SPEC", "Tizen.Multimedia.Player.UserAgent A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void UserAgent_THROWS_IF_NULL() { @@ -573,10 +573,10 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] - [Description("UserAgent to set throws if the player is in a not valid state")] + [Description("UserAgent to set throws exception if the player is in a not valid state")] [Property("SPEC", "Tizen.Multimedia.Player.UserAgent A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public async Task UserAgent_THROWS_IF_STATE_NOT_VALID() { @@ -621,7 +621,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] - [Description("BufferingTime throws if out of range")] + [Description("BufferingTime throws exception if out of range")] [Property("SPEC", "Tizen.Multimedia.Player.BufferingTime A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PEX")] @@ -894,7 +894,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("SubtitleUpdated raise test")] - [Property("SPEC", "Tizen.Multimedia.Player.SubtitleUpdated A")] + [Property("SPEC", "Tizen.Multimedia.Player.SubtitleUpdated E")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -961,10 +961,10 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] - [Description("Display throws if the player to be set is not in the idle state")] + [Description("Display throws exception if the player to be set is not in the idle state")] [Property("SPEC", "Tizen.Multimedia.Player.Display A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public async Task Display_THROWS_IF_NOT_VALID_STATE() { @@ -984,7 +984,7 @@ namespace Tizen.Multimedia.Tests [Description("Display can't be assigned to multiple players")] [Property("SPEC", "Tizen.Multimedia.Player.Display A")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] + [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] public void Display_THROWS_IF_SET_TO_MULTIPLE() { @@ -1296,7 +1296,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("PlaybackCompleted test")] - [Property("SPEC", "Tizen.Multimedia.Player.PlaybackCompleted M")] + [Property("SPEC", "Tizen.Multimedia.Player.PlaybackCompleted E")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -1324,7 +1324,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("VideoFrameDecoded test")] - [Property("SPEC", "Tizen.Multimedia.Player.VideoFrameDecoded A")] + [Property("SPEC", "Tizen.Multimedia.Player.VideoFrameDecoded E")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -1356,7 +1356,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("VideoStreamChanged test")] - [Property("SPEC", "Tizen.Multimedia.Player.VideoStreamChanged A")] + [Property("SPEC", "Tizen.Multimedia.Player.VideoStreamChanged E")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -1384,7 +1384,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("PlaybackInterrupted test")] - [Property("SPEC", "Tizen.Multimedia.Player.PlaybackInterrupted A")] + [Property("SPEC", "Tizen.Multimedia.Player.PlaybackInterrupted E")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "EVL")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSSphericalVideo.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSSphericalVideo.cs index 18b02b8..dfaf176 100755 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSSphericalVideo.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSSphericalVideo.cs @@ -66,7 +66,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("IsSphericalContent throws if the video is spherical content")] - [Property("SPEC", "Tizen.Multimedia.SphericalVideo.IsSphericalContent A")] + [Property("SPEC", "Tizen.Multimedia.SphericalVideo.IsSphericalContent M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Jeongyoon Nam, just.nam@samsung.com")] @@ -81,7 +81,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("IsSphericalContent throws if the video is not spherical content")] - [Property("SPEC", "Tizen.Multimedia.SphericalVideo.IsSphericalContent B")] + [Property("SPEC", "Tizen.Multimedia.SphericalVideo.IsSphericalContent M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "Jeongyoon Nam, just.nam@samsung.com")] 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 235fe52..347c165 100644 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/support/PreconditionUtil.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/support/PreconditionUtil.cs @@ -23,7 +23,7 @@ namespace Tizen.Multimedia.Tests public class PreconditionUtils { public static string STREAMING_URI = null; - public static string ADAPTIVE_STREAMING_URL = null; + public static string ADAPTIVE_STREAMING_URI = null; public static void SetPrecondition() { @@ -39,9 +39,9 @@ namespace Tizen.Multimedia.Tests resultArray[index + 1] = resultArray[index + 1].Replace("\\", ""); STREAMING_URI = resultArray[index + 1]; break; - case "ADAPTIVE_STREAMING_URL": + case "ADAPTIVE_STREAMING_URI": resultArray[index + 1] = resultArray[index + 1].Replace("\\", ""); - ADAPTIVE_STREAMING_URL = resultArray[index + 1]; + ADAPTIVE_STREAMING_URI = resultArray[index + 1]; break; default: break; diff --git a/tool/script/tct-testconfig/preconfigure.json b/tool/script/tct-testconfig/preconfigure.json index 8ced9b5..d2ad8cd 100755 --- a/tool/script/tct-testconfig/preconfigure.json +++ b/tool/script/tct-testconfig/preconfigure.json @@ -34,5 +34,5 @@ "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", - "ADAPTIVE_STREAMING_URL":"Set the adaptive streaming url" + "ADAPTIVE_STREAMING_URI":"Set the adaptive streaming uri" }] diff --git a/tool/script/tct-testconfig/tct-testconfig.ini b/tool/script/tct-testconfig/tct-testconfig.ini index ff39429..e76bbc2 100755 --- a/tool/script/tct-testconfig/tct-testconfig.ini +++ b/tool/script/tct-testconfig/tct-testconfig.ini @@ -54,4 +54,4 @@ 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 -ADAPTIVE_STREAMING_URL = set the url in here +ADAPTIVE_STREAMING_URI = set the uri in here -- 2.7.4