From 545612067879fde120b6e5943e27e79a07408c00 Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Fri, 21 Jun 2019 14:00:38 +0900 Subject: [PATCH] [NUI][Non-ACR] Fix NUI Xaml namespace Change-Id: I87e1b1f9b741b5719ca076d8398d76f44f58127c Signed-off-by: huiyu.eun --- tct-suite-vs/Tizen.NUI.Tests/testcase/TSBindableProperty.cs | 10 +++++----- .../Tizen.NUI.Tests/testcase/TSGetResourcesProvider.cs | 7 +++---- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tct-suite-vs/Tizen.NUI.Tests/testcase/TSBindableProperty.cs b/tct-suite-vs/Tizen.NUI.Tests/testcase/TSBindableProperty.cs index b08587a..7c63179 100755 --- a/tct-suite-vs/Tizen.NUI.Tests/testcase/TSBindableProperty.cs +++ b/tct-suite-vs/Tizen.NUI.Tests/testcase/TSBindableProperty.cs @@ -1,7 +1,7 @@ using System; using System.Linq.Expressions; using NUnit.Framework; -using Tizen.NUI.XamlBinding; +using Tizen.NUI.Binding; using Tizen.NUI.UIComponents; using Tizen.NUI.BaseComponents; @@ -161,7 +161,7 @@ namespace Tizen.NUI.Tests public void Create_CHECK_INSTANCE_EXPRESSION() { /* TEST CODE */ - var bindableProperty = BindableProperty.Create< Xaml.UIComponents.PushButton, string>(b => b.LabelText, null, BindingMode.TwoWay); + var bindableProperty = BindableProperty.Create(b => b.LabelText, null, BindingMode.TwoWay); Assert.IsNotNull(bindableProperty, "BindableProperty instance is null"); Assert.IsInstanceOf(bindableProperty, "Should be instance of BindableProperty."); } @@ -181,7 +181,7 @@ namespace Tizen.NUI.Tests BindableProperty.BindingPropertyChangingDelegate changingDelegate = (b, ov, nv) => { }; BindableProperty.CoerceValueDelegate coerceValueDelegate = (bindable, value) => value; - var bindableProperty = BindableProperty.Create< Xaml.UIComponents.PushButton, string>(b => b.LabelText, null, BindingMode.TwoWay, validateValueDelegate, changedDelegate, changingDelegate, coerceValueDelegate); + var bindableProperty = BindableProperty.Create(b => b.LabelText, null, BindingMode.TwoWay, validateValueDelegate, changedDelegate, changingDelegate, coerceValueDelegate); Assert.IsNotNull(bindableProperty, "BindableProperty instance is null"); Assert.IsInstanceOf(bindableProperty, "Should be instance of BindableProperty."); } @@ -306,7 +306,7 @@ namespace Tizen.NUI.Tests BindableProperty.BindingPropertyChangingDelegate changingDelegate = (b, ov, nv) => { }; BindableProperty.CoerceValueDelegate coerceValueDelegate = (bindable, value) => value; - var bindableProperty = BindableProperty.CreateReadOnly< Xaml.UIComponents.PushButton, string>(b => b.LabelText, "Tizen", BindingMode.TwoWay, validateValueDelegate, changedDelegate, changingDelegate, coerceValueDelegate); + var bindableProperty = BindableProperty.CreateReadOnly(b => b.LabelText, "Tizen", BindingMode.TwoWay, validateValueDelegate, changedDelegate, changingDelegate, coerceValueDelegate); Assert.IsNotNull(bindableProperty, "BindableProperty instance is null"); Assert.IsInstanceOf(bindableProperty, "Should be instance of BindableProperty."); } @@ -321,7 +321,7 @@ namespace Tizen.NUI.Tests public void CreateReadOnly_CHECK_INSTANCE_EXPRESSION_CREATE_DEFAULT_VALUE_DELEGATE() { /* TEST CODE */ - var bindableProperty = BindableProperty.CreateReadOnly< Xaml.UIComponents.PushButton, string>(b => b.LabelText, "Tizen", BindingMode.TwoWay); + var bindableProperty = BindableProperty.CreateReadOnly(b => b.LabelText, "Tizen", BindingMode.TwoWay); Assert.IsNotNull(bindableProperty, "BindableProperty instance is null"); Assert.IsInstanceOf(bindableProperty, "Should be instance of BindableProperty."); } diff --git a/tct-suite-vs/Tizen.NUI.Tests/testcase/TSGetResourcesProvider.cs b/tct-suite-vs/Tizen.NUI.Tests/testcase/TSGetResourcesProvider.cs index 0649059..480780d 100755 --- a/tct-suite-vs/Tizen.NUI.Tests/testcase/TSGetResourcesProvider.cs +++ b/tct-suite-vs/Tizen.NUI.Tests/testcase/TSGetResourcesProvider.cs @@ -37,9 +37,9 @@ namespace Tizen.NUI.Tests public void GetResourcesProvider_INIT() { /* TEST CODE */ - var resourcesProvider = new Tizen.NUI.GetResourcesProvider(); + var resourcesProvider = new GetResourcesProvider(); Assert.IsNotNull(resourcesProvider, "Can't create success object GetResourcesProvider"); - Assert.IsInstanceOf(resourcesProvider, "Should be an instance of GetResourcesProvider type."); + Assert.IsInstanceOf(resourcesProvider, "Should be an instance of GetResourcesProvider type."); } [Test] @@ -52,8 +52,7 @@ namespace Tizen.NUI.Tests public void Get_GET_VALUE() { /* TEST CODE */ - Tizen.NUI.XamlBinding.Application app = new Tizen.NUI.XamlBinding.Application(); - Tizen.NUI.XamlBinding.ResourceDictionary dict = Tizen.NUI.GetResourcesProvider.Get().XamlResources; + Tizen.NUI.Binding.ResourceDictionary dict = Tizen.NUI.GetResourcesProvider.Get().XamlResources; Assert.IsEmpty(dict, "Shoud be empty"); } } -- 2.7.4