5 files changed, 49 insertions, 13 deletions
diff --git a/tests/unit/loader/__init__.py b/tests/unit/loader/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/tests/unit/loader/__init__.py
+++ /dev/null
diff --git a/tests/unit/loader/metric_test.py b/tests/unit/loader/metric_test.py
index 26f144af..619d5e00 100644
--- a/tests/unit/loader/metric_test.py
+++ b/tests/unit/loader/metric_test.py
@@ -28,11 +28,10 @@ def init_test(metric_spec):
 
 
 def list_all_test(benchmarks_root):
-    metric_list = MetricSpec.list_all(paths=[benchmarks_root])
-    assert len(list(metric_list)) is 6
+    metric_list = list(MetricSpec.list_all(paths=[benchmarks_root]))
+    assert len(metric_list) is 6
     for desc in metric_list:
         assert BaseProp.NAME in desc
-        assert BaseProp.DESCRIPTION in desc
         assert BaseProp.ABSPATH in desc
         assert BaseProp.ABSPATH is not None
 
@@ -40,6 +39,5 @@ def list_all_test(benchmarks_root):
 def content_test(metric_spec):
     content = metric_spec.content
     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 32837f8f..d9869cb6 100644
--- a/tests/unit/loader/plan_test.py
+++ b/tests/unit/loader/plan_test.py
@@ -9,12 +9,15 @@
 
 import pytest
 
-from qtip.base.constant import PlanProp
-from qtip.loader.plan import Plan, QPISpec
+from qtip.collector.logfile import LogfileCollector
+from qtip.loader.plan import load_collector
+from qtip.loader.plan import Plan
+from qtip.loader.plan import PlanProp
+from qtip.loader.plan import QPISpec
 
 
 def test_init(plan):
-    assert plan.name == 'fake plan'
+    assert plan.name == 'doctor performance profiling'
     assert isinstance(plan.content, dict)
     for qpi in plan.qpis:
         assert isinstance(qpi, QPISpec)
@@ -26,11 +29,10 @@ def test_init(plan):
 
 
 def test_list_all(benchmarks_root):
-    plan_list = Plan.list_all(paths=[benchmarks_root])
-    assert len(list(plan_list)) is 2
+    plan_list = list(Plan.list_all(paths=[benchmarks_root]))
+    assert len(plan_list) is 1
     for desc in plan_list:
         assert PlanProp.NAME in desc
-        assert PlanProp.CONTENT in desc
         assert PlanProp.ABSPATH in desc
         assert PlanProp.ABSPATH is not None
 
@@ -41,3 +43,7 @@ def test_content(plan):
     assert PlanProp.DESCRIPTION in content
     assert PlanProp.CONFIG in content
     assert PlanProp.QPIS in content
+
+
+def test_load_collector():
+    assert load_collector(LogfileCollector.TYPE) is LogfileCollector
diff --git a/tests/unit/loader/qpi_test.py b/tests/unit/loader/qpi_test.py
index 3328b43a..b53030d4 100644
--- a/tests/unit/loader/qpi_test.py
+++ b/tests/unit/loader/qpi_test.py
@@ -30,11 +30,10 @@ def test_init(qpi_spec):
 
 
 def test_list_all(benchmarks_root):
-    qpi_spec_list = QPISpec.list_all(paths=[benchmarks_root])
-    assert len(list(qpi_spec_list)) is 2
+    qpi_spec_list = list(QPISpec.list_all(paths=[benchmarks_root]))
+    assert len(qpi_spec_list) is 2
     for item in qpi_spec_list:
         assert SpecProp.NAME in item
-        assert SpecProp.CONTENT in item
         assert SpecProp.ABSPATH in item
         assert SpecProp.ABSPATH is not None
 
diff --git a/tests/unit/loader/yaml_file_test.py b/tests/unit/loader/yaml_file_test.py
new file mode 100644
index 00000000..17836946
--- /dev/null
+++ b/tests/unit/loader/yaml_file_test.py
@@ -0,0 +1,33 @@
+##############################################################################
+# Copyright (c) 2017 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 os
+import pytest
+
+from qtip.base.error import InvalidContent
+from qtip.loader.yaml_file import YamlFileLoader
+
+
+@pytest.fixture
+def yaml_root(data_root):
+    return os.path.join(data_root, 'yaml')
+
+
+@pytest.mark.parametrize('filename, expected', [
+    ('with_name.yaml', 'name in content'),
+    ('without_name.yaml', 'without_name')])
+def test_init(yaml_root, filename, expected):
+    loader = YamlFileLoader(filename, [yaml_root])
+    assert loader.name == expected
+
+
+def test_invalid_content(yaml_root):
+    with pytest.raises(InvalidContent) as excinfo:
+        YamlFileLoader('invalid.yaml', [yaml_root])
+    assert 'invalid.yaml' in excinfo.value.filename