From 5ea50ae05c734c017bbb19f4ce4c6dcf6dc70862 Mon Sep 17 00:00:00 2001 From: zhangzg Date: Tue, 31 Dec 2019 11:17:57 +0900 Subject: [PATCH] [NUI][Non-ACR] Fix TBT failed and build error Change-Id: Ifb9bfea5f21e0a0a315fc8a3928f637db635400d --- .../Tizen.NUI.Components.Manual.Tests.csproj | 0 tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSPopup.cs | 5 ----- tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSlider.cs | 0 tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSwitch.cs | 6 +++--- tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) mode change 100755 => 100644 tct-suite-vs/Tizen.NUI.Components.Manual.Tests/Tizen.NUI.Components.Manual.Tests.csproj mode change 100755 => 100644 tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSPopup.cs mode change 100755 => 100644 tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSlider.cs mode change 100755 => 100644 tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSwitch.cs mode change 100755 => 100644 tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs diff --git a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/Tizen.NUI.Components.Manual.Tests.csproj b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/Tizen.NUI.Components.Manual.Tests.csproj old mode 100755 new mode 100644 diff --git a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSPopup.cs b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSPopup.cs old mode 100755 new mode 100644 index 39cfd4b..b250c27 --- a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSPopup.cs +++ b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSPopup.cs @@ -78,10 +78,6 @@ namespace Tizen.NUI.Components.Tests _popup.TitleText = "Popup Title"; _popup.BackgroundImage = _resourcePath + "/images/popup_background.png"; - _popup.BackgroundBorder = new Rectangle(0, 0, 81, 81); - - _popup.ButtonBackgroundImageURL = _resourcePath + "/images/rectangle_btn_normal.png"; - _popup.ButtonBackgroundImageBorder = new Rectangle(5, 5, 5, 5); _popup.ButtonOverLayBackgroundColorSelector = new ColorSelector { Normal = new Color(1.0f, 1.0f, 1.0f, 1.0f), @@ -90,7 +86,6 @@ namespace Tizen.NUI.Components.Tests }; _popup.ButtonTextColor = new Color(0.05f, 0.63f, 0.9f, 1); _popup.ButtonHeight = 132; - _popup.ButtonCount = 2; _popup.SetButtonText(0, "Yes"); _popup.SetButtonText(1, "Exit"); diff --git a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSlider.cs b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSlider.cs old mode 100755 new mode 100644 diff --git a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSwitch.cs b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSwitch.cs old mode 100755 new mode 100644 index 625374c..45b375c --- a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSwitch.cs +++ b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSwitch.cs @@ -67,13 +67,13 @@ namespace Tizen.NUI.Components.Tests Assert.IsNotNull(_switch, "Should be not null"); Assert.IsInstanceOf(_switch, "Should be equal!"); _switch.Size2D = new Size2D(96, 60); - _switch.SwitchHandlerImageSize = new Size(60, 60); - _switch.SwitchBackgroundImageURLSelector = new StringSelector + _switch.Style.Thumb.Size = new Size(60, 60); + _switch.Style.Track.ResourceUrl = new Selector { Normal = _resourcePath + "/images/controller_switch_bg_off.png", Selected = _resourcePath + "/images/controller_switch_bg_on.png", }; - _switch.SwitchHandlerImageURLSelector = new StringSelector + _switch.Style.Thumb.ResourceUrl = new Selector { Normal = _resourcePath + "/images/controller_switch_handler.png", Selected = _resourcePath + "/images/controller_switch_handler.png", diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs old mode 100755 new mode 100644 index 200580b..b953b41 --- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs +++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs @@ -164,7 +164,7 @@ namespace Tizen.NUI.Tests public void OnTouchEventGetState(object sender, Window.TouchEventArgs e) { PointStateType type = e.Touch.GetState(0); - if (type == PointStateType.Motion) + if (type == PointStateType.Motion || type == PointStateType.Finished) { ManualTest.Confirm(); } -- 2.7.4