From 873fa3fa60da174a1d262774b64527fc03884658 Mon Sep 17 00:00:00 2001
From: martinRenou <martin.renou@isae.fr>
Date: Wed, 19 Jul 2017 15:57:11 +0100
Subject: [PATCH] Clean code
---
.../tests/fixtures/test_csv_corrupted.json | 35 ------------------
.../cli/tests/fixtures/test_csv_v2.json | 37 +------------------
2 files changed, 1 insertion(+), 71 deletions(-)
diff --git a/force_bdss/cli/tests/fixtures/test_csv_corrupted.json b/force_bdss/cli/tests/fixtures/test_csv_corrupted.json
index d09b6f7..2c63c08 100644
--- a/force_bdss/cli/tests/fixtures/test_csv_corrupted.json
+++ b/force_bdss/cli/tests/fixtures/test_csv_corrupted.json
@@ -1,37 +1,2 @@
{
- "multi_criteria_optimizer": {
- "id": "force.bdss.bundles.enthought.dakota",
- "model_data": {
- "value_types": ["DUMMY"]
- }
- },
- "data_sources": [
- {
- "id": "force.bdss.bundles.enthought.csv_extractor",
- "model_data": {
- "filename": "foo.csv",
- "row": 3,
- "column": 5,
- "cuba_type": "PRESSURE"
- }
- },
- {
- "id": "force.bdss.bundles.enthought.csv_extractor",
- "model_data": {
- "filename": "foo.csv",
- "row": 3,
- "column": 5,
- "cuba_type": "PRESSURE"
- }
- }
- ],
- "kpi_calculators": [
- {
- "id": "force.bdss.bundles.enthought.kpi_adder",
- "model_data": {
- "cuba_type_in": "PRESSURE",
- "cuba_type_out": "TOTAL_PRESSURE"
- }
- }
- ]
}
diff --git a/force_bdss/cli/tests/fixtures/test_csv_v2.json b/force_bdss/cli/tests/fixtures/test_csv_v2.json
index 6213170..a6963bb 100644
--- a/force_bdss/cli/tests/fixtures/test_csv_v2.json
+++ b/force_bdss/cli/tests/fixtures/test_csv_v2.json
@@ -1,38 +1,3 @@
{
- "version": "2",
- "multi_criteria_optimizer": {
- "id": "force.bdss.bundles.enthought.dakota",
- "model_data": {
- "value_types": ["DUMMY"]
- }
- },
- "data_sources": [
- {
- "id": "force.bdss.bundles.enthought.csv_extractor",
- "model_data": {
- "filename": "foo.csv",
- "row": 3,
- "column": 5,
- "cuba_type": "PRESSURE"
- }
- },
- {
- "id": "force.bdss.bundles.enthought.csv_extractor",
- "model_data": {
- "filename": "foo.csv",
- "row": 3,
- "column": 5,
- "cuba_type": "PRESSURE"
- }
- }
- ],
- "kpi_calculators": [
- {
- "id": "force.bdss.bundles.enthought.kpi_adder",
- "model_data": {
- "cuba_type_in": "PRESSURE",
- "cuba_type_out": "TOTAL_PRESSURE"
- }
- }
- ]
+ "version": "2"
}
--
GitLab