[Non-ACR][NUI][Fix manual tc fails]

Change-Id: I438feb270d688ec541d5cfbf2790bcd73aece8e4

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/NUIApplicationManualWearableTest/NUIApplicationManualWearableTest.csproj b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/NUIApplicationManualWearableTest/NUIApplicationManualWearableTest.csproj
index 7399f43..ad5d49c 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/NUIApplicationManualWearableTest/NUIApplicationManualWearableTest.csproj
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/NUIApplicationManualWearableTest/NUIApplicationManualWearableTest.csproj
@@ -2,7 +2,7 @@
 \r
   <PropertyGroup>\r
     <OutputType>Exe</OutputType>\r
-    <TargetFramework>tizen90</TargetFramework>\r
+    <TargetFramework>tizen10.0</TargetFramework>\r
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>\r
   </PropertyGroup>\r
 \r
@@ -18,12 +18,12 @@
     <Folder Include="res\" />\r
   </ItemGroup>\r
 \r
+  <Import Project="..\..\..\..\Common\dependencies.props" />\r
   <ItemGroup>\r
     <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)">\r
       <ExcludeAssets>Runtime</ExcludeAssets>\r
     </PackageReference>\r
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />\r
+    <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />\r
   </ItemGroup>\r
 \r
 </Project>\r
-\r

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/NUIApplicationManualWearableTest/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/NUIApplicationManualWearableTest/tizen-manifest.xml
index 49de571..c52b908 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/NUIApplicationManualWearableTest/tizen-manifest.xml
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/NUIApplicationManualWearableTest/tizen-manifest.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="org.tizen.example.NUIApplicationManualWearableTest" version="1.0.0">\r
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.example.NUIApplicationManualWearableTest" version="1.0.0">\r
   <profile name="common" />\r
   <ui-application appid="org.tizen.example.NUIApplicationManualWearableTest"\r
-                                       exec="NUIApplicationManualWearableTest.dll"\r
-                                       type="dotnet"\r
-                                       multiple="false"\r
-                                       taskmanage="true"\r
-                                       nodisplay="false"\r
-                                       launch_mode="single">\r
+                  exec="NUIApplicationManualWearableTest.dll"\r
+                  type="dotnet"\r
+                  multiple="false"\r
+                  taskmanage="true"\r
+                  nodisplay="false"\r
+                  launch_mode="single">\r
     <label>NUIApplicationManualWearableTest</label>\r
     <icon>NUIApplicationManualWearableTest.png</icon>\r
     <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />\r

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/Tizen.NUI.NUIApplications.Manual.Tests/NUIApplicationsManualTests/NUIApplicationsManualTests.csproj b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/Tizen.NUI.NUIApplications.Manual.Tests/NUIApplicationsManualTests/NUIApplicationsManualTests.csproj
index 099a8c6..478cb4f 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/Tizen.NUI.NUIApplications.Manual.Tests/NUIApplicationsManualTests/NUIApplicationsManualTests.csproj
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/Tizen.NUI.NUIApplications.Manual.Tests/NUIApplicationsManualTests/NUIApplicationsManualTests.csproj
@@ -1,56 +1,29 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-
-  <PropertyGroup Label="Globals">
-    <TizenProjectExtensionsPath>$(MSBuildExtensionsPath)\Tizen\VisualStudio\</TizenProjectExtensionsPath>
-    <Configurations>Debug;Release</Configurations>
-  </PropertyGroup>
-
-  <Import Project="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props" Condition="Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen90</TargetFramework>
+    <TargetFramework>tizen10.0</TargetFramework>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
   </PropertyGroup>
 
-  <!-- Property Group for Tizen Project -->
-  <PropertyGroup>
-    <TizenCreateTpkOnBuild>true</TizenCreateTpkOnBuild>
-  </PropertyGroup>
-
-
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugType>portable</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>None</DebugType>
   </PropertyGroup>
-  <ItemGroup>
-    <Compile Remove="lib\**" />
-    <EmbeddedResource Remove="lib\**" />
-    <None Remove="lib\**" />
-  </ItemGroup>
 
   <ItemGroup>
