From a6db25c8ca186dc42f848c03c1ff7ba6db6f610b Mon Sep 17 00:00:00 2001 From: Haesu Gwon Date: Thu, 22 Mar 2018 17:53:21 +0900 Subject: [PATCH] [MediaPlayer][TCSACR-135] Modify Roi precondition Change-Id: Ia81da5e2d9618f0f72156ff113d2c8cfcb9d0ff6 Signed-off-by: Haesu Gwon (cherry picked from commit cdf84e8ec45a003f61d2b433ea259e5bf0c75d37) --- .../testcase/TSMediaStreamSource.WithPlayer.cs | 1 + .../testcase/TSMediaStreamSource.cs | 1 + .../Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs | 42 +++++++++++----------- .../testcase/TSPlayerDisplaySettings.cs | 15 ++++---- 4 files changed, 30 insertions(+), 29 deletions(-) mode change 100755 => 100644 tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs mode change 100755 => 100644 tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.cs mode change 100755 => 100644 tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs mode change 100755 => 100644 tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerDisplaySettings.cs diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs old mode 100755 new mode 100644 index 3407b3a..6bfb594 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.WithPlayer.cs @@ -163,6 +163,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] + [Property("COVPARAM", "AudioMediaFormat")] public void MediaStreamSource_NOT_ASSIGNED_TO_MULTIPLE() { var player = GetIdlePlayer(); diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.cs old mode 100755 new mode 100644 index ce62318..df81fb9 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSMediaStreamSource.cs @@ -57,6 +57,7 @@ namespace Tizen.Multimedia.Tests [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] + [Property("COVPARAM", "AudioMediaFormat, VideoMediaFormat")] public void MediaStreamSource_THROWS_IF_PARAM_NULL() { Assert.That(() => new MediaStreamSource(null, null), Throws.ArgumentNullException); diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs old mode 100755 new mode 100644 index 342cab6..d59be76 --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayer.cs @@ -231,7 +231,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Volume set test")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Volume A")] + [Property("SPEC", "Tizen.Multimedia.Player.Volume A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRW")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -247,7 +247,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Volume with the min value")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Volume A")] + [Property("SPEC", "Tizen.Multimedia.Player.Volume A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PMIN")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -263,7 +263,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Volume with the max value")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Volume A")] + [Property("SPEC", "Tizen.Multimedia.Player.Volume A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PMAX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -279,7 +279,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] [Description("Volume throws if value is not in the range")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Volume A")] + [Property("SPEC", "Tizen.Multimedia.Player.Volume A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -295,7 +295,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Default AudioLatencyMode is Mid")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.AudioLatencyMode A")] + [Property("SPEC", "Tizen.Multimedia.Player.AudioLatencyMode A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -307,7 +307,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("AudioLatencyMode set test")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.AudioLatencyMode A")] + [Property("SPEC", "Tizen.Multimedia.Player.AudioLatencyMode A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PCST")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -323,7 +323,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] [Description("AudioLatencyMode throws if the specified value is invalid")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.AudioLatencyMode A")] + [Property("SPEC", "Tizen.Multimedia.Player.AudioLatencyMode A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -339,7 +339,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Default Muted value is false")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Muted A")] + [Property("SPEC", "Tizen.Multimedia.Player.Muted A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -351,7 +351,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Muted set test")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Muted A")] + [Property("SPEC", "Tizen.Multimedia.Player.Muted A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PRW")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -370,7 +370,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Default IsLooping value is false")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.IsLooping A")] + [Property("SPEC", "Tizen.Multimedia.Player.IsLooping A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -382,7 +382,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("IsLooping set test")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.IsLooping A")] + [Property("SPEC", "Tizen.Multimedia.Player.IsLooping A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PCST")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -399,7 +399,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("AudioEffect default value")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.AudioEffect M")] + [Property("SPEC", "Tizen.Multimedia.Player.AudioEffect M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -432,7 +432,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Cookie default value")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Cookie A")] + [Property("SPEC", "Tizen.Multimedia.Player.Cookie A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -444,7 +444,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("Cookie set")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Cookie A")] + [Property("SPEC", "Tizen.Multimedia.Player.Cookie A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PCST")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -460,7 +460,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] [Description("Cookie to set throws if the specified value is null")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.Cookie A")] + [Property("SPEC", "Tizen.Multimedia.Player.Cookie A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -489,7 +489,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("UserAgent default value")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.UserAgent A")] + [Property("SPEC", "Tizen.Multimedia.Player.UserAgent A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PDV")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -501,7 +501,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("UserAgent set")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.UserAgent A")] + [Property("SPEC", "Tizen.Multimedia.Player.UserAgent A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "PCST")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -517,7 +517,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] [Description("UserAgent to set throws if the specified value is null")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.UserAgent A")] + [Property("SPEC", "Tizen.Multimedia.Player.UserAgent A")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -690,7 +690,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P1")] [Description("SetSubtitle test")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.SetSubtitle M")] + [Property("SPEC", "Tizen.Multimedia.Player.SetSubtitle M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MR")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -703,7 +703,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] [Description("SetSubtitle throws if the specified path is null")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.SetSubtitle M")] + [Property("SPEC", "Tizen.Multimedia.Player.SetSubtitle M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] @@ -715,7 +715,7 @@ namespace Tizen.Multimedia.Tests [Test] [Category("P2")] [Description("SetSubtitle throws if the path is invalid.")] - [Property("SPEC", "Tizen.Multimedia.TestPlayer.SetSubtitle M")] + [Property("SPEC", "Tizen.Multimedia.Player.SetSubtitle M")] [Property("SPEC_URL", "-")] [Property("CRITERIA", "MEX")] [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] diff --git a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerDisplaySettings.cs b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerDisplaySettings.cs old mode 100755 new mode 100644 index eb58870..a3d9f5c --- a/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerDisplaySettings.cs +++ b/tct-suite-vs/Tizen.MediaPlayer.Tests/testcase/TSPlayerDisplaySettings.cs @@ -60,19 +60,18 @@ namespace Tizen.Multimedia.Tests } [Test] - [Category("P2")] - [Description("Throws if mode is not set to roi")] + [Category("P1")] + [Description("Check it does not throw")] [Property("SPEC", "Tizen.Multimedia.PlayerDisplaySettings.SetRoi M")] [Property("SPEC_URL", "-")] - [Property("CRITERIA", "MEX")] - [Property("AUTHOR", "JungHo Kim, jhyo.kim@samsung.com")] - public static void SetRoi_THROWS_IF_MODE_NOT_ROI() + [Property("CRITERIA", "MR")] + [Property("AUTHOR", "Haesu Gwon, haesu.gwon@samsung.com")] + public static void SetRoi_First_CHECK() { var player = new Player(); - player.DisplaySettings.Mode = PlayerDisplayMode.OriginalSize; + player.DisplaySettings.SetRoi(new Rectangle(0, 0, 100, 100)); - Assert.That(() => player.DisplaySettings.SetRoi(new Rectangle(0, 0, 100, 100)), - Throws.InvalidOperationException); + Assert.That(() => player.DisplaySettings.Mode = PlayerDisplayMode.Roi, Throws.Nothing); } [Test] -- 2.7.4