refactored OrderedDicts #355

ISA-tools · Apr 28, 2020 · 6c1cddf · 6c1cddf
1 parent 98dc7c7
commit 6c1cddf
Showing 1 changed file with 1 addition and 37 deletions.
diff --git a/tests/test_create_models_json.py b/tests/test_create_models_json.py
@@ -6,6 +6,7 @@
 
 from isatools.create.models import *
 from isatools.tests import utils
+from tests.create_sample_assay_plan_odicts import nmr_assay_dict
 
 
 def ordered(o):  # to enable comparison of JSONs with lists using ==
@@ -81,43 +82,6 @@ def handle_inner_lists(el):
 BIOLOGICAL_FACTOR_2_VALUE = 7
 BIOLOGICAL_FACTOR_2_UNIT = OntologyAnnotation(term='day')
 
-nmr_assay_dict = OrderedDict([
-    ('measurement_type', OntologyAnnotation(term='metabolite profiling')),
-    ('technology_type', OntologyAnnotation(term='nmr spectroscopy')),
-            ('extraction', {}),
-            ('extract', [
-                {
-                    'node_type': SAMPLE,
-                    'characteristics_category':  OntologyAnnotation(term='extract type'),
-                    'characteristics_value': OntologyAnnotation(term='supernatant'),
-                    'size': 1,
-                    'technical_replicates': None,
-                    'is_input_to_next_protocols': True
-                },
-                {
-                    'node_type': SAMPLE,
-                    'characteristics_category':  OntologyAnnotation(term='extract type'),
-                    'characteristics_value': OntologyAnnotation(term='pellet'),
-                    'size': 1,
-                    'technical_replicates': None,
-                    'is_input_to_next_protocols': True
-                }
-            ]),
-            ('nmr_spectroscopy', {
-                OntologyAnnotation(term='instrument'): [OntologyAnnotation(term='Bruker AvanceII 1 GHz')],
-                OntologyAnnotation(term='acquisition_mode'): [OntologyAnnotation(term='1D 13C NMR')],
-                OntologyAnnotation(term='pulse_sequence'): [OntologyAnnotation(term='CPMG')]
-            }),
-            ('raw_spectral_data_file', [
-                {
-                    'node_type': DATA_FILE,
-                    'size': 1,
-                    'technical_replicates': 2,
-                    'is_input_to_next_protocols': False
-                }
-            ])
-        ])
-
 
 class OrderedTest(unittest.TestCase):