[Non-ACR][ManualTemplate]Fix null testcases list when re-launch app

Change-Id: I773307bce344ff791f9ecf4a20b70f1eda8f2917

diff --git a/tct-suite-vs/Template/ManualTemplate/ManualTemplate.cs b/tct-suite-vs/Template/ManualTemplate/ManualTemplate.cs
index 78b0aaf..287a606 100755 (executable)
--- a/tct-suite-vs/Template/ManualTemplate/ManualTemplate.cs
+++ b/tct-suite-vs/Template/ManualTemplate/ManualTemplate.cs
@@ -52,11 +52,23 @@ namespace ManualTemplate
             _listNotPass = TSettings.GetInstance().GetNotPassListManual();
 
             int count = 0;
-            foreach (var tc in _listNotPass)
-            {
-                count++;
-                _listItem.Add(new ItemData { No = count, TCName = tc, Result = StrResult.NOTRUN });
-                _tcIDList.Add(tc);
+            if(_listNotPass.Count==0)\r
+            {\r
+                foreach (KeyValuePair<string, ITest> pair in _tunitrunner.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
             }
 
             ResultNumber.Total = ResultNumber.NotRun = _tcIDList.Count;

diff --git a/tct-suite-vs/Template/ManualTemplateForWearable/ManualTemplate.cs b/tct-suite-vs/Template/ManualTemplateForWearable/ManualTemplate.cs
index a4cff8b..320aaa8 100755 (executable)
--- a/tct-suite-vs/Template/ManualTemplateForWearable/ManualTemplate.cs
+++ b/tct-suite-vs/Template/ManualTemplateForWearable/ManualTemplate.cs
@@ -49,11 +49,23 @@ namespace WearableTemplate
             _listNotPass = TSettings.GetInstance().GetNotPassListManual();
 
             int count = 0;
-            foreach (var tc in _listNotPass)
-            {
-                count++;
-                _listItem.Add(new ItemData { No = count, TCName = tc, Result = StrResult.NOTRUN });
-                _tcIDList.Add(tc);
+            if (_listNotPass.Count == 0)\r
+            {\r
+                foreach (KeyValuePair<string, ITest> pair in _tunitrunner.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
             }
 
             ResultNumber.Total = ResultNumber.NotRun = _tcIDList.Count;