From 18e007c96a197579c604607edb28135970d26c6d Mon Sep 17 00:00:00 2001
From: Xianbing Teng <xb.teng@samsung.com>
Date: Tue, 9 Apr 2024 15:21:13 +0800
Subject: [PATCH] [NUI] Fix build errors of Tizen.NUI.Components.Devel.Tests

---
 .../Tizen.NUI.Components.Devel.Tests.csproj        |  6 ++--
 .../Controls/RecyclerView/TSCollectionView.cs      | 10 +++----
 .../testcase/Controls/TSButton.Internal.cs         | 30 -------------------
 .../testcase/Extension/TSLottieButtonExtension.cs  | 18 +++++-------
 .../testcase/Extension/TSLottieSwitchExtension.cs  | 10 +++----
 .../testcase/Extension/TSSwitchExtension.cs        | 34 +++++++++++++++-------
 .../PreloadStyle/TSOverlayAnimationButtonStyle.cs  | 18 +++++-------
 .../tizen-manifest.xml                             |  4 +--
 .../nunit.framework/nunit.framework.csproj         |  7 ++---
 test/Tizen.NUI.Tests/nunitlite/nunitlite.csproj    |  2 +-
 10 files changed, 57 insertions(+), 82 deletions(-)

diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/Tizen.NUI.Components.Devel.Tests.csproj b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/Tizen.NUI.Components.Devel.Tests.csproj
index 0860494..d8f6ad9 100755
--- a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/Tizen.NUI.Components.Devel.Tests.csproj
+++ b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/Tizen.NUI.Components.Devel.Tests.csproj
@@ -3,7 +3,8 @@
   <!-- Property Group for .NET Core Project -->
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0-tizen8.0</TargetFramework>
+    <DisableImplicitTizenReferences>True</DisableImplicitTizenReferences>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
   </PropertyGroup>
 
@@ -25,10 +26,9 @@
 
   <Import Project="..\Common\dependencies.props" />
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="10.0.0.*">
+    <PackageReference Include="Tizen.NET" Version="11.0.0.*">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
   </ItemGroup>
 
   <!-- Include Nuget Package for Tizen Project building -->
diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/RecyclerView/TSCollectionView.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/RecyclerView/TSCollectionView.cs
index 49d49e7..321045a 100755
--- a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/RecyclerView/TSCollectionView.cs
+++ b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/RecyclerView/TSCollectionView.cs
@@ -579,13 +579,13 @@ namespace Tizen.NUI.Components.Devel.Tests
 
         [Test]
         [Category("P1")]
-        [Description("CollectionView InternalItemSource.")]
-        [Property("SPEC", "Tizen.NUI.Components.CollectionView.InternalItemSource A")]
+        [Description("CollectionView InternalSource.")]
+        [Property("SPEC", "Tizen.NUI.Components.CollectionView.InternalSource A")]
         [Property("SPEC_URL", "-")]
         [Property("CRITERIA", "PRW")]
         [Property("COVPARAM", "")]
         [Property("AUTHOR", "huayong.xu@samsung.com")]