+    <Folder Include="lib\" />
     <Folder Include="res\" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
+  <Import Project="..\..\..\..\..\Common\dependencies.props" />
   <ItemGroup>
     <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.0" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets" Condition="Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets')" />
-
-  <!-- Install Check 'Visual Studio for Tizen' for developing on Visual Studio -->
-  <Target Name="TizenVsixInstallCheck" BeforeTargets="CompileDesignTime">
-    <Warning Condition="!Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props')" Text="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props is not exist.&#xA; you need to check if 'Visual Studio for Tizen' is installed" />
-    <Warning Condition="!Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets')" Text="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets is not exist.\&#xA; you need to check if 'Visual Studio for Tizen' is installed" />
-  </Target>
 </Project>
-

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/Tizen.NUI.NUIApplications.Manual.Tests/NUIApplicationsManualTests/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/Tizen.NUI.NUIApplications.Manual.Tests/NUIApplicationsManualTests/tizen-manifest.xml
index 5122919..45af3f4 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/Tizen.NUI.NUIApplications.Manual.Tests/NUIApplicationsManualTests/tizen-manifest.xml
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/Tizen.NUI.NUIApplications.Manual.Tests/NUIApplicationsManualTests/tizen-manifest.xml
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.tizen.example.NUIApplicationsManualTests" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
-  <profile name="tv" />
-  <ui-application appid="org.tizen.example.NUIApplicationsManualTests" exec="NUIApplicationsManualTests.dll" multiple="false" nodisplay="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.example.NUIApplicationsManualTests" version="1.0.0">
+  <profile name="common" />
+  <ui-application appid="org.tizen.example.NUIApplicationsManualTests" exec="NUIApplicationsManualTests.dll"
+                  multiple="false"
+                  nodisplay="false"
+                  taskmanage="true"
+                  splash-screen-display="true"
+                  type="dotnet"
+                  launch_mode="single">
     <icon>NUIApplicationsManualTests.png</icon>
     <label>NUIApplicationsManualTests</label>
-    <metadata key="http://samsung.com/tv/metadata/mountinstall" value="true" />
   </ui-application>
   <provides-appdefined-privileges />
-  <feature name="http://tizen.org/feature/screen.size.normal.1080.1920">true</feature>
 </manifest>

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationSample/WidgetApplicationSample.csproj b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationSample/WidgetApplicationSample.csproj
index 6df1b02..ad5d49c 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationSample/WidgetApplicationSample.csproj
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationSample/WidgetApplicationSample.csproj
@@ -2,7 +2,7 @@
 \r
   <PropertyGroup>\r
     <OutputType>Exe</OutputType>\r
-    <TargetFramework>tizen90</TargetFramework>\r
+    <TargetFramework>tizen10.0</TargetFramework>\r
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>\r
   </PropertyGroup>\r
 \r
@@ -18,12 +18,12 @@
     <Folder Include="res\" />\r
   </ItemGroup>\r
 \r
+  <Import Project="..\..\..\..\Common\dependencies.props" />\r
   <ItemGroup>\r
     <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)">\r
       <ExcludeAssets>Runtime</ExcludeAssets>\r
     </PackageReference>\r
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.0" />\r
+    <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />\r
   </ItemGroup>\r
 \r
 </Project>\r
-\r

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationSample/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationSample/tizen-manifest.xml
index aa69e89..daa5133 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationSample/tizen-manifest.xml
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationSample/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="org.tizen.example.WidgetApplicationSample" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.example.WidgetApplicationSample" version="1.0.0">
   <profile name="common" />
   <widget-application appid="org.tizen.example.WidgetApplicationSample"
                       exec="WidgetApplicationSample.dll"
@@ -9,4 +9,6 @@
     <icon>WidgetApplicationSample.png</icon>
     <label>WidgetApplicationSample</label>
   </widget-application>
