[NUI.Wearable][Non-ACR][Changed as proper use]

Change-Id: I3daf5b800761e9e2104be0fecf6c8df826988e4c
Signed-off-by: dongsug.song <dongsug.song@samsung.com>

diff --git a/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest.cs b/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest.cs
index ef58907..47bc4e5 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest.cs
+++ b/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Tizen.Applications;
 using Tizen;
 using Tizen.NUI;
@@ -9,6 +9,7 @@ namespace NUIWatchApplicationManualTest
 {
     public class NUIWatchApplicationManualTest : NUIWatchApplication
     {
+        private Window _win;
         public void OnButtonPressed()
         {
             Log.Fatal("TCT", "Call Exit()");
@@ -21,7 +22,8 @@ namespace NUIWatchApplicationManualTest
         }
         protected override void OnCreate()
         {
-            Tizen.NUI.Window.Instance.BackgroundColor = Color.White;
+            _win = this.Window;
+            _win.BackgroundColor = Color.White;
 
             PushButton exitButton = new PushButton();
             exitButton.LabelText = "EXIT";
@@ -33,7 +35,7 @@ namespace NUIWatchApplicationManualTest
                 Exit();
                 return true;
             };
-            Window.Instance.Add(exitButton);
+            _win.Add(exitButton);
 
             FocusManager.Instance.SetCurrentFocusView(exitButton);
 

diff --git a/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/tizen-manifest.xml
index 55dc8b1..6a370b0 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/tizen-manifest.xml
+++ b/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/tizen-manifest.xml
@@ -1,8 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.tizen.example.NUIWatchApplicationManualTest" version="1.0.0" api-version="5" xmlns="http://tizen.org/ns/packages">
-    <profile name="wearable" />
-    <privileges>
-        <privilege>http://tizen.org/privilege/alarm.set</privilege>
-    </privileges>
-    <provides-appdefined-privileges />
+<manifest package="org.tizen.example.NUIWatchApplicationManualTest" version="1.0.0" api-version="6" xmlns="http://tizen.org/ns/packages">
+  <profile name="wearable" />
+  <ui-application appid="org.tizen.example.NUIWatchApplicationManualTest"
+          exec="NUIWatchApplicationManualTest.dll"
+          multiple="false"
+          taskmanage="true"
+          splash-screen-display="true"
+          type="dotnet"
+          launch_mode="single">
+    <icon>NUIWatchApplicationManualTest.png</icon>
+    <label>NUIWatchApplicationManualTest</label>
+  </ui-application>
+  <privileges>
+    <privilege>http://tizen.org/privilege/alarm.set</privilege>
+  </privileges>
+  <provides-appdefined-privileges />
 </manifest>

diff --git a/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/org.tizen.example.NUIWatchApplicationManualTest-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/org.tizen.example.NUIWatchApplicationManualTest-1.0.0.tpk
index 8908660..5f5bae3 100755 (executable)
Binary files a/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/org.tizen.example.NUIWatchApplicationManualTest-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.NUIWatchApplication.Manual.Tests/org.tizen.example.NUIWatchApplicationManualTest-1.0.0.tpk differ

diff --git a/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/Tizen.NUI.Wearable.Manual.Tests.csproj b/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/Tizen.NUI.Wearable.Manual.Tests.csproj
index 81bb99a..64865e3 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/Tizen.NUI.Wearable.Manual.Tests.csproj
+++ b/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/Tizen.NUI.Wearable.Manual.Tests.csproj
@@ -3,7 +3,7 @@
   <!-- Property Group for .NET Core Project -->
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen50</TargetFramework>
+    <TargetFramework>tizen60</TargetFramework>
   </PropertyGroup>
 
   <!-- Property Group for Tizen Project -->

diff --git a/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/tizen-manifest.xml
index 399dc28..868f7c8 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.NUI.Wearable.Manual.Tests/tizen-manifest.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="Tizen.NUI.Wearable.Manual.Tests" version="1.0.0" api-version="5" xmlns="http://tizen.org/ns/packages">
+<manifest package="Tizen.NUI.Wearable.Manual.Tests" version="1.0.0" api-version="6" xmlns="http://tizen.org/ns/packages">
     <profile name="wearable" />
-    <ui-application appid="Tizen.NUI.Wearable.Manual.Tests" exec="Tizen.NUI.Wearable.Manual.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+    <ui-application appid="Tizen.NUI.Wearable.Manual.Tests"
+            exec="Tizen.NUI.Wearable.Manual.Tests.dll"
+            multiple="false"
+            taskmanage="true"
+            splash-screen-display="true"
+            type="dotnet"
+            launch_mode="single">
         <icon>Tizen.NUI.Wearable.Manual.Tests.png</icon>
         <label>Tizen.NUI.Wearable.Manual.Tests</label>
     </ui-application>

diff --git a/tct-suite-vs/Tizen.NUI.Wearable.Tests/Program.cs b/tct-suite-vs/Tizen.NUI.Wearable.Tests/Program.cs
index 397b926..7f86c99 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Wearable.Tests/Program.cs
+++ b/tct-suite-vs/Tizen.NUI.Wearable.Tests/Program.cs
@@ -30,6 +30,7 @@ namespace Tizen.NUI.Test
         static TextLabel MainTitle;
         static readonly string Title = "Tizen.NUI.Wearable Auto TCT \n\n";
         static readonly float TextSize = 10.0f;
+        public static Window win;
 
         public App() : base()
         {
@@ -42,20 +43,20 @@ namespace Tizen.NUI.Test
 
             Random rand = new Random();
 
-            Window window = Window.Instance;
-            Window.Instance.Title = "NUIWatchApplicationTest";
-            window.BackgroundColor = Color.Green;
+            win = this.Window;
+            win.Title = "NUIWatchApplicationTest";
+            win.BackgroundColor = Color.Red;
 
             MainTitle = new TextLabel();
             MainTitle.MultiLine = true;
             MainTitle.Text = Title;
             MainTitle.PixelSize = TextSize;
             MainTitle.BackgroundColor = new Color(rand.Next(250) / 255.0f, rand.Next(250) / 255.0f, rand.Next(250) / 255.0f, 1.0f);
-            MainTitle.Size2D = new Size2D(window.WindowSize.Width / 2, window.WindowSize.Height / 2);
+            MainTitle.Size2D = new Size2D(win.WindowSize.Width / 2, win.WindowSize.Height / 2);
             MainTitle.PositionUsesPivotPoint = true;
             MainTitle.ParentOrigin = ParentOrigin.Center;
             MainTitle.PivotPoint = PivotPoint.Center;
-            window.Add(MainTitle);
+            win.Add(MainTitle);
         }
 
         static public async Task MainTitleChangeBackgroundColor(Color color)

diff --git a/tct-suite-vs/Tizen.NUI.Wearable.Tests/Tizen.NUI.Wearable.Tests.csproj b/tct-suite-vs/Tizen.NUI.Wearable.Tests/Tizen.NUI.Wearable.Tests.csproj
index 81bb99a..c39aa5b 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Wearable.Tests/Tizen.NUI.Wearable.Tests.csproj
+++ b/tct-suite-vs/Tizen.NUI.Wearable.Tests/Tizen.NUI.Wearable.Tests.csproj
@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <!-- Property Group for .NET Core Project -->
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen50</TargetFramework>
+    <TargetFramework>tizen60</TargetFramework>
   </PropertyGroup>
 
   <!-- Property Group for Tizen Project -->

diff --git a/tct-suite-vs/Tizen.NUI.Wearable.Tests/testcase/TSNUIWatchApplication.cs b/tct-suite-vs/Tizen.NUI.Wearable.Tests/testcase/TSNUIWatchApplication.cs
index 6f8fa9c..ca8be83 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Wearable.Tests/testcase/TSNUIWatchApplication.cs
+++ b/tct-suite-vs/Tizen.NUI.Wearable.Tests/testcase/TSNUIWatchApplication.cs
@@ -43,7 +43,8 @@ namespace Tizen.NUI.Tests
                 var application = new NUIWatchApplication();
                 Assert.IsNotNull(application, "Object should not be null after initializing.");
                 Assert.IsInstanceOf<NUIWatchApplication>(application, "application must be an instance of Applications.WatchApplication.");
-                application.Dispose();
+                //No need to dispose, this application never be Run nor Exit.
+                //application.Dispose();
             }
             catch (Exception e)
             {
@@ -69,7 +70,8 @@ namespace Tizen.NUI.Tests
                 var application = new NUIWatchApplication("stylesheet");
                 Assert.IsNotNull(application, "Object should not be null after initializing.");
                 Assert.IsInstanceOf<NUIWatchApplication>(application, "application must be an instance of Applications.WatchApplication.");
-                application.Dispose();
+                //No need to dispose, this application never be Run nor Exit.
+                //application.Dispose();
             }
             catch (Exception e)
             {
@@ -89,9 +91,11 @@ namespace Tizen.NUI.Tests
         public void Window_GET_VALUE()
         {
             /* TEST CODE */
-            var application = new NUIWatchApplication();
-            Assert.IsNotNull(application.Window, "Retrieved Window should be not null");
-            Assert.AreEqual("NUIWatchApplicationTest", application.Window.Title, "Should be equal to the set value");
+            //Proper window can be aquired after Application runs normally then window creation is performed.
+            //So this App is used to check whether the Window is made properly.
+            var window = App.win;
+            Assert.IsNotNull(window, "Retrieved Window should be not null");
+            Assert.AreEqual("NUIWatchApplicationTest", window.Title, "Should be equal to the set value");
         }
     }
 }

diff --git a/tct-suite-vs/Tizen.NUI.Wearable.Tests/tizen-manifest.xml b/tct-suite-vs/Tizen.NUI.Wearable.Tests/tizen-manifest.xml
index 6323073..0684464 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Wearable.Tests/tizen-manifest.xml
+++ b/tct-suite-vs/Tizen.NUI.Wearable.Tests/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="Tizen.NUI.Wearable.Tests" version="1.0.0" api-version="5" xmlns="http://tizen.org/ns/packages">
+<manifest package="Tizen.NUI.Wearable.Tests" version="1.0.0" api-version="6" xmlns="http://tizen.org/ns/packages">
     <profile name="wearable" />
     <ui-application appid="Tizen.NUI.Wearable.Tests" exec="Tizen.NUI.Wearable.Tests.dll" multiple="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
         <icon>Tizen.NUI.Tests.png</icon>