From 68cec51e6bce7c8e37e74ebbb6254b944b950ca5 Mon Sep 17 00:00:00 2001
From: Stefano Borini <sborini@enthought.com>
Date: Wed, 26 Jul 2017 10:24:20 +0100
Subject: [PATCH] Fixed tests
---
force_bdss/base_core_driver.py | 5 +++--
.../dummy/dummy_dakota/tests/test_dakota_communicator.py | 1 -
force_bdss/io/workflow_writer.py | 1 -
force_bdss/mco/parameters/core_mco_parameters.py | 6 ++++--
.../mco/parameters/tests/test_core_mco_parameters.py | 6 +++---
force_bdss/tests/fixtures/test_csv.json | 9 +++++----
6 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/force_bdss/base_core_driver.py b/force_bdss/base_core_driver.py
index 72c09b3..6b43b4c 100644
--- a/force_bdss/base_core_driver.py
+++ b/force_bdss/base_core_driver.py
@@ -32,11 +32,12 @@ class BaseCoreDriver(Plugin):
def _parameter_factory_registry_default(self):
registry = MCOParameterFactoryRegistry()
for f in all_core_factories():
- self.register(f)
+ registry.register(f)
return registry
def _workflow_default(self):
- reader = WorkflowReader(self.bundle_registry)
+ reader = WorkflowReader(self.bundle_registry,
+ self.parameter_factory_registry)
with open(self.application.workflow_filepath) as f:
return reader.read(f)
diff --git a/force_bdss/core_plugins/dummy/dummy_dakota/tests/test_dakota_communicator.py b/force_bdss/core_plugins/dummy/dummy_dakota/tests/test_dakota_communicator.py
index 7bb6ba4..a17b59d 100644
--- a/force_bdss/core_plugins/dummy/dummy_dakota/tests/test_dakota_communicator.py
+++ b/force_bdss/core_plugins/dummy/dummy_dakota/tests/test_dakota_communicator.py
@@ -35,4 +35,3 @@ class TestDakotaCommunicator(unittest.TestCase):
self.assertEqual(len(data.value_names), 1)
self.assertEqual(len(data.value_types), 1)
self.assertEqual(len(data.values), 1)
-
diff --git a/force_bdss/io/workflow_writer.py b/force_bdss/io/workflow_writer.py
index cbc9a7b..b757d03 100644
--- a/force_bdss/io/workflow_writer.py
+++ b/force_bdss/io/workflow_writer.py
@@ -39,7 +39,6 @@ class WorkflowWriter(HasStrictTraits):
wf_data["multi_criteria_optimizer"]["model_data"]["parameters"] = parameters_data # noqa
-
kpic_data = []
for kpic in workflow.kpi_calculators:
kpic_data.append({
diff --git a/force_bdss/mco/parameters/core_mco_parameters.py b/force_bdss/mco/parameters/core_mco_parameters.py
index 072d0a2..35e4623 100644
--- a/force_bdss/mco/parameters/core_mco_parameters.py
+++ b/force_bdss/mco/parameters/core_mco_parameters.py
@@ -26,5 +26,7 @@ def all_core_factories():
"""Produces a list of all factories contained in this module."""
import inspect
- return [c for c in inspect.getmodule(all_core_factories).__dict__.values()
- if inspect.isclass(c) and issubclass(c, BaseMCOParameterFactory)]
+ return [c() for c in inspect.getmodule(all_core_factories).__dict__.values()
+ if inspect.isclass(c) and
+ c is not BaseMCOParameterFactory and
+ issubclass(c, BaseMCOParameterFactory)]
diff --git a/force_bdss/mco/parameters/tests/test_core_mco_parameters.py b/force_bdss/mco/parameters/tests/test_core_mco_parameters.py
index feec858..af6f4c9 100644
--- a/force_bdss/mco/parameters/tests/test_core_mco_parameters.py
+++ b/force_bdss/mco/parameters/tests/test_core_mco_parameters.py
@@ -6,9 +6,9 @@ from force_bdss.mco.parameters.base_mco_parameter_factory import \
class TestCoreMCOParameters(unittest.TestCase):
- def test_all_classes(self):
+ def test_all_factories(self):
factories = core_mco_parameters.all_core_factories()
- self.assertNotEqual(len(factories), 0)
+ self.assertEqual(len(factories), 1)
for f in factories:
- self.assertTrue(issubclass(f, BaseMCOParameterFactory))
+ self.assertIsInstance(f, BaseMCOParameterFactory)
diff --git a/force_bdss/tests/fixtures/test_csv.json b/force_bdss/tests/fixtures/test_csv.json
index f061c10..85fb4fb 100644
--- a/force_bdss/tests/fixtures/test_csv.json
+++ b/force_bdss/tests/fixtures/test_csv.json
@@ -2,13 +2,14 @@
"version": "1",
"workflow": {
"multi_criteria_optimizer": {
- "id": "force.bdss.bundles.enthought.dakota",
+ "id": "force.bdss.bundle.enthought.dakota",
"model_data": {
+ "parameters" : []
}
},
"data_sources": [
{
- "id": "force.bdss.bundles.enthought.csv_extractor",
+ "id": "force.bdss.bundle.enthought.csv_extractor",
"model_data": {
"filename": "foo.csv",
"row": 3,
@@ -17,7 +18,7 @@
}
},
{
- "id": "force.bdss.bundles.enthought.csv_extractor",
+ "id": "force.bdss.bundle.enthought.csv_extractor",
"model_data": {
"filename": "foo.csv",
"row": 3,
@@ -28,7 +29,7 @@
],
"kpi_calculators": [
{
- "id": "force.bdss.bundles.enthought.kpi_adder",
+ "id": "force.bdss.bundle.enthought.kpi_adder",
"model_data": {
"cuba_type_in": "PRESSURE",
"cuba_type_out": "TOTAL_PRESSURE"
--
GitLab