+  <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
+  <privilege>http://tizen.org/privilege/datasharing</privilege>
 </manifest>

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationWearableSample/WidgetApplicationWearableSample.csproj b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationWearableSample/WidgetApplicationWearableSample.csproj
index 7399f43..ad5d49c 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationWearableSample/WidgetApplicationWearableSample.csproj
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationWearableSample/WidgetApplicationWearableSample.csproj
@@ -2,7 +2,7 @@
 \r
   <PropertyGroup>\r
     <OutputType>Exe</OutputType>\r
-    <TargetFramework>tizen90</TargetFramework>\r
+    <TargetFramework>tizen10.0</TargetFramework>\r
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>\r
   </PropertyGroup>\r
 \r
@@ -18,12 +18,12 @@
     <Folder Include="res\" />\r
   </ItemGroup>\r
 \r
+  <Import Project="..\..\..\..\Common\dependencies.props" />\r
   <ItemGroup>\r
     <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)">\r
       <ExcludeAssets>Runtime</ExcludeAssets>\r
     </PackageReference>\r
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />\r
+    <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />\r
   </ItemGroup>\r
 \r
 </Project>\r
-\r

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationWearableSample/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationWearableSample/tizen-manifest.xml
index b8de3f2..1fd4b2b 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationWearableSample/tizen-manifest.xml
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetApplicationWearableSample/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="8" package="org.tizen.example.WidgetApplicationWearableSample" version="1.0.0">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.example.WidgetApplicationWearableSample" version="1.0.0">
   <profile name="common" />
   <widget-application appid="org.tizen.example.WidgetApplicationWearableSample"
                       exec="WidgetApplicationWearableSample.dll"

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/WidgetViewSample.csproj b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/WidgetViewSample.csproj
index 6df1b02..ad5d49c 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/WidgetViewSample.csproj
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/WidgetViewSample.csproj
@@ -2,7 +2,7 @@
 \r
   <PropertyGroup>\r
     <OutputType>Exe</OutputType>\r
-    <TargetFramework>tizen90</TargetFramework>\r
+    <TargetFramework>tizen10.0</TargetFramework>\r
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>\r
   </PropertyGroup>\r
 \r
@@ -18,12 +18,12 @@
     <Folder Include="res\" />\r
   </ItemGroup>\r
 \r
+  <Import Project="..\..\..\..\Common\dependencies.props" />\r
   <ItemGroup>\r
     <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)">\r
       <ExcludeAssets>Runtime</ExcludeAssets>\r
     </PackageReference>\r
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.0.0" />\r
+    <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />\r
   </ItemGroup>\r
 \r
 </Project>\r
-\r

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/tizen-manifest.xml
index f196f2e..32e2c51 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/tizen-manifest.xml
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewSample/tizen-manifest.xml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.tizen.example.WidgetViewSample" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
-    <profile name="common" />
-    <ui-application appid="org.tizen.example.WidgetViewSample" exec="WidgetViewSample.dll" multiple="false" nodisplay="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
-        <label>WidgetViewSample</label>
-        <icon>WidgetViewSample.png</icon>
-        <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
-    </ui-application>
-    <shortcut-list />
-    <privileges>
-        <privilege>http://tizen.org/privilege/widget.viewer</privilege>
-    </privileges>
-    <provides-appdefined-privileges />
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.example.WidgetViewSample" version="1.0.0">
+  <profile name="common" />
+  <ui-application appid="org.tizen.example.WidgetViewSample"
+                  exec="WidgetViewSample.dll"
+                  multiple="false"
+                  nodisplay="false"
+                  taskmanage="true"
+                  splash-screen-display="true"
+                  type="dotnet"
+                  launch_mode="single">
+    <label>WidgetViewSample</label>
+    <icon>WidgetViewSample.png</icon>
+  </ui-application>
+  <shortcut-list />
+  <privileges>
+    <privilege>http://tizen.org/privilege/widget.viewer</privilege>
+  </privileges>
+  <provides-appdefined-privileges />
 </manifest>

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/WidgetViewWearableSample.csproj b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/WidgetViewWearableSample.csproj
index 7399f43..ad5d49c 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/WidgetViewWearableSample.csproj
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/WidgetViewWearableSample.csproj
@@ -2,7 +2,7 @@
 \r
   <PropertyGroup>\r
     <OutputType>Exe</OutputType>\r
