From b659a9296223b7f63a89bedbc0dad281117de936 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Thu, 19 Jan 2017 15:10:01 +0800
Subject: Formalize constants for property names

Change-Id: I68560b2299c2a815219bc0d0399124e0c269a2c0
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 tests/unit/loader/metric_test.py | 18 +++++++++---------
 tests/unit/loader/plan_test.py   | 18 +++++++++---------
 tests/unit/loader/qpi_test.py    | 22 +++++++++++-----------
 3 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'tests')

diff --git a/tests/unit/loader/metric_test.py b/tests/unit/loader/metric_test.py
index d2be0388..91d0dd2c 100644
--- a/tests/unit/loader/metric_test.py
+++ b/tests/unit/loader/metric_test.py
@@ -9,7 +9,7 @@
 
 import pytest
 
-from qtip.base.constant import PropName
+from qtip.base.constant import BaseProp
 from qtip.loader.metric import MetricSpec
 
 
@@ -31,15 +31,15 @@ def list_all_test():
     metric_list = MetricSpec.list_all()
     assert len(list(metric_list)) is 6
     for desc in metric_list:
-        assert PropName.NAME in desc
-        assert PropName.DESCRIPTION in desc
-        assert PropName.ABSPATH in desc
-        assert PropName.ABSPATH is not None
+        assert BaseProp.NAME in desc
+        assert BaseProp.DESCRIPTION in desc
+        assert BaseProp.ABSPATH in desc
+        assert BaseProp.ABSPATH is not None
 
 
 def content_test(metric):
     content = metric.content
-    assert PropName.NAME in content
-    assert PropName.DESCRIPTION in content
-    assert PropName.WORKLOADS in content
-    assert isinstance(content[PropName.WORKLOADS], list)
+    assert BaseProp.NAME in content
+    assert BaseProp.DESCRIPTION in content
+    assert BaseProp.WORKLOADS in content
+    assert isinstance(content[BaseProp.WORKLOADS], list)
diff --git a/tests/unit/loader/plan_test.py b/tests/unit/loader/plan_test.py
index 6aab5e8a..b57bcfb5 100644
--- a/tests/unit/loader/plan_test.py
+++ b/tests/unit/loader/plan_test.py
@@ -9,7 +9,7 @@
 
 import pytest
 
-from qtip.base.constant import PropName
+from qtip.base.constant import PlanProp
 from qtip.loader.plan import Plan, QPISpec
 
 
@@ -29,15 +29,15 @@ def test_list_all(benchmarks_root):
     plan_list = Plan.list_all(paths=[benchmarks_root])
     assert len(list(plan_list)) is 1
     for desc in plan_list:
-        assert PropName.NAME in desc
-        assert PropName.CONTENT in desc
-        assert PropName.ABSPATH in desc
-        assert PropName.ABSPATH is not None
+        assert PlanProp.NAME in desc
+        assert PlanProp.CONTENT in desc
+        assert PlanProp.ABSPATH in desc
+        assert PlanProp.ABSPATH is not None
 
 
 def test_content(plan):
     content = plan.content
-    assert PropName.NAME in content
-    assert PropName.DESCRIPTION in content
-    assert PropName.CONFIG in content
-    assert PropName.QPIS in content
+    assert PlanProp.NAME in content
+    assert PlanProp.DESCRIPTION in content
+    assert PlanProp.CONFIG in content
+    assert PlanProp.QPIS in content
diff --git a/tests/unit/loader/qpi_test.py b/tests/unit/loader/qpi_test.py
index 4b3fd4d0..3328b43a 100644
--- a/tests/unit/loader/qpi_test.py
+++ b/tests/unit/loader/qpi_test.py
@@ -9,7 +9,7 @@
 
 import pytest
 
-from qtip.base.constant import FormulaName, PropName
+from qtip.base.constant import FormulaName, SpecProp
 from qtip.loader.qpi import QPISpec
 
 QPI_SPEC = 'compute.yaml'
@@ -33,20 +33,20 @@ def test_list_all(benchmarks_root):
     qpi_spec_list = QPISpec.list_all(paths=[benchmarks_root])
     assert len(list(qpi_spec_list)) is 2
     for item in qpi_spec_list:
-        assert PropName.NAME in item
-        assert PropName.CONTENT in item
-        assert PropName.ABSPATH in item
-        assert PropName.ABSPATH is not None
+        assert SpecProp.NAME in item
+        assert SpecProp.CONTENT in item
+        assert SpecProp.ABSPATH in item
+        assert SpecProp.ABSPATH is not None
 
 
 def test_content(qpi_spec):
     content = qpi_spec.content
-    assert PropName.DESCRIPTION in content
-    assert PropName.FORMULA in content
-    assert PropName.SECTIONS in content
+    assert SpecProp.DESCRIPTION in content
+    assert SpecProp.FORMULA in content
+    assert SpecProp.SECTIONS in content
 
-    assert content[PropName.FORMULA] in FormulaName.__dict__.values()
-    sections = content[PropName.SECTIONS]
+    assert content[SpecProp.FORMULA] in FormulaName.__dict__.values()
+    sections = content[SpecProp.SECTIONS]
     assert isinstance(sections, list)
     for section in sections:
-        assert PropName.NAME in section
+        assert SpecProp.NAME in section
-- 
cgit 1.2.3-korg