[NUI.Manual][Non-ACR] Modified pointSize and crash

Change-Id: I96083dc06bc3067c5d4d54c66a6ac82aeb10f41b

diff --git a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/ManualTestPage.cs b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/ManualTestPage.cs
index 1afe45d..4e97a83 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/ManualTestPage.cs
+++ b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/ManualTestPage.cs
@@ -64,8 +64,8 @@ namespace Tizen.NUI.Components.Tests
                     btn.Focusable = true;\r
                     btn.Text = text;
                     btn.Name = position.ToString();\r
-                    btn.PointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;\r
-                    btn.Size = new Size(Window.Instance.Size.Width * 0.4f, Window.Instance.Size.Height * 0.046f);
+                    btn.PointSize = ManualTest.GetPointSize();\r
+                    btn.Size = new Size(Window.Instance.Size.Width, Window.Instance.Size.Height * 0.046f);
                     btn.Style.Text.TextColor = new Color(0, 0, 0, 1);\r
                     btn.Style.ImageShadow = new ImageShadow\r
                     {
@@ -116,16 +116,14 @@ namespace Tizen.NUI.Components.Tests
         private const string STEP_ATTRIBUTE_NAME = "NUnit.Framework.StepAttribute";
         private const string PRECONDITION_ATTRIBUTE_NAME = "NUnit.Framework.PreconditionAttribute";
         private const string POSTCONDITION_ATTRIBUTE_NAME = "NUnit.Framework.PostconditionAttribute";
-        private List<string> _listNotPass;
         private ToastMessage _toastMessage;
-        //For TV KantM
-        //private static float PointSize = 30.0f;
-        //private static float ButtonSizeWidth = 200;
+        //For TV
         private float _pointSize = 20.0f;
 
         //Save the information of every single test case
         private List<TestcaseInfo> _tcInfoList;
         private List<string> _currentTCInfo;
+        private List<string> _listNotPass;
 
         private static ManualTestComponents _instance;
         private static Object _lockObject = new object();
@@ -169,22 +167,34 @@ namespace Tizen.NUI.Components.Tests
             Window.Instance.BackgroundColor = Color.White;
 
             _toastMessage = new ToastMessage();
-            _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+            _pointSize = ManualTest.GetPointSize();
             RunType.Value = RunType.MANUAL;
             _tRunner = new TRunner();
             _tRunner.LoadTestsuite();
             _tRunner.SingleTestDone += OnSingleTestDone;
-            _listNotPass = new List<string>();
             _tcIDList = new List<string>();
             _listItem = new List<ItemData>();
-            _listNotPass = TSettings.GetInstance().GetNotPassListManual();
-            int count = 0;
-            foreach (var tc in _listNotPass)
-            {
-                _listItem.Add(new ItemData { No = count, TCName = tc, Result = StrResult.NOTRUN });
-                _tcIDList.Add(tc);
-                count++;
+            _listNotPass = TSettings.GetInstance().GetNotPassListManual();\r
+            int count = 0;\r
+            if (_listNotPass.Count == 0)\r
+            {\r
+                foreach (KeyValuePair<string, ITest> pair in _tRunner.GetTestList())\r
+                {\r
+                    count++;\r
+                    _listItem.Add(new ItemData { No = count, TCName = pair.Key, Result = StrResult.NOTRUN });\r
+                    _tcIDList.Add(pair.Key);\r
+                }\r
+            }\r
+            else\r
+            {\r
+                foreach (var tc in _listNotPass)\r
+                {\r
+                    count++;\r
+                    _listItem.Add(new ItemData { No = count, TCName = tc, Result = StrResult.NOTRUN });\r
+                    _tcIDList.Add(tc);\r
+                }\r
             }
+
             Tizen.Log.Fatal("NUI.Components", "TCT : count:" + count.ToString());
             foreach (String nameTc in _tcIDList)
             {
@@ -234,7 +244,8 @@ namespace Tizen.NUI.Components.Tests
             btn.Focusable = true;
             btn.Text = text;\r
             btn.PointSize = _pointSize;\r
-            btn.Size = new Size(Window.Instance.Size.Width * 0.06f, Window.Instance.Size.Height * 0.046f);\r
+            float buttonWidth = ManualTest.IsMobile() ? Window.Instance.Size.Width * 0.18f : Window.Instance.Size.Width * 0.06f;\r
+            btn.Size = new Size(buttonWidth, Window.Instance.Size.Height * 0.046f);\r
             btn.Style.Text.TextColor = new Color(0, 0, 0, 1);\r
             btn.Style.ImageShadow = new ImageShadow
             {\r
@@ -286,7 +297,7 @@ namespace Tizen.NUI.Components.Tests
 \r
             //To show all the test case information(Number _className._TCName  [result]).\r
             _initList = new FlexibleView();\r
-            _initList.Size = new Size(Window.Instance.Size.Width * 0.4f, Window.Instance.Size.Height * 0.74f);\r
+            _initList.Size = new Size(Window.Instance.Size.Width, Window.Instance.Size.Height * 0.74f);\r
             _adapter = new ListBridge(_tcIDList, _listItem);\r
             _initList.SetAdapter(_adapter);\r
             LinearLayoutManager layoutManager = new LinearLayoutManager(LinearLayoutManager.VERTICAL);\r
@@ -465,10 +476,12 @@ namespace Tizen.NUI.Components.Tests
         void CreateButtons()
         {
             _notRun = new TextLabel();
-            _notRun.HorizontalAlignment = HorizontalAlignment.Begin;
+            _notRun.HorizontalAlignment = HorizontalAlignment.Center;
+            _notRun.VerticalAlignment = VerticalAlignment.Center;
             _notRun.PointSize = _pointSize;
             _notRun.Text = "Not Run";
-            _notRun.Size = new Size(Window.Instance.Size.Width * 0.06f, Window.Instance.Size.Height * 0.046f);
+            float buttonWidth = ManualTest.IsMobile() ? Window.Instance.Size.Width * 0.18f : Window.Instance.Size.Width * 0.06f;
+            _notRun.Size = new Size(buttonWidth, Window.Instance.Size.Height * 0.046f);
 
             _passButton = new Button();
             SetCommonButtonStyle(_passButton, "Pass");
@@ -588,10 +601,18 @@ namespace Tizen.NUI.Components.Tests
                 }
             };
 
-            _runButton.DownFocusableView = _homeButton;
-            _homeButton.UpFocusableView = _runButton;
+            _passButton.RightFocusableView = _failButton;
+            _passButton.DownFocusableView = _homeButton;
+            _failButton.LeftFocusableView = _passButton;
+            _failButton.RightFocusableView = _blockButton;\r
+            _blockButton.LeftFocusableView = _failButton;
+            _blockButton.RightFocusableView = _runButton;
+            _blockButton.DownFocusableView = _preButton;
+            _runButton.LeftFocusableView = _blockButton;
+            _runButton.DownFocusableView = _nextButton;\r
+            _homeButton.UpFocusableView = _passButton;
             _homeButton.RightFocusableView = _preButton;
-            _preButton.UpFocusableView = _runButton;
+            _preButton.UpFocusableView = _blockButton;
             _preButton.LeftFocusableView = _homeButton;
             _preButton.RightFocusableView = _nextButton;
             _nextButton.UpFocusableView = _runButton;
@@ -712,46 +733,48 @@ namespace Tizen.NUI.Components.Tests
             ResultNumber.Fail = 0;
             ResultNumber.Block = 0;
             _tcInfoList = new List<TestcaseInfo>();
-            foreach (var testcaseItem in _listItem)
-            {
-                foreach (KeyValuePair<string, ITest> pair in _tRunner.GetTestList())
-                {
-                    if (testcaseItem.TCName.Equals(pair.Key))
-                    {
-                        List<string> preconditions = new List<string>();
-                        preconditions.Add("Preconditions:");
-                        List<string> steps = new List<string>();
-                        steps.Add("Steps:");
-                        List<string> postconditions = new List<string>();
-                        postconditions.Add("Postconditions:\n");
-                        IEnumerator<CustomAttributeData> customAttributes = pair.Value.Method.MethodInfo.CustomAttributes.GetEnumerator();
-                        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();
+            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
+                        preconditions.Add("Preconditions:");\r
+                        List<string> steps = new List<string>();\r
+                        steps.Add("Steps:");\r
+                        List<string> postconditions = new List<string>();\r
+                        postconditions.Add("Postconditions:\n");\r
+\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
             }
+            UpdateCurrentTCInfo();
         }
 
         //The data in CurrentTCInfo list will be show in _detailList.

diff --git a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/Utils.cs b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/Utils.cs
index 0c61417..c579608 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/Utils.cs
+++ b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/Utils.cs
@@ -222,6 +222,26 @@ namespace Tizen.NUI.Components.Tests
             return false;
         }
 
+        public static float GetPointSize()\r
+        {
+            float retValue = 10.0f; //default
+            string value;
+            Tizen.System.Information.TryGetValue("tizen.org/feature/profile", out value);
+            switch (value)\r
+            {
+                case "wearable":
+                    retValue = 4.0f;
+                    break;\r
+                case "mobile":
+                    retValue = 5.0f;
+                    break;\r
+                case "tv":
+                    retValue = 20.0f;
+                    break;
+            }
+            return retValue;
+        }
+
         public static TextLabel CreateLabel(string information)
         {
             TextLabel mLabel = new TextLabel();

diff --git a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSButton.cs b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSButton.cs
index 5c28591..90e99c0 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSButton.cs
+++ b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSButton.cs
@@ -32,7 +32,7 @@ namespace Tizen.NUI.Components.Tests
         private ManualTestComponents _testPage;
         private WearableManualTestNUI _wearTestPage;
         private Components.Button _button;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+        private float _pointSize = 20.0f;
 
         [SetUp]
         public void Init()
@@ -45,6 +45,7 @@ namespace Tizen.NUI.Components.Tests
             }
             else
             {
+                _pointSize = ManualTest.GetPointSize();
                 _testPage = ManualTestComponents.GetInstance();
             }
         }

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
index 6d99c69..d6a9158 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSPopup.cs
+++ b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSPopup.cs
@@ -33,7 +33,7 @@ namespace Tizen.NUI.Components.Tests
         private WearableManualTestNUI _wearTestPage;
 
         private Popup _popup;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+        private float _pointSize = 20.0f;
         private string _resourcePath = Tizen.Applications.Application.Current.DirectoryInfo.Resource;
 
         [SetUp]
@@ -47,6 +47,7 @@ namespace Tizen.NUI.Components.Tests
             }
             else
             {
+                _pointSize = ManualTest.GetPointSize();
                 _testPage = ManualTestComponents.GetInstance();
             }
         }

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
index 4b295e6..2e39288 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSlider.cs
+++ b/tct-suite-vs/Tizen.NUI.Components.Manual.Tests/testcase/TSSlider.cs
@@ -33,7 +33,7 @@ namespace Tizen.NUI.Components.Tests
         private Window _window;
         private View _view;
         private Button _button;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+        private float _pointSize = 20.0f;
         private TextLabel _label;
         private Slider _slider;
 