-    <TargetFramework>tizen90</TargetFramework>\r
+    <TargetFramework>tizen10.0</TargetFramework>\r
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>\r
   </PropertyGroup>\r
 \r
@@ -18,12 +18,12 @@
     <Folder Include="res\" />\r
   </ItemGroup>\r
 \r
+  <Import Project="..\..\..\..\Common\dependencies.props" />\r
   <ItemGroup>\r
     <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)">\r
       <ExcludeAssets>Runtime</ExcludeAssets>\r
     </PackageReference>\r
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />\r
+    <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />\r
   </ItemGroup>\r
 \r
 </Project>\r
-\r

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/tizen-manifest.xml b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/tizen-manifest.xml
index 153b0b2..2b33270 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/tizen-manifest.xml
+++ b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/code/WidgetViewWearableSample/tizen-manifest.xml
@@ -1,14 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.tizen.example.WidgetViewWearableSample" version="1.0.0" api-version="8" xmlns="http://tizen.org/ns/packages">
-    <profile name="common" />
-    <ui-application appid="org.tizen.example.WidgetViewWearableSample" exec="WidgetViewWearableSample.dll" multiple="false" nodisplay="false" taskmanage="true" splash-screen-display="true" type="dotnet" launch_mode="single">
-        <label>WidgetViewWearableSample</label>
-        <icon>WidgetViewWearableSample.png</icon>
-        <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
-    </ui-application>
-    <shortcut-list />
-    <privileges>
-        <privilege>http://tizen.org/privilege/widget.viewer</privilege>
-    </privileges>
-    <provides-appdefined-privileges />
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7" package="org.tizen.example.WidgetViewWearableSample" version="1.0.0">
+  <profile name="common" />
+  <ui-application appid="org.tizen.example.WidgetViewWearableSample"
+                  exec="WidgetViewWearableSample.dll"
+                  multiple="false"
+                  nodisplay="false"
+                  taskmanage="true"
+                  splash-screen-display="true"
+                  type="dotnet"
+                  launch_mode="single">
+    <label>WidgetViewWearableSample</label>
+    <icon>WidgetViewWearableSample.png</icon>
+    <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
+  </ui-application>
+  <shortcut-list />
+  <privileges>
+    <privilege>http://tizen.org/privilege/widget.viewer</privilege>
+  </privileges>
+  <provides-appdefined-privileges />
 </manifest>

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.NUIApplicationManualWearableTest-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.NUIApplicationManualWearableTest-1.0.0.tpk
old mode 100755 (executable)
new mode 100644 (file)
index e47b302..b0ac967
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.NUIApplicationManualWearableTest-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.NUIApplicationManualWearableTest-1.0.0.tpk differ

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.NUIApplicationsManualTests-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.NUIApplicationsManualTests-1.0.0.tpk
old mode 100755 (executable)
new mode 100644 (file)
index d5b14f4..5a6a2f2
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.NUIApplicationsManualTests-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.NUIApplicationsManualTests-1.0.0.tpk differ

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetApplicationSample-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetApplicationSample-1.0.0.tpk
old mode 100755 (executable)
new mode 100644 (file)
index ea27c48..8f6b48b
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetApplicationSample-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetApplicationSample-1.0.0.tpk differ

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetApplicationWearableSample-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetApplicationWearableSample-1.0.0.tpk
old mode 100755 (executable)
new mode 100644 (file)
index 4d0cb96..428bb7e
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetApplicationWearableSample-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetApplicationWearableSample-1.0.0.tpk differ

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewSample-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewSample-1.0.0.tpk
old mode 100755 (executable)
new mode 100644 (file)
index b97415f..5d49c3d
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewSample-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewSample-1.0.0.tpk differ

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewWearableSample-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewWearableSample-1.0.0.tpk
old mode 100755 (executable)
new mode 100644 (file)
index a3d56fc..54213ae
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewWearableSample-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Manual.Tests/org.tizen.example.WidgetViewWearableSample-1.0.0.tpk differ

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Wearable.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest.csproj b/tct-suite-vs/Resource/Tizen.NUI.Wearable.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest.csproj
index ca68791..9d2f8fc 100755 (executable)
--- a/tct-suite-vs/Resource/Tizen.NUI.Wearable.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest.csproj
+++ b/tct-suite-vs/Resource/Tizen.NUI.Wearable.Manual.Tests/code/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest/NUIWatchApplicationManualTest.csproj
@@ -1,17 +1,8 @@
-<Project>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <!-- Setting Tizen Extension Path -->
-  <PropertyGroup Label="Globals">
-    <TizenProjectExtensionsPath>$(MSBuildExtensionsPath)\Tizen\VisualStudio\</TizenProjectExtensionsPath>
-  </PropertyGroup>
-
-  <!-- Import Tizen property in Tizen.NET SDK -->
-  <Import Project="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props" Condition="Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
 
