From 89e3f17d136f80c5406cdaff67d33b4c8159aac4 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Tue, 6 Dec 2016 16:30:11 +0800 Subject: Implement TestPlan prototype Refactor common part of Suite to Benchmark since both TestPlan and Suite are organized by files Change-Id: I61a97d9489096c4a6305c99e8cf7abb958faa562 Signed-off-by: Yujun Zhang --- tests/unit/runner/suite_test.py | 8 ++++---- tests/unit/runner/test_plan_test.py | 13 ------------ tests/unit/runner/testplan_test.py | 41 +++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 17 deletions(-) delete mode 100644 tests/unit/runner/test_plan_test.py create mode 100644 tests/unit/runner/testplan_test.py (limited to 'tests') diff --git a/tests/unit/runner/suite_test.py b/tests/unit/runner/suite_test.py index 0539cee0..5d2f1066 100644 --- a/tests/unit/runner/suite_test.py +++ b/tests/unit/runner/suite_test.py @@ -11,7 +11,7 @@ from os import path import pytest from qtip.runner.suite import Suite -from qtip.runner.suite import SuiteProperty as SProp +from qtip.runner.benchmark import Property class TestSuiteClass: @@ -36,6 +36,6 @@ class TestSuite: suite_list = Suite.list_all() assert len(list(suite_list)) is 3 for suite_desc in suite_list: - assert SProp.NAME in suite_desc - assert SProp.DESCRIPTION in suite_desc - assert SProp.ABSPATH in suite_desc + assert Property.NAME in suite_desc + assert Property.DESCRIPTION in suite_desc + assert Property.ABSPATH in suite_desc diff --git a/tests/unit/runner/test_plan_test.py b/tests/unit/runner/test_plan_test.py deleted file mode 100644 index 81f618c7..00000000 --- a/tests/unit/runner/test_plan_test.py +++ /dev/null @@ -1,13 +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 -############################################################################## - - -class TestTestPlan: - def test_list(self): - assert True diff --git a/tests/unit/runner/testplan_test.py b/tests/unit/runner/testplan_test.py new file mode 100644 index 00000000..2700d385 --- /dev/null +++ b/tests/unit/runner/testplan_test.py @@ -0,0 +1,41 @@ +############################################################################## +# 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 +############################################################################## + +from os import path +import pytest + +from qtip.runner.testplan import TestPlan +from qtip.runner.benchmark import Property + + +class TestTestPlanClass: + def test_attr(self): + assert len(TestPlan._paths) is 1 + + +class TestTestPlan: + TestPlan._paths = [path.join(path.dirname(__file__), path.pardir, + path.pardir, 'data', 'testplan')] + + def test_init(self): + plan = TestPlan('plan-a') + assert plan.name == 'plan-a' + + with pytest.raises(TypeError) as excinfo: + TestPlan() + assert '__init__() takes exactly 2 arguments (1 given)' \ + in str(excinfo.value) + + def test_list(self): + plan_list = TestPlan.list_all() + assert len(list(plan_list)) is 5 + for desc in plan_list: + assert Property.NAME in desc + assert Property.DESCRIPTION in desc + assert Property.ABSPATH in desc -- cgit 1.2.3-korg