add test result/dashboard related unittests in testAPI and refactor its response

[releng.git] / utils / test / result_collection_api / resources / models.py

diff --git a/utils/test/result_collection_api/resources/models.py b/utils/test/result_collection_api/resources/models.py
index b919d9e..b4094dd 100644 (file)
--- a/utils/test/result_collection_api/resources/models.py
+++ b/utils/test/result_collection_api/resources/models.py
@@ -10,7 +10,8 @@
 # feng.xiaowei@zte.com.cn  mv TestProject to project_models.py     5-19-2016\r
 # feng.xiaowei@zte.com.cn  delete meta class                       5-19-2016\r
 # feng.xiaowei@zte.com.cn  add CreateResponse                      5-19-2016\r
-# feng.xiaowei@zte.com.cn  mv TestCase to testcase_models.py           5-20-2016\r
+# feng.xiaowei@zte.com.cn  mv TestCase to testcase_models.py       5-20-2016\r
+# feng.xiaowei@zte.com.cn  mv TestResut to result_models.py        5-23-2016\r
 ##############################################################################\r
 \r
 \r
@@ -29,91 +30,3 @@ class CreateResponse(object):
 \r
     def format(self):\r
         return {'href': self.href}\r
-\r
-\r
-class TestResult:\r
-    """ Describes a test result"""\r
-\r
-    def __init__(self):\r
-        self._id = None\r
-        self.case_name = None\r
-        self.project_name = None\r
-        self.pod_name = None\r
-        self.installer = None\r
-        self.version = None\r
-        self.description = None\r
-        self.creation_date = None\r
-        self.details = None\r
-        self.build_tag = None\r
-        self.scenario = None\r
-        self.criteria = None\r
-        self.trust_indicator = None\r
-\r
-    @staticmethod\r
-    def test_result_from_dict(test_result_dict):\r
-\r
-        if test_result_dict is None:\r
-            return None\r
-\r
-        t = TestResult()\r
-        t._id = test_result_dict.get('_id')\r
-        t.case_name = test_result_dict.get('case_name')\r
-        t.pod_name = test_result_dict.get('pod_name')\r
-        t.project_name = test_result_dict.get('project_name')\r
-        t.description = test_result_dict.get('description')\r
-        t.creation_date = str(test_result_dict.get('creation_date'))\r
-        t.details = test_result_dict.get('details')\r
-        t.version = test_result_dict.get('version')\r
-        t.installer = test_result_dict.get('installer')\r
-        t.build_tag = test_result_dict.get('build_tag')\r
-        t.scenario = test_result_dict.get('scenario')\r
-        t.criteria = test_result_dict.get('criteria')\r
-        # 0 < trust indicator < 1\r
-        # if bad value =>  set this indicator to 0\r
-        if test_result_dict.get('trust_indicator') is not None:\r
-            if isinstance(test_result_dict.get('trust_indicator'),\r
-                          (int, long, float)):\r
-                if test_result_dict.get('trust_indicator') < 0:\r
-                    t.trust_indicator = 0\r
-                elif test_result_dict.get('trust_indicator') > 1:\r
-                    t.trust_indicator = 1\r
-                else:\r
-                    t.trust_indicator = test_result_dict.get('trust_indicator')\r
-            else:\r
-                t.trust_indicator = 0\r
-        else:\r
-            t.trust_indicator = 0\r
-        return t\r
-\r
-    def format(self):\r
-        return {\r
-            "case_name": self.case_name,\r
-            "project_name": self.project_name,\r
-            "pod_name": self.pod_name,\r
-            "description": self.description,\r
-            "creation_date": str(self.creation_date),\r
-            "version": self.version,\r
-            "installer": self.installer,\r
-            "details": self.details,\r
-            "build_tag": self.build_tag,\r
-            "scenario": self.scenario,\r
-            "criteria": self.criteria,\r
-            "trust_indicator": self.trust_indicator\r
-        }\r
-\r
-    def format_http(self):\r
-        return {\r
-            "_id": str(self._id),\r
-            "case_name": self.case_name,\r
-            "project_name": self.project_name,\r
-            "pod_name": self.pod_name,\r
-            "description": self.description,\r
-            "creation_date": str(self.creation_date),\r
-            "version": self.version,\r
-            "installer": self.installer,\r
-            "details": self.details,\r
-            "build_tag": self.build_tag,\r
-            "scenario": self.scenario,\r
-            "criteria": self.criteria,\r
-            "trust_indicator": self.trust_indicator\r
-        }\r