-  <!-- Property Group for .NET Core Project -->
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>tizen90</TargetFramework>
+    <TargetFramework>tizen10.0</TargetFramework>
     <TargetFrameworkIdentifier>Tizen</TargetFrameworkIdentifier>
   </PropertyGroup>
 
@@ -27,21 +18,12 @@
     <Folder Include="res\" />
   </ItemGroup>
 
-  <!-- Include Nuget Package for Tizen Project building -->
+  <Import Project="..\..\..\..\..\Common\dependencies.props" />
   <ItemGroup>
     <PackageReference Include="Tizen.NET" Version="$(TizenNETVersion)">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="Tizen.NET.Sdk" Version="1.1.2" />
+    <PackageReference Include="Tizen.NET.Sdk" Version="$(TizenNETSdkVersion)" />
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <Import Project="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets" Condition="Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets')" />
-
-  <!-- Install Check 'Visual Studio for Tizen' for developing on Visual Studio -->
-  <Target Name="TizenVsixInstallCheck" BeforeTargets="CompileDesignTime">
-    <Warning Condition="!Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props')" Text="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.props is not exist.&#xA; you need to check if 'Visual Studio for Tizen' is installed" />
-    <Warning Condition="!Exists('$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets')" Text="$(TizenProjectExtensionsPath)Tizen.NET.ProjectType.targets is not exist.\&#xA; you need to check if 'Visual Studio for Tizen' is installed" />
-  </Target>
 </Project>
-

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

diff --git a/tct-suite-vs/Resource/Tizen.NUI.Wearable.Manual.Tests/org.tizen.example.NUIWatchApplicationManualTest-1.0.0.tpk b/tct-suite-vs/Resource/Tizen.NUI.Wearable.Manual.Tests/org.tizen.example.NUIWatchApplicationManualTest-1.0.0.tpk
old mode 100755 (executable)
new mode 100644 (file)
index 4c4296d..f9dced9
Binary files a/tct-suite-vs/Resource/Tizen.NUI.Wearable.Manual.Tests/org.tizen.example.NUIWatchApplicationManualTest-1.0.0.tpk and b/tct-suite-vs/Resource/Tizen.NUI.Wearable.Manual.Tests/org.tizen.example.NUIWatchApplicationManualTest-1.0.0.tpk differ

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs
index 53527a8..f0bb2a6 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs
@@ -161,6 +161,18 @@ namespace Tizen.NUI.Tests
         }
         public void Initialize()
         {
+            FocusManager.Instance.FocusIndicator = new View()
+            {
+                PositionUsesPivotPoint = true,
+                PivotPoint = new Position(0, 0, 0),
+                WidthResizePolicy = ResizePolicyType.FillToParent,
+                HeightResizePolicy = ResizePolicyType.FillToParent,
+                BorderlineColor = Color.Orange,
+                BorderlineWidth = 4.0f,
+                BorderlineOffset = -1f,
+                BackgroundColor = new Color(0.2f, 0.2f, 0.2f, 0.2f),
+            };
+
             Tizen.Log.Fatal("NUI", "Initialize window's width is " + Window.Instance.Size.Width + " Dpi is " + Window.Instance.Dpi.Length());
             Window.Instance.BackgroundColor = Color.White;
 
@@ -233,16 +245,16 @@ namespace Tizen.NUI.Tests
             Window.Instance.GetDefaultLayer().Add(_detailView);
 
             FocusManager.Instance.SetCurrentFocusView(_run);
-        }\r
-\r
-        public void LockUIButton()\r
-        {\r
-            _runButton.IsEnabled = false;\r
-        }\r
-\r
-        public void UnlockUIButton()\r
-        {\r
-            _runButton.IsEnabled = true;\r
+        }
+
+        public void LockUIButton()
+        {
+            _runButton.IsEnabled = false;
+        }
+
+        public void UnlockUIButton()
+        {
+            _runButton.IsEnabled = true;
         }
 
         void SetCommonButtonStyle(Button btn, string text)