@@ -45,13 +45,13 @@ namespace Tizen.NUI.Components.Tests
             if (ManualTest.IsWearable())
             {
                 _label = ManualTest.CreateLabel("This case is unsuitable for wearable, please press PASS button to continue!");
-                _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 0.28f;
                 _wearTestPage = WearableManualTestNUI.GetInstance();
             }
             else
             {
                 _testPage = ManualTestComponents.GetInstance();
             }\r
+            _pointSize = ManualTest.GetPointSize();\r
 \r
             _view = new View();
             _view.Size = new Size2D(Window.Instance.Size.Width, (int)(Window.Instance.Size.Height * 0.8));\r

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs
index c664903..231bdd4 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/ManualTestPage.cs
@@ -64,8 +64,8 @@ namespace Tizen.NUI.Tests
                     btn.Focusable = true;
                     btn.Text = text;
                     btn.Name = position.ToString();
-                    btn.PointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
-                    btn.Size = new Size(Window.Instance.Size.Width * 0.4f, Window.Instance.Size.Height * 0.046f);
+                    btn.PointSize = ManualTest.GetPointSize();
+                    btn.Size = new Size(Window.Instance.Size.Width, Window.Instance.Size.Height * 0.046f);
                     btn.Style.Text.TextColor = new Color(0, 0, 0, 1);
                     btn.Style.ImageShadow = new ImageShadow
                     {
@@ -118,9 +118,7 @@ namespace Tizen.NUI.Tests
         private const string POSTCONDITION_ATTRIBUTE_NAME = "NUnit.Framework.PostconditionAttribute";
         private List<string> _listNotPass;
         private ToastMessage _toastMessage;
-        //For TV KantM
-        //private static float PointSize = 30.0f;
-        //private static float ButtonSizeWidth = 200;
+        //For TV
         private float _pointSize = 20.0f;
 
         //Save the information of every single test case
@@ -170,21 +168,32 @@ namespace Tizen.NUI.Tests
             Window.Instance.BackgroundColor = Color.White;
 
             _toastMessage = new ToastMessage();
-            _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+            _pointSize = ManualTest.GetPointSize();
             RunType.Value = RunType.MANUAL;
             _tRunner = new TRunner();
             _tRunner.LoadTestsuite();
             _tRunner.SingleTestDone += OnSingleTestDone;
-            _listNotPass = new List<string>();
             _tcIDList = new List<string>();
             _listItem = new List<ItemData>();
             _listNotPass = TSettings.GetInstance().GetNotPassListManual();
             int count = 0;
-            foreach (var tc in _listNotPass)
+            if (_listNotPass.Count == 0)
             {
-                _listItem.Add(new ItemData { No = count, TCName = tc, Result = StrResult.NOTRUN });
-                _tcIDList.Add(tc);
-                count++;
+                foreach (KeyValuePair<string, ITest> pair in _tRunner.GetTestList())
+                {
+                    count++;
+                    _listItem.Add(new ItemData { No = count, TCName = pair.Key, Result = StrResult.NOTRUN });
+                    _tcIDList.Add(pair.Key);
+                }
+            }
+            else
+            {
+                foreach (var tc in _listNotPass)
+                {
+                    count++;
+                    _listItem.Add(new ItemData { No = count, TCName = tc, Result = StrResult.NOTRUN });
+                    _tcIDList.Add(tc);
+                }
             }
             Tizen.Log.Fatal("NUI", "TCT : count:" + count.ToString());
             foreach (String nameTc in _tcIDList)
@@ -235,7 +244,8 @@ namespace Tizen.NUI.Tests
             btn.Focusable = true;
             btn.Text = text;
             btn.PointSize = _pointSize;
-            btn.Size = new Size(Window.Instance.Size.Width * 0.06f, Window.Instance.Size.Height * 0.046f);
+            float buttonWidth = ManualTest.IsMobile() ? Window.Instance.Size.Width * 0.18f : Window.Instance.Size.Width * 0.06f;
+            btn.Size = new Size(buttonWidth, Window.Instance.Size.Height * 0.046f);
             btn.Style.Text.TextColor = new Color(0, 0, 0, 1);
             btn.Style.ImageShadow = new ImageShadow
             {
@@ -288,7 +298,7 @@ namespace Tizen.NUI.Tests
             //To show all the test case information(Number _className._TCName  [result]).
             _initList = new FlexibleView();
             _initList.Position = new Position(0, Window.Instance.Size.Height * 0.0925f);
-            _initList.Size = new Size(Window.Instance.Size.Width * 0.5f, Window.Instance.Size.Height * 0.79f);
+            _initList.Size = new Size(Window.Instance.Size.Width, Window.Instance.Size.Height * 0.74f);
             _adapter = new ListBridge(_tcIDList, _listItem);
             _initList.SetAdapter(_adapter);
             LinearLayoutManager layoutManager = new LinearLayoutManager(LinearLayoutManager.VERTICAL);
@@ -466,10 +476,12 @@ namespace Tizen.NUI.Tests
         void CreateButtons()
         {
             _notRun = new TextLabel();
-            _notRun.HorizontalAlignment = HorizontalAlignment.Begin;
+            _notRun.HorizontalAlignment = HorizontalAlignment.Center;
+            _notRun.VerticalAlignment = VerticalAlignment.Center;
             _notRun.PointSize = _pointSize;
             _notRun.Text = "Not Run";
-            _notRun.Size = new Size(Window.Instance.Size.Width * 0.06f, Window.Instance.Size.Height * 0.046f);
+            float buttonWidth = ManualTest.IsMobile() ? Window.Instance.Size.Width * 0.18f : Window.Instance.Size.Width * 0.06f;
+            _notRun.Size = new Size(buttonWidth, Window.Instance.Size.Height * 0.046f);
 
             _passButton = new Button();
             SetCommonButtonStyle(_passButton, "Pass");
@@ -589,10 +601,18 @@ namespace Tizen.NUI.Tests
                 }
             };
 
-            _runButton.DownFocusableView = _homeButton;
-            _homeButton.UpFocusableView = _runButton;
+            _passButton.RightFocusableView = _failButton;
+            _passButton.DownFocusableView = _homeButton;
+            _failButton.LeftFocusableView = _passButton;
+            _failButton.RightFocusableView = _blockButton;\r
+            _blockButton.LeftFocusableView = _failButton;
+            _blockButton.RightFocusableView = _runButton;
+            _blockButton.DownFocusableView = _preButton;
+            _runButton.LeftFocusableView = _blockButton;
+            _runButton.DownFocusableView = _nextButton;
+            _homeButton.UpFocusableView = _passButton;
             _homeButton.RightFocusableView = _preButton;
-            _preButton.UpFocusableView = _runButton;
+            _preButton.UpFocusableView = _blockButton;
             _preButton.LeftFocusableView = _homeButton;
             _preButton.RightFocusableView = _nextButton;
             _nextButton.UpFocusableView = _runButton;
@@ -715,46 +735,48 @@ namespace Tizen.NUI.Tests
             ResultNumber.Fail = 0;
             ResultNumber.Block = 0;
             _tcInfoList = new List<TestcaseInfo>();
-            foreach (var testcaseItem in _listItem)
-            {
-                foreach (KeyValuePair<string, ITest> pair in _tRunner.GetTestList())
-                {
-                    if (testcaseItem.TCName.Equals(pair.Key))
-                    {
-                        List<string> preconditions = new List<string>();
+            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
                         preconditions.Add("Preconditions:");
-                        List<string> steps = new List<string>();
+                        List<string> steps = new List<string>();\r
                         steps.Add("Steps:");
-                        List<string> postconditions = new List<string>();
+                        List<string> postconditions = new List<string>();\r
                         postconditions.Add("Postconditions:\n");
-                        IEnumerator<CustomAttributeData> customAttributes = pair.Value.Method.MethodInfo.CustomAttributes.GetEnumerator();
-                        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();
+\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
             }
+            UpdateCurrentTCInfo();
         }
 
         //The data in CurrentTCInfo list will be show in _detailList.

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs
index 73051a9..ae6ca51 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/Utils.cs
@@ -220,6 +220,26 @@ namespace Tizen.NUI.Tests
             }
 
             return false;
+        }\r
+\r
+        public static float GetPointSize()
+        {
+            float retValue = 10.0f; //default
+            string value;
+            Tizen.System.Information.TryGetValue("tizen.org/feature/profile", out value);
+            switch (value)
+            {
+                case "wearable":
+                    retValue = 4.0f;
+                    break;
+                case "mobile":
+                    retValue = 5.0f;
+                    break;
+                case "tv":
+                    retValue = 20.0f;
+                    break;
+            }
+            return retValue;
         }
 
         public static TextLabel CreateLabel(string information)

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 b6d868e..6ba1f11 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSFocusManager.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSFocusManager.cs
@@ -31,7 +31,7 @@ namespace Tizen.NUI.Tests
         private WearableManualTestNUI _wearTestPage;
         private Button _button1;
         private FocusManager _focusManager;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+        private float _pointSize = 20.0f;
         private TextLabel _label;
 
         [SetUp]