-        public void CollectionViewInternalItemSource()
+        public void CollectionViewInternalSource()
         {
             tlog.Debug(tag, $"CollectionViewInternalItemSource START");
 
@@ -595,8 +595,8 @@ namespace Tizen.NUI.Components.Devel.Tests
             Assert.IsNotNull(testingTarget, "should be not null");
             Assert.IsInstanceOf<CollectionView>(testingTarget, "should be an instance of testing target class!");
 
-            testingTarget.InternalItemSource = null;
-            Assert.IsNull(testingTarget.InternalItemSource, "should be null.");
+            testingTarget.InternalSource = null;
+            Assert.IsNull(testingTarget.InternalSource, "should be null.");
 
             testingTarget.Dispose();
             tlog.Debug(tag, $"CollectionViewInternalItemSource END (OK)");
diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSButton.Internal.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSButton.Internal.cs
index 6fe4af3..6ad4a9c 100755
--- a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSButton.Internal.cs
+++ b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSButton.Internal.cs
@@ -110,36 +110,6 @@ namespace Tizen.NUI.Components.Devel.Tests
 
         [Test]
         [Category("P1")]
-        [Description("Button OnAccessibilityActivated.")]
-        [Property("SPEC", "Tizen.NUI.Components.Button.OnAccessibilityActivated M")]
-        [Property("SPEC_URL", "-")]
-        [Property("CRITERIA", "MR")]
-        [Property("COVPARAM", "")]
-        [Property("AUTHOR", "guowei.wang@samsung.com")]
-        public void ButtonOnAccessibilityActivated()
-        {
-            tlog.Debug(tag, $"ButtonOnAccessibilityActivated START");
-
-            var testingTarget = new Button();
-            Assert.IsNotNull(testingTarget, "null handle");
-            Assert.IsInstanceOf<Button>(testingTarget, "Should return Button instance.");
-
-            try
-            {
-                testingTarget.OnAccessibilityActivated();
-            }
-            catch (Exception e)
-            {
-                tlog.Debug(tag, e.Message.ToString());
-                Assert.Fail("Caught Exception : Failed!");
-            }
-
-            testingTarget.Dispose();
-            tlog.Debug(tag, $"ButtonOnAccessibilityActivated END (OK)");
-        }
-
-        [Test]
-        [Category("P1")]
         [Description("Button OnRelayout.")]
         [Property("SPEC", "Tizen.NUI.Components.Button.OnRelayout M")]
         [Property("SPEC_URL", "-")]
diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSLottieButtonExtension.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSLottieButtonExtension.cs
index e821a1f..e255dc3 100755
--- a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSLottieButtonExtension.cs
+++ b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSLottieButtonExtension.cs
@@ -96,15 +96,15 @@ namespace Tizen.NUI.Components.Devel.Tests
 
         [Test]
         [Category("P1")]
-        [Description("LottieButtonExtension OnCreateIcon.")]
-        [Property("SPEC", "Tizen.NUI.Components.LottieButtonExtension.OnCreateIcon M")]
+        [Description("LottieButtonExtension ProcessIcon.")]
+        [Property("SPEC", "Tizen.NUI.Components.LottieButtonExtension.ProcessIcon M")]
         [Property("SPEC_URL", "-")]
         [Property("CRITERIA", "MR")]
         [Property("COVPARAM", "")]
         [Property("AUTHOR", "guowei.wang@samsung.com")]
-        public void LottieButtonExtensionOnCreateIcon()
+        public void LottieButtonExtensionProcessIcon()
         {
-            tlog.Debug(tag, $"LottieButtonExtensionOnCreateIcon START");
+            tlog.Debug(tag, $"LottieButtonExtensionProcessIcon START");
 
             var testingTarget = new LottieButtonExtension();
             Assert.IsNotNull(testingTarget, "null handle");
@@ -122,14 +122,12 @@ namespace Tizen.NUI.Components.Devel.Tests
 
             using (Button button = new Button(style))
             {
-                using (ImageView view = new ImageView(image_path))
-                {
-                    var result = testingTarget.OnCreateIcon(button, view);
-                    tlog.Debug(tag, "OnCreateIcon : " + result);
-                }
+                ImageView view = new ImageView(image_path);
+                var result = testingTarget.ProcessIcon(button, ref view);
+                tlog.Debug(tag, "ProcessIcon : " + result);
             }
 
-            tlog.Debug(tag, $"LottieButtonExtensionOnCreateIcon END (OK)");
+            tlog.Debug(tag, $"LottieButtonExtensionProcessIcon END (OK)");
         }
     }
 }
diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSLottieSwitchExtension.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSLottieSwitchExtension.cs
index 2ad1a70..5e35813 100755
--- a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSLottieSwitchExtension.cs
+++ b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSLottieSwitchExtension.cs
@@ -23,9 +23,9 @@ namespace Tizen.NUI.Components.Devel.Tests
             public LottieSwitchExtensionImpl() : base()
             { }
 