@@ -624,7 +636,7 @@ namespace Tizen.NUI.Tests
             _passButton.RightFocusableView = _failButton;
             _passButton.DownFocusableView = _homeButton;
             _failButton.LeftFocusableView = _passButton;
-            _failButton.RightFocusableView = _blockButton;\r
+            _failButton.RightFocusableView = _blockButton;
             _blockButton.LeftFocusableView = _failButton;
             _blockButton.RightFocusableView = _runButton;
             _blockButton.DownFocusableView = _preButton;
@@ -657,7 +669,6 @@ namespace Tizen.NUI.Tests
             _caseView.PivotPoint = PivotPoint.TopLeft;
             _caseView.Position = new Position(Window.Instance.Size.Width * 0.01f, Window.Instance.Size.Height * 0.74f, 0.0f);
             _detailView.Add(_caseView);
-            _caseView.KeyEvent += OnKeyPressed;
             _caseView.Show();
             FocusManager.Instance.SetCurrentFocusView(_caseView);
         }
@@ -757,46 +768,46 @@ namespace Tizen.NUI.Tests
             ResultNumber.Fail = 0;
             ResultNumber.Block = 0;
             _tcInfoList = new List<TestcaseInfo>();
-            foreach (var testcaseItem in _listItem)\r
-            {\r
-                foreach (KeyValuePair<string, ITest> pair in _tRunner.GetTestList())\r
-                {\r
-                    if (testcaseItem.TCName.Equals(pair.Key))\r
-                    {\r
-                        IEnumerator<CustomAttributeData> customAttributes = pair.Value.Method.MethodInfo.CustomAttributes.GetEnumerator();\r
-                        List<string> preconditions = new List<string>();\r
+            foreach (var testcaseItem in _listItem)
+            {
+                foreach (KeyValuePair<string, ITest> pair in _tRunner.GetTestList())
+                {
+                    if (testcaseItem.TCName.Equals(pair.Key))
+                    {
+                        IEnumerator<CustomAttributeData> customAttributes = pair.Value.Method.MethodInfo.CustomAttributes.GetEnumerator();
+                        List<string> preconditions = new List<string>();
                         preconditions.Add("Preconditions:");
-                        List<string> steps = new List<string>();\r
+                        List<string> steps = new List<string>();
                         steps.Add("Steps:");
-                        List<string> postconditions = new List<string>();\r
+                        List<string> postconditions = new List<string>();
                         postconditions.Add("Postconditions:\n");
-\r
-                        while (customAttributes.MoveNext())\r
-                        {\r
-                            if (customAttributes.Current.AttributeType.FullName.Equals(STEP_ATTRIBUTE_NAME))\r
-                            {\r
-                                steps.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);\r
-                            }\r
-                            else if (customAttributes.Current.AttributeType.FullName.Equals(PRECONDITION_ATTRIBUTE_NAME))\r
-                            {\r
-                                preconditions.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);\r
-                            }\r
-                            else if (customAttributes.Current.AttributeType.FullName.Equals(POSTCONDITION_ATTRIBUTE_NAME))\r
-                            {\r
-                                postconditions.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);\r
-                            }\r
-                        }\r
-\r
-                        _tcInfoList.Add(new TestcaseInfo\r
-                        {\r
-                            TestcaseName = pair.Key,\r
-                            Preconditions = preconditions,\r
-                            Steps = steps,\r
-                            Postconditions = postconditions,\r
-                        });\r
-                        break;\r
-                    }\r
-                }\r
+
+                        while (customAttributes.MoveNext())
+                        {
+                            if (customAttributes.Current.AttributeType.FullName.Equals(STEP_ATTRIBUTE_NAME))
+                            {
+                                steps.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                            else if (customAttributes.Current.AttributeType.FullName.Equals(PRECONDITION_ATTRIBUTE_NAME))
+                            {
+                                preconditions.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                            else if (customAttributes.Current.AttributeType.FullName.Equals(POSTCONDITION_ATTRIBUTE_NAME))
+                            {
+                                postconditions.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                        }
+
+                        _tcInfoList.Add(new TestcaseInfo
+                        {
+                            TestcaseName = pair.Key,
+                            Preconditions = preconditions,
+                            Steps = steps,
+                            Postconditions = postconditions,
+                        });
+                        break;
+                    }
+                }
             }
             UpdateCurrentTCInfo();
         }