@@ -48,6 +48,7 @@ namespace Tizen.NUI.Tests
             }
             else
             {
+                _pointSize = ManualTest.GetPointSize();
                 _testPage = ManualTestNUI.GetInstance();
             }
         }

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSInputMethodContext.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSInputMethodContext.cs
index 5f4c24c..66664b5 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSInputMethodContext.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSInputMethodContext.cs
@@ -31,7 +31,7 @@ namespace Tizen.NUI.Tests
         private WearableManualTestNUI _wearTestPage;
         private Window _window;
         private Button _button;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+        private float _pointSize = 20.0f;
         private TextLabel _label;
         private TextEditor _textEditor;
 
@@ -48,6 +48,7 @@ namespace Tizen.NUI.Tests
             }
             else
             {
+                _pointSize = ManualTest.GetPointSize();
                 _testPage = ManualTestNUI.GetInstance();
             }
         }

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSNUIWidgetApplication.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSNUIWidgetApplication.cs
index 86b8eb2..5ccc5c5 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSNUIWidgetApplication.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSNUIWidgetApplication.cs
@@ -30,7 +30,6 @@ namespace Tizen.NUI.Tests
     {
         private ManualTestNUI _testPage;
         private WearableManualTestNUI _wearTestPage;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
         private bool _isMobile = false;
         private bool _isWearable = false;
         private bool _isEmulator = false;
@@ -56,7 +55,6 @@ namespace Tizen.NUI.Tests
 
             if(ManualTest.IsWearable())
             {
-                _pointSize = 4.0f;
                 _wearTestPage = WearableManualTestNUI.GetInstance();
             }
             else

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs
index 8d128e9..48bd5b1 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSTouch.cs
@@ -32,7 +32,7 @@ namespace Tizen.NUI.Tests
         private WearableManualTestNUI _wearTestPage;
         private Window _window;
         private Button _button;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+        private float _pointSize = 20.0f;
         private TextLabel _label;
 
         [SetUp]
@@ -48,6 +48,7 @@ namespace Tizen.NUI.Tests
             }
             else
             {
+                _pointSize = ManualTest.GetPointSize();
                 _testPage = ManualTestNUI.GetInstance();
             }
         }

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSView.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSView.cs
index 603c0bd..2869703 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSView.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSView.cs
@@ -31,7 +31,7 @@ namespace Tizen.NUI.Tests
         private ManualTestNUI _testPage;
         private WearableManualTestNUI _wearTestPage;
         private Button _button;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+        private float _pointSize = 20.0f;
         private TextLabel _label;
 
         [SetUp]
