From e318a430a8b61f5e53ac1238ce8a5d3051f64575 Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Mon, 15 Feb 2021 13:27:15 +0100 Subject: [PATCH] update test for parsing and querying derivatives --- tests/test_layout_derivatives.m | 36 ++++++++++++++++++++++----------- tests/test_load_schema.m | 4 +++- tests/test_parse_filename.m | 12 ----------- 3 files changed, 27 insertions(+), 25 deletions(-) diff --git a/tests/test_layout_derivatives.m b/tests/test_layout_derivatives.m index 5c74ffce..ae6923ad 100644 --- a/tests/test_layout_derivatives.m +++ b/tests/test_layout_derivatives.m @@ -19,19 +19,31 @@ function test_layout_schemaless() assertEqual(bids.query(BIDS, 'modalities'), modalities); % Those fail for now - % data = bids.query(BIDS, 'data', ... - % 'sub', '10', ... - % 'modality', 'func', ... - % 'suffix', 'bold', ... - % 'run', '1', ... - % 'res', '2'); - % data = bids.query(BIDS, 'data', ... - % 'sub', '10', ... - % 'modality', 'func', ... - % 'suffix', 'bold', ... - % 'run', '1', ... - % 'space', 'MNI152NLin6Asym'); + data = bids.query(BIDS, 'data', ... + 'sub', '10', ... + 'modality', 'func', ... + 'suffix', 'bold', ... + 'run', '1', ... + 'res', '2'); + + basename = bids.internal.file_utils(data, 'basename'); + assertEqual(basename, { + ['sub-10_task-balloonanalogrisktask_run-1', ... + '_space-MNI152NLin2009cAsym_res-2_desc-preproc_bold.nii'] + }); + data = bids.query(BIDS, 'data', ... + 'sub', '10', ... + 'modality', 'func', ... + 'suffix', 'bold', ... + 'run', '1', ... + 'space', 'MNI152NLin6Asym'); + + basename = bids.internal.file_utils(data, 'basename'); + assertEqual(basename, { + ['sub-10_task-balloonanalogrisktask_run-1', ... + '_space-MNI152NLin6Asym_desc-smoothAROMAnonaggr_bold.nii'] + }); end function test_layout_nested_derivatives() diff --git a/tests/test_load_schema.m b/tests/test_load_schema.m index 941d916d..6b267a06 100644 --- a/tests/test_load_schema.m +++ b/tests/test_load_schema.m @@ -15,9 +15,11 @@ function test_load_schema_path() assert(isfield(schema, 'base')); assert(isfield(schema, 'subfolder_1')); assert(isfield(schema.subfolder_1, 'sub')); + assert(~isfield(schema, 'subfolder_4')); + + % some recursive aspects are not implemented yet % assert(isfield(schema.subfolder_2, 'subfolder_3')); % assert(isfield(schema.subfolder_2.subfolder_3, 'sub')); - assert(~isfield(schema, 'subfolder_4')); end diff --git a/tests/test_parse_filename.m b/tests/test_parse_filename.m index 1630de5e..36ebdfe2 100644 --- a/tests/test_parse_filename.m +++ b/tests/test_parse_filename.m @@ -20,18 +20,6 @@ function test_parse_filename_basic() 'run', '1', ... 'acq', 'hd')); - % expected = struct( ... - % 'filename', 'sub-16_ses-mri_run-1_acq-hd_T1w.nii.gz', ... - % 'suffix', 'T1w', ... - % 'ext', '.nii.gz', ... - % 'sub', '16', ... - % 'ses', 'mri', ... - % 'run', '1', ... - % 'acq', 'hd', ... - % 'ce', '', ... - % 'rec', '', ... - % 'part', ''); - assertEqual(output, expected); end