@@ -810,15 +821,15 @@ namespace Tizen.NUI.Tests
             string[] str = _tcInfoList[_currentTCNum].TestcaseName.Split('.');
             _currentTCInfo.Add("CLASS:" + str[str.Length - 2]);
             _currentTCInfo.Add("METHOD:" + str[str.Length - 1]);
-            for(int index = 0; index < _tcInfoList[_currentTCNum].Preconditions.Count; index++)
+            for (int index = 0; index < _tcInfoList[_currentTCNum].Preconditions.Count; index++)
             {
                 _currentTCInfo.Add(_tcInfoList[_currentTCNum].Preconditions[index]);
             }
-            for(int index = 0; index < _tcInfoList[_currentTCNum].Steps.Count; index++ )
+            for (int index = 0; index < _tcInfoList[_currentTCNum].Steps.Count; index++)
             {
                 _currentTCInfo.Add(_tcInfoList[_currentTCNum].Steps[index]);
             }
-            for(int index = 0; index < _tcInfoList[_currentTCNum].Postconditions.Count; index++ )
+            for (int index = 0; index < _tcInfoList[_currentTCNum].Postconditions.Count; index++)
             {
                 _currentTCInfo.Add(_tcInfoList[_currentTCNum].Postconditions[index]);
             }

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSFocusManager.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSFocusManager.cs
index 6e51875..eb250a1 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSFocusManager.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSFocusManager.cs
@@ -32,7 +32,7 @@ namespace Tizen.NUI.Tests
         private Button _button1;
         private FocusManager _focusManager;
         private float _pointSize = 20.0f;
-        private TextLabel _label;
+        private TextLabel _label, _button2;
 
         [SetUp]
         public void Init()
@@ -63,7 +63,7 @@ namespace Tizen.NUI.Tests
         {
             _button1 = new Button();
             _button1.Text = information;
-            _button1.PointSize = _pointSize;\r
+            _button1.PointSize = _pointSize;
             _button1.BackgroundColor = Color.Cyan;
             _button1.Size = new Size(Window.Instance.Size.Width * 0.3f, Window.Instance.Size.Height * 0.0462f);
             _button1.Focusable = true;
@@ -71,6 +71,19 @@ namespace Tizen.NUI.Tests
             _testPage.ExecuteTC(_button1);
         }
 
