Merge pull request #1071 from JuliaSprenger/add/tdt_tests

[tdt] Add new entities to tdt tests and fix file header parsing

Author: samuelgarcia

neo/rawio/tdtrawio.py

@@ -522,7 +522,8 @@ def read_tbk(tbk_filename):
 
         # parse into a dict
         info = OrderedDict()
-        pattern = br'NAME=(\S+);TYPE=(\S+);VALUE=(\S+);'
+        # name and type have to be words, but value can contain floating numbers
+        pattern = br'NAME=(\w+);TYPE=(\w+);VALUE=(\S+);'
         r = re.findall(pattern, chan_grp_header)
         for name, _type, value in r:
             info[name.decode('ascii')] = value

neo/test/iotest/test_tdtio.py

@@ -14,7 +14,12 @@ class TestTdtIO(BaseTestIO, unittest.TestCase, ):
         'tdt'
     ]
     entities_to_test = [
-        'tdt/aep_05'
+        # test structure directory with multiple blocks
+        'tdt/aep_05',
+        # test single block
+        'tdt/dataset_0_single_block/512ch_reconly_all-181123_B24_rest.Tdx',
+        'tdt/dataset_1_single_block/ECTest-220207-135355_ECTest_B1.Tdx',
+        'tdt/aep_05/Block-1/aep_05_Block-1.Tdx'
     ]
 
     def test_signal_group_mode(self):

neo/test/rawiotest/test_tdtrawio.py

@@ -12,7 +12,11 @@ class TestTdtRawIO(BaseTestRawIO, unittest.TestCase, ):
         'tdt'
     ]
     entities_to_test = [
+        # test structure directory with multiple blocks
         'tdt/aep_05',
+        # test single block
+        'tdt/dataset_0_single_block/512ch_reconly_all-181123_B24_rest.Tdx',
+        'tdt/dataset_1_single_block/ECTest-220207-135355_ECTest_B1.Tdx',
         'tdt/aep_05/Block-1/aep_05_Block-1.Tdx'
     ]