From d8c05b528b5a75377848d130286bc997da06a792 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Fri, 30 Dec 2016 14:08:15 +0800
Subject: Implement plan, qpi and metric constructors

- separate runner from `plan` and move `plan` to `loader`
- rename `algorithm` to `formula`
- use `numpy` for formulas
- update sample qpi and metrics

Change-Id: I3131ca79907376f2de31d6cb920bd7d0230664a6
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 tests/unit/loader/plan_test.py | 43 ++++++++++++++++++++++++++++++++++++++++++
 tests/unit/loader/qpi_test.py  |  6 +++---
 tests/unit/runner/plan_test.py | 38 -------------------------------------
 3 files changed, 46 insertions(+), 41 deletions(-)
 create mode 100644 tests/unit/loader/plan_test.py
 delete mode 100644 tests/unit/runner/plan_test.py

(limited to 'tests/unit')

diff --git a/tests/unit/loader/plan_test.py b/tests/unit/loader/plan_test.py
new file mode 100644
index 00000000..6aab5e8a
--- /dev/null
+++ b/tests/unit/loader/plan_test.py
@@ -0,0 +1,43 @@
+##############################################################################
+# Copyright (c) 2016 ZTE Corp and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+import pytest
+
+from qtip.base.constant import PropName
+from qtip.loader.plan import Plan, QPISpec
+
+
+def test_init(plan):
+    assert plan.name == 'fake plan'
+    assert isinstance(plan.content, dict)
+    for qpi in plan.qpis:
+        assert isinstance(qpi, QPISpec)
+
+    with pytest.raises(TypeError) as excinfo:
+        Plan()
+    assert '__init__() takes at least 2 arguments (1 given)' \
+           in str(excinfo.value)
+
+
+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
+
+
+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
diff --git a/tests/unit/loader/qpi_test.py b/tests/unit/loader/qpi_test.py
index c0d4b377..4b3fd4d0 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 AlgoName, PropName
+from qtip.base.constant import FormulaName, PropName
 from qtip.loader.qpi import QPISpec
 
 QPI_SPEC = 'compute.yaml'
@@ -42,10 +42,10 @@ def test_list_all(benchmarks_root):
 def test_content(qpi_spec):
     content = qpi_spec.content
     assert PropName.DESCRIPTION in content
-    assert PropName.ALGORITHM in content
+    assert PropName.FORMULA in content
     assert PropName.SECTIONS in content
 
-    assert content[PropName.ALGORITHM] in AlgoName.__dict__.values()
+    assert content[PropName.FORMULA] in FormulaName.__dict__.values()
     sections = content[PropName.SECTIONS]
     assert isinstance(sections, list)
     for section in sections:
diff --git a/tests/unit/runner/plan_test.py b/tests/unit/runner/plan_test.py
deleted file mode 100644
index 7b3611d1..00000000
--- a/tests/unit/runner/plan_test.py
+++ /dev/null
@@ -1,38 +0,0 @@
-##############################################################################
-# Copyright (c) 2016 ZTE Corp and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-import pytest
-
-from qtip.base.constant import PropName
-from qtip.runner.plan import Plan
-
-
-def test_init(plan):
-    assert plan.name == 'fake plan'
-
-    with pytest.raises(TypeError) as excinfo:
-        Plan()
-    assert '__init__() takes at least 2 arguments (1 given)' \
-           in str(excinfo.value)
-
-
-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
-
-
-def test_content(plan):
-    content = plan.content
-    assert PropName.NAME in content
-    assert PropName.DESCRIPTION in content
-- 
cgit 1.2.3-korg