@@ -46,6 +46,7 @@ namespace Tizen.NUI.Tests
             }
             else
             {
+                _pointSize = ManualTest.GetPointSize();
                 _testPage = ManualTestNUI.GetInstance();
             }
         }

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWidget.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWidget.cs
index 752f966..514909e 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWidget.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWidget.cs
@@ -30,7 +30,6 @@ namespace Tizen.NUI.Tests
     {
         private ManualTestNUI _testPage;
         private WearableManualTestNUI _wearTestPage;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
 
         [SetUp]
         public void Init()
@@ -50,7 +49,6 @@ namespace Tizen.NUI.Tests
             AppControl.SendLaunchRequest(myAppControl);
             if(ManualTest.IsWearable())
             {
-                _pointSize = 4.0f;
                 _wearTestPage = WearableManualTestNUI.GetInstance();
             }
             else

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWidgetView.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWidgetView.cs
index 164d9b2..dae9a50 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWidgetView.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWidgetView.cs
@@ -30,7 +30,6 @@ namespace Tizen.NUI.Tests
     {
         private ManualTestNUI _testPage;
         private WearableManualTestNUI _wearTestPage;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
 
         [SetUp]
         public void Init()
@@ -51,7 +50,6 @@ namespace Tizen.NUI.Tests
 
             if (ManualTest.IsWearable())
             {
-                _pointSize = 4.0f;
                 _wearTestPage = WearableManualTestNUI.GetInstance();
             }
             else

diff --git a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWindow.cs b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWindow.cs
index 3ff0703..aa0fc9a 100755 (executable)
--- a/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWindow.cs
+++ b/tct-suite-vs/Tizen.NUI.Manual.Tests/testcase/TSWindow.cs
@@ -32,7 +32,7 @@ namespace Tizen.NUI.Tests
         private WearableManualTestNUI _wearTestPage;
         private Window _window;
         private Button _button;
-        private float _pointSize = (Window.Instance.Size.Width / Window.Instance.Dpi.Length()) * 1.06f;
+        private float _pointSize = 20.0f;
         private TextLabel _label;
 
         [SetUp]
@@ -48,6 +48,7 @@ namespace Tizen.NUI.Tests
             }
             else
             {
+                _pointSize = ManualTest.GetPointSize();
                 _testPage = ManualTestNUI.GetInstance();
             }
         }