From: raycad <anh.vn@samsung.com>
Date: Fri, 22 Feb 2019 10:31:00 +0000 (+0700)
Subject: [Non-ACR][Framework][Manual][Fix only load not pass testcases]
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7f7a6b9c3fee9f0fb4dc80feef6cb5ddd65e16b8;p=test%2Ftct%2Fcsharp%2Fapi.git

[Non-ACR][Framework][Manual][Fix only load not pass testcases]

Change-Id: Ie0d3a5c447fad500e78119ce22019ef7ebbb5ad0
---

diff --git a/tct-suite-vs/Template/ManualTemplate/ManualTemplate.cs b/tct-suite-vs/Template/ManualTemplate/ManualTemplate.cs
index f9dfe9373..78b0aafa2 100755
--- a/tct-suite-vs/Template/ManualTemplate/ManualTemplate.cs
+++ b/tct-suite-vs/Template/ManualTemplate/ManualTemplate.cs
@@ -25,6 +25,7 @@ namespace ManualTemplate
         private Label _summaryLabel;
         private ListView _listView;
         private StackLayout _mainLayout;
+        private List<string> _listNotPass;
 
 
         public static MainPage GetInstance()
@@ -44,15 +45,18 @@ namespace ManualTemplate
         public MainPage()
         {
             _tunitrunner = new TRunner();
-            _tunitrunner.LoadTestsuite();
+            _tunitrunner.LoadTestsuite();
+            _listNotPass = new List<string>();
             _tcIDList = new List<string>();
             _listItem = new List<ItemData>();
+            _listNotPass = TSettings.GetInstance().GetNotPassListManual();
+
             int count = 0;
-            foreach (KeyValuePair<string, ITest> pair in _tunitrunner.GetTestList())
+            foreach (var tc in _listNotPass)
             {
                 count++;
-                _listItem.Add(new ItemData { No = count, TCName = pair.Key, Result = StrResult.NOTRUN });
-                _tcIDList.Add(pair.Key);
+                _listItem.Add(new ItemData { No = count, TCName = tc, Result = StrResult.NOTRUN });
+                _tcIDList.Add(tc);
             }
 
             ResultNumber.Total = ResultNumber.NotRun = _tcIDList.Count;
diff --git a/tct-suite-vs/Template/ManualTemplate/TestPage.cs b/tct-suite-vs/Template/ManualTemplate/TestPage.cs
index 11b82cf9a..9f6c39e87 100755
--- a/tct-suite-vs/Template/ManualTemplate/TestPage.cs
+++ b/tct-suite-vs/Template/ManualTemplate/TestPage.cs
@@ -93,7 +93,7 @@ namespace NUnit.Framework
             _tcIDList = testcaseIDList;
             _tsettings = TSettings.GetInstance();
             _tsettings.IsManual = true;
-            _listItem = listItem;
+            _listItem = listItem;
             MakeTCInfoList();
             _summaryLabel = new Label()
             {
@@ -569,36 +569,43 @@ namespace NUnit.Framework
 
         private void MakeTCInfoList()
         {
-            foreach (KeyValuePair<string, ITest> pair in _tunitRunner.GetTestList())
-            {
-                IEnumerator<CustomAttributeData> customAttributes = pair.Value.Method.MethodInfo.CustomAttributes.GetEnumerator();
-                List<string> _preconditonsStr = new List<string>(); _preconditonsStr.Add("Preconditions:");
-                List<string> _stepsStr = new List<string>(); _stepsStr.Add("Steps:");
-                List<string> _postconditionsStr = new List<string>(); _postconditionsStr.Add("Postconditions:\n");
-
-                while (customAttributes.MoveNext())
-                {
-                    if (customAttributes.Current.AttributeType.FullName.Equals(STEP_ATTRIBUTE_NAME))
-                    {
-                        _stepsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
-                    }
-                    else if (customAttributes.Current.AttributeType.FullName.Equals(PRECONDITION_ATTRIBUTE_NAME))
-                    {
-                        _preconditonsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
-                    }
-                    else if (customAttributes.Current.AttributeType.FullName.Equals(POSTCONDITION_ATTRIBUTE_NAME))
-                    {
-                        _postconditionsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
-                    }
+            foreach (var testcaseItem in _listItem)
+            {
+                foreach (KeyValuePair<string, ITest> pair in _tunitRunner.GetTestList())
+                {
+                    if (testcaseItem.TCName.Equals(pair.Key))
+                    {
+                        IEnumerator<CustomAttributeData> customAttributes = pair.Value.Method.MethodInfo.CustomAttributes.GetEnumerator();
+                        List<string> _preconditonsStr = new List<string>(); _preconditonsStr.Add("Preconditions:");
+                        List<string> _stepsStr = new List<string>(); _stepsStr.Add("Steps:");
+                        List<string> _postconditionsStr = new List<string>(); _postconditionsStr.Add("Postconditions:\n");
+
+                        while (customAttributes.MoveNext())
+                        {
+                            if (customAttributes.Current.AttributeType.FullName.Equals(STEP_ATTRIBUTE_NAME))
+                            {
+                                _stepsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                            else if (customAttributes.Current.AttributeType.FullName.Equals(PRECONDITION_ATTRIBUTE_NAME))
+                            {
+                                _preconditonsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                            else if (customAttributes.Current.AttributeType.FullName.Equals(POSTCONDITION_ATTRIBUTE_NAME))
+                            {
+                                _postconditionsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                        }
+
+                        _tcInfoList.Add(new TestcaseInfo
+                        {
+                            TestcaseName = pair.Key,
+                            Preconditions = _preconditonsStr,
+                            Steps = _stepsStr,
+                            Postconditions = _postconditionsStr,
+                        });
+                        break;
+                    }
                 }
-
-                _tcInfoList.Add(new TestcaseInfo
-                {
-                    TestcaseName = pair.Key,
-                    Preconditions = _preconditonsStr,
-                    Steps = _stepsStr,
-                    Postconditions = _postconditionsStr,
-                });
             }
         }
 
diff --git a/tct-suite-vs/Template/ManualTemplateForWearable/ManualTemplate.cs b/tct-suite-vs/Template/ManualTemplateForWearable/ManualTemplate.cs
index 4ca4df1ed..a4cff8b55 100755
--- a/tct-suite-vs/Template/ManualTemplateForWearable/ManualTemplate.cs
+++ b/tct-suite-vs/Template/ManualTemplateForWearable/ManualTemplate.cs
@@ -22,6 +22,7 @@ namespace WearableTemplate
         private Label _summaryLabel1, _summaryLabel2;
         private ListView _listView;
         private StackLayout _mainLayout;
+        private List<string> _listNotPass;
 
 
         public static MainPage GetInstance()
@@ -42,14 +43,17 @@ namespace WearableTemplate
         {
             _tunitrunner = new TRunner();
             _tunitrunner.LoadTestsuite();
+            _listNotPass = new List<string>();
             _tcIDList = new List<string>();
             _listItem = new List<ItemData>();
+            _listNotPass = TSettings.GetInstance().GetNotPassListManual();
+
             int count = 0;
-            foreach (KeyValuePair<string, ITest> pair in _tunitrunner.GetTestList())
+            foreach (var tc in _listNotPass)
             {
                 count++;
-                _listItem.Add(new ItemData { No = count, TCName = pair.Key, Result = StrResult.NOTRUN });
-                _tcIDList.Add(pair.Key);
+                _listItem.Add(new ItemData { No = count, TCName = tc, Result = StrResult.NOTRUN });
+                _tcIDList.Add(tc);
             }
 
             ResultNumber.Total = ResultNumber.NotRun = _tcIDList.Count;
diff --git a/tct-suite-vs/Template/ManualTemplateForWearable/TestPage.cs b/tct-suite-vs/Template/ManualTemplateForWearable/TestPage.cs
index f9c9cd9c0..2d65e3223 100755
--- a/tct-suite-vs/Template/ManualTemplateForWearable/TestPage.cs
+++ b/tct-suite-vs/Template/ManualTemplateForWearable/TestPage.cs
@@ -593,36 +593,43 @@ namespace WearableTemplate
 
         private void MakeTCInfoList()
         {
-            foreach (KeyValuePair<string, ITest> pair in _tunitRunner.GetTestList())
+            foreach (var testcaseItem in _listItem)
             {
-                IEnumerator<CustomAttributeData> customAttributes = pair.Value.Method.MethodInfo.CustomAttributes.GetEnumerator();
-                List<string> _preconditonsStr = new List<string>(); _preconditonsStr.Add("Preconditions:");
-                List<string> _stepsStr = new List<string>(); _stepsStr.Add("Steps:");
-                List<string> _postconditionsStr = new List<string>(); _postconditionsStr.Add("Postconditions:\n");
-
-                while (customAttributes.MoveNext())
+                foreach (KeyValuePair<string, ITest> pair in _tunitRunner.GetTestList())
                 {
-                    if (customAttributes.Current.AttributeType.FullName.Equals(STEP_ATTRIBUTE_NAME))
-                    {
-                        _stepsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
-                    }
-                    else if (customAttributes.Current.AttributeType.FullName.Equals(PRECONDITION_ATTRIBUTE_NAME))
+                    if (testcaseItem.TCName.Equals(pair.Key))
                     {
-                        _preconditonsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
-                    }
-                    else if (customAttributes.Current.AttributeType.FullName.Equals(POSTCONDITION_ATTRIBUTE_NAME))
-                    {
-                        _postconditionsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                        IEnumerator<CustomAttributeData> customAttributes = pair.Value.Method.MethodInfo.CustomAttributes.GetEnumerator();
+                        List<string> _preconditonsStr = new List<string>(); _preconditonsStr.Add("Preconditions:");
+                        List<string> _stepsStr = new List<string>(); _stepsStr.Add("Steps:");
+                        List<string> _postconditionsStr = new List<string>(); _postconditionsStr.Add("Postconditions:\n");
+
+                        while (customAttributes.MoveNext())
+                        {
+                            if (customAttributes.Current.AttributeType.FullName.Equals(STEP_ATTRIBUTE_NAME))
+                            {
+                                _stepsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                            else if (customAttributes.Current.AttributeType.FullName.Equals(PRECONDITION_ATTRIBUTE_NAME))
+                            {
+                                _preconditonsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                            else if (customAttributes.Current.AttributeType.FullName.Equals(POSTCONDITION_ATTRIBUTE_NAME))
+                            {
+                                _postconditionsStr.Add(customAttributes.Current.ConstructorArguments[0].Value + "." + customAttributes.Current.ConstructorArguments[1].Value);
+                            }
+                        }
+
+                        _tcInfoList.Add(new TestcaseInfo
+                        {
+                            TestcaseName = pair.Key,
+                            Preconditions = _preconditonsStr,
+                            Steps = _stepsStr,
+                            Postconditions = _postconditionsStr,
+                        });
+                        break;
                     }
                 }
-
-                _tcInfoList.Add(new TestcaseInfo
-                {
-                    TestcaseName = pair.Key,
-                    Preconditions = _preconditonsStr,
-                    Steps = _stepsStr,
-                    Postconditions = _postconditionsStr,
-                });
             }
         }
 
diff --git a/tct-suite-vs/nunit.framework/TUnit/TSettings.cs b/tct-suite-vs/nunit.framework/TUnit/TSettings.cs
index b7c9b285a..6aec04870 100755
--- a/tct-suite-vs/nunit.framework/TUnit/TSettings.cs
+++ b/tct-suite-vs/nunit.framework/TUnit/TSettings.cs
@@ -316,7 +316,36 @@ namespace NUnit.Framework.TUnit
                 return true;
             else
                 return false;
-        }
+        }
+
+        public List<string> ManualTestTaskRequest()
+        {
+            List<string> list = new List<string>();
+            string result = RequestGET("manual_cases", _session_id);
+            if (result == null)
+                return list;
+
+            result = result.Replace("[", "");
+            result = result.Replace("]", "");
+            result = result.Replace("\n", "");
+            result = result.Replace("{", "");
+            result = result.Replace("}", "");
+            result = result.Replace(" ", "");
+
+            string[] arr = result.Split(',');
+
+            foreach (string item in arr)
+            {
+                if (!item.Equals("") && item.Contains("case_id"))
+                {
+                    string tmp = item.Replace("\"", "");
+                    string[] keyValue = tmp.Split(':');
+                    list.Add(keyValue[1]);
+                }
+            }
+
+            return list;
+        }
 
         public string AutoTestTaskRequest()
         {
@@ -405,7 +434,7 @@ namespace NUnit.Framework.TUnit
                 StreamReader reader = new StreamReader(respPostStream);
                 result = reader.ReadToEnd();
 
-                Console.WriteLine("[TUnitTest] - " + "RequestPOST Result :" + result);
+                Console.WriteLine("[TUnitTest] - " + "###############Asavin############### RequestPOST Result :" + result);
                 reader.Dispose();
 
                 return result;
@@ -430,6 +459,18 @@ namespace NUnit.Framework.TUnit
         }
 
 #if TIZEN
+        public List<string> GetNotPassListManual()
+        {
+            List<string> list = new List<string>();
+            LogUtils.Write(LogUtils.INFO, LogUtils.TAG, "############### GetNotPassListManual ###############");
+            if (AskNextStepRequest())
+            {
+                CheckExecutionProgressRequest();
+                list = ManualTestTaskRequest();
+            }
+            return list;
+        }
+
         public void NextStepRequest()
         {
             TLogger.Write("############### NextStepRequest ###############");