diff --git a/config/modifiers.txt b/config/modifiers.txt index f654027..e24c792 100644 --- a/config/modifiers.txt +++ b/config/modifiers.txt @@ -1,4 +1,4 @@ -modifier_path modifier_cd name_char Data Type -\diagnose_mod CSR_DIAGNOSIS_MOD Diagnosis ID CATEGORICAL -\biosource_mod CSR_BIOSOURCE_MOD Biosource ID CATEGORICAL -\biomaterial_mod CSR_BIOMATERIAL_MOD Biomaterial ID CATEGORICAL +modifier_path modifier_cd name_char Data Type dimension_type sort_index +\diagnose_mod CSR_DIAGNOSIS_MOD Diagnosis ID CATEGORICAL SUBJECT 2 +\biosource_mod CSR_BIOSOURCE_MOD Biosource ID CATEGORICAL SUBJECT 3 +\biomaterial_mod CSR_BIOMATERIAL_MOD Biomaterial ID CATEGORICAL SUBJECT 4 diff --git a/tests/test_validations.py b/tests/test_validations.py index 72fa777..e0eba42 100644 --- a/tests/test_validations.py +++ b/tests/test_validations.py @@ -78,9 +78,9 @@ def test_init(self): tmp_dir = tempfile.mkdtemp() modifiers_table_file = os.path.join(tmp_dir, 'modifiers.tsv') create_tsv_file(modifiers_table_file, [ - ['modifier_path', 'modifier_cd', 'name_char', 'Data Type'], - ['\\mod1', 'MOD1', 'MoDiFiEr #1', 'CATEGORICAL'], - ['\\mod2', 'MOD2', 'modifier #2', 'NUMERICAL'], + ['modifier_path', 'modifier_cd', 'name_char', 'Data Type', 'dimension_type', 'sort_index'], + ['\\mod1', 'MOD1', 'MoDiFiEr #1', 'CATEGORICAL', 'ATTRIBUTE', '6'], + ['\\mod2', 'MOD2', 'modifier #2', 'NUMERICAL', 'ATTRIBUTE', '7'], ]) validator = get_blueprint_validator_initialised_with_modifiers(modifiers_table_file) self.assertTrue(validator)