+        private void CreateTestViewForKeyActivated(string information)
+        {
+            _button2 = new TextLabel();
+            _button2.Text = information;
+            _button2.PointSize = _pointSize;
+            _button2.BackgroundColor = Color.Cyan;
+            _button2.Size = new Size(Window.Instance.Size.Width * 0.3f, Window.Instance.Size.Height * 0.0462f);
+            _button2.Focusable = true;
+
+            FocusManager.Instance.SetAsFocusGroup(_button2, true);
+            _testPage.ExecuteTC(_button2);
+        }
+
         public View OnPreFocusChange(object sender, EventArgs e)
         {
             Tizen.Log.Fatal("NUI", "TUnit PreFocusChanged!!!!!!!!!!!!!!!!!!!!!");
@@ -82,7 +95,7 @@ namespace Tizen.NUI.Tests
         public void OnFocusedViewEnterKeyPressed(object sender, EventArgs e)
         {
             Tizen.Log.Fatal("NUI", "TUnit FocusedViewEnterKeyPressed!!!!!!!!!!!!!!!!!!!!!");
-            _button1.Text = "FocusedViewEnterKeyPressed";
+            _button2.Text = "FocusedViewEnterKeyPressed";
             ManualTest.Confirm();
         }
 
@@ -102,14 +115,14 @@ namespace Tizen.NUI.Tests
         [Property("AUTHOR", "Feng Jin, feng16.jin@samsung.com")]
         [Precondition(1, "Prepare Bluetooth keyboard and connect to TM1.")]
         [Precondition(2, "In case of Emulator, only use PC keyboard or remote controller of emulator itself.")]
-        [Precondition(3, "Please never use touch or mouse click even for push run button or next button.")]\r
-        [Precondition(4, "Must use only keyboard or remote controller! because this is key test.")]\r
+        [Precondition(3, "Please never use touch or mouse click even for push run button or next button.")]
+        [Precondition(4, "Must use only keyboard or remote controller! because this is key test.")]
         [Step(1, "Click run TC")]
         [Step(2, "Press Key-Down while the test button is focusd")]
         [Postcondition(1, "NA")]
         public async Task PreFocusChange_CB()
         {
-            if(ManualTest.IsWearable())
+            if (ManualTest.IsWearable())
             {
                 _wearTestPage.ExecuteTC(_label);
                 await ManualTest.WaitForConfirm();
@@ -134,8 +147,8 @@ namespace Tizen.NUI.Tests
         [Property("CRITERIA", "EVL")]
         [Property("AUTHOR", "Feng Jin, feng16.jin@samsung.com")]
         [Precondition(1, "Prepare Bluetooth keyboard and connect to TM1.")]
-        [Precondition(2, "In case of Emulator, only use PC keyboard or remote controller of emulator itself.")]\r
-        [Precondition(3, "Please never use touch or mouse click even for push run button or next button.")]\r
+        [Precondition(2, "In case of Emulator, only use PC keyboard or remote controller of emulator itself.")]
+        [Precondition(3, "Please never use touch or mouse click even for push run button or next button.")]
         [Precondition(4, "Must use only keyboard or remote controller! because this is key test.")]
         [Step(1, "Click run TC")]
         [Postcondition(1, "NA")]
@@ -149,14 +162,17 @@ namespace Tizen.NUI.Tests
             }
             else
             {
-                CreateTestView("Press OK(enter)!");
-                _focusManager.SetCurrentFocusView(_button1);
+                CreateTestViewForKeyActivated("Press OK(enter)!");
+
                 await Task.Delay(500);
+
+                var ret = _focusManager.SetCurrentFocusView(_button2);
+
                 _focusManager.FocusedViewActivated += OnFocusedViewEnterKeyPressed;
                 // Waits for user confirmation.
                 await ManualTest.WaitForConfirm();
                 _focusManager.FocusedViewActivated -= OnFocusedViewEnterKeyPressed;
-                _testPage.ClearTestCase(_button1);
+                _testPage.ClearTestCase(_button2);
             }
         }
 
@@ -195,6 +211,3 @@ namespace Tizen.NUI.Tests
         }
     }
 }
-
-
-