-            public override ImageView OnCreateIcon(Button button, ImageView icon)
+            public override bool ProcessIcon(Button button,ref ImageView icon)
             {
-                return base.OnCreateIcon(button, icon);
+                return base.ProcessIcon(button, ref icon);
             }
 
             public override void OnControlStateChanged(Button button, View.ControlStateChangedEventArgs args)
@@ -88,17 +88,17 @@ namespace Tizen.NUI.Components.Devel.Tests
             };
 
             ImageView icon = new ImageView()
-            { 
+            {
                 ResourceUrl = image_path,
             };
 
-            var result = testingTarget.OnCreateIcon(button, icon);
+            var result = testingTarget.ProcessIcon(button,ref icon);
             Assert.IsNotNull(result, "null handle");
             Assert.IsInstanceOf<ImageView>(result, "Should return LottieSwitchExtension instance.");
 
             icon.Dispose();
             button.Dispose();
-            result.Dispose();
+
             tlog.Debug(tag, $"LottieSwitchExtensionOnCreateIcon END (OK)");
         }
 
diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSSwitchExtension.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSSwitchExtension.cs
index 6b4fbaf..9f4cb67 100755
--- a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSSwitchExtension.cs
+++ b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Extension/TSSwitchExtension.cs
@@ -21,7 +21,17 @@ namespace Tizen.NUI.Components.Devel.Tests
         internal class SwitchExtensionImpl : SwitchExtension
         {
             public SwitchExtensionImpl() : base()
-            {  }
+            { }
+
+            public override void OnSelectedChanged(Switch switchButton)
+            {
+                base.OnSelectedChanged(switchButton);
+            }
+
+            public override void OnTrackOrThumbResized(Switch switchButton, ImageView track, ImageView thumb)
+            {
+                base.OnTrackOrThumbResized(switchButton, track, thumb);
+            }
         }
 
         [SetUp]
@@ -38,30 +48,32 @@ namespace Tizen.NUI.Components.Devel.Tests
 
         [Test]
         [Category("P1")]
-        [Description("SwitchExtension OnCreateTrack.")]
-        [Property("SPEC", "Tizen.NUI.Components.SwitchExtension.OnCreateTrack M")]
+        [Description("SwitchExtension ProcessThumb.")]
+        [Property("SPEC", "Tizen.NUI.Components.SwitchExtension.ProcessThumb M")]
         [Property("SPEC_URL", "-")]
         [Property("CRITERIA", "MR")]
         [Property("COVPARAM", "")]
         [Property("AUTHOR", "guowei.wang@samsung.com")]
-        public void SlidingSwitchExtensionOnSelectedChanged()
+        public void SlidingSwitchExtensionProcessThumb()
         {
-            tlog.Debug(tag, $"SlidingSwitchExtensionOnSelectedChanged START");
+            tlog.Debug(tag, $"SlidingSwitchExtensionProcessThumb START");
 
             var testingTarget = new SwitchExtensionImpl();
             Assert.IsNotNull(testingTarget, "null handle");
             Assert.IsInstanceOf<SwitchExtension>(testingTarget, "Should return SwitchExtension instance.");
 
-            using (Switch button = new Switch() { IsEnabled = true, IsSelected = true } )
+            using (Switch button = new Switch() { IsEnabled = true, IsSelected = true })
             {
-                var result = testingTarget.OnCreateTrack(button, new ImageView(image_path));
-                tlog.Debug(tag, "OnCreateTrack : " + result);
+                var thumb = new ImageView(image_path);
+                var truck = new ImageView(image_path);
+                testingTarget.OnSelectedChanged(button);
+                testingTarget.OnTrackOrThumbResized(button, thumb, truck);
 
-                result = testingTarget.OnCreateThumb(button, new ImageView(image_path));
-                tlog.Debug(tag, "OnCreateThumb : " + result);
+                var result = testingTarget.ProcessThumb(button, ref thumb);
+                tlog.Debug(tag, "ProcessThumb : " + result);
             }
 
-            tlog.Debug(tag, $"SlidingSwitchExtensionOnSelectedChanged END (OK)");
+            tlog.Debug(tag, $"SlidingSwitchExtensionProcessThumb END (OK)");
         }
     }
 }
diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/PreloadStyle/TSOverlayAnimationButtonStyle.cs b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/PreloadStyle/TSOverlayAnimationButtonStyle.cs
index e1a0f0a..611c9af 100755
--- a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/PreloadStyle/TSOverlayAnimationButtonStyle.cs
+++ b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/PreloadStyle/TSOverlayAnimationButtonStyle.cs
@@ -99,12 +99,10 @@ namespace Tizen.NUI.Components.Devel.Tests
             {
                 using (Button button = new Button() { Size = new Size(80, 50) })
                 {
-                    using (ImageView view = new ImageView(image_path))
-                    {
-                        testingTarget.OnCreateOverlayImage(button, view);
-                    }
+                    ImageView view = new ImageView(image_path);
+                    testingTarget.ProcessOverlayImage(button, ref view);
                 }
-                    
+
             }
             catch (Exception e)
             {
@@ -137,12 +135,10 @@ namespace Tizen.NUI.Components.Devel.Tests
 
                 try
                 {
-                    using (ImageView view = new ImageView(image_path))
-                    {
-                        testingTarget.OnCreateOverlayImage(button, view);
-                        testingTarget.OnControlStateChanged(button, args);
-                        testingTarget.OnDispose(button);
-                    }
+                    ImageView view = new ImageView(image_path);
+                    testingTarget.ProcessOverlayImage(button, ref view);
+                    testingTarget.OnControlStateChanged(button, args);
+                    testingTarget.OnDispose(button);
                 }
                 catch (Exception e)
                 {
diff --git a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/tizen-manifest.xml b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/tizen-manifest.xml
index 6e854f1..05e2fa3 100755
--- a/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/tizen-manifest.xml
+++ b/test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/tizen-manifest.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="Tizen.NUI.Components.Devel.Tests" version="1.0.2" api-version="7" xmlns="http://tizen.org/ns/packages">
+<manifest package="Tizen.NUI.Components.Devel.Tests" version="1.0.0" api-version="8.0" xmlns="http://tizen.org/ns/packages">
     <profile name="common" />
     <ui-application appid="Tizen.NUI.Components.Devel.Tests" 
 					exec="Tizen.NUI.Components.Devel.Tests.dll" 
 					multiple="false" 
 					taskmanage="true" 
 					splash-screen-display="true" 
-					type="dotnet-nui" 
+					type="dotnet" 
 					launch_mode="single">
     <icon>Tizen.NUI.Components.Devel.Tests.png</icon>
     <label>Tizen.NUI.Components.Devel.Tests</label>
diff --git a/test/Tizen.NUI.Tests/nunit.framework/nunit.framework.csproj b/test/Tizen.NUI.Tests/nunit.framework/nunit.framework.csproj
index a70628e..bea9e91 100755
--- a/test/Tizen.NUI.Tests/nunit.framework/nunit.framework.csproj
+++ b/test/Tizen.NUI.Tests/nunit.framework/nunit.framework.csproj
@@ -2,13 +2,12 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <Import Project="..\Common\versions.props" />
+  
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="10.0.0.*">
-      <ExcludeAssets>Runtime</ExcludeAssets>
-    </PackageReference>
+    <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)" />
   </ItemGroup>
 </Project>
diff --git a/test/Tizen.NUI.Tests/nunitlite/nunitlite.csproj b/test/Tizen.NUI.Tests/nunitlite/nunitlite.csproj
index bf6bedd..130f48c 100755
--- a/test/Tizen.NUI.Tests/nunitlite/nunitlite.csproj
+++ b/test/Tizen.NUI.Tests/nunitlite/nunitlite.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-- 
2.7.4