update tests for electrode group validation

NeurodataWithoutBorders · Sep 4, 2024 · 33d34d0 · 33d34d0
1 parent 33110b7
commit 33d34d0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/tests/integration/hdf5/test_ecephys.py b/tests/integration/hdf5/test_ecephys.py
@@ -27,7 +27,7 @@ def setUpContainer(self):
                             description='a test ElectrodeGroup',
                             location='a nonexistent place',
                             device=self.dev1,
-                            position=[(1., 2., 3.), ])
+                            position=(1., 2., 3.))
         return eg
 
     def addContainer(self, nwbfile):

diff --git a/tests/unit/test_ecephys.py b/tests/unit/test_ecephys.py
@@ -182,12 +182,23 @@ def test_init(self):
                                description='electrode description',
                                location='electrode location',
                                device=dev1,
-                               position=[(1, 2, 3), ])
+                               position=(1, 2, 3))
         self.assertEqual(group.name, 'elec1')
         self.assertEqual(group.description, 'electrode description')
         self.assertEqual(group.location, 'electrode location')
         self.assertEqual(group.device, dev1)
-        self.assertEqual(group.position, [(1, 2, 3), ])
+        self.assertEqual(group.position.tolist(), (1, 2, 3))
+
+    def test_init_position_array(self):
+        position = np.array((1, 2, 3), dtype=np.dtype([('x', float), ('y', float), ('z', float)]))
+        dev1 = Device('dev1')
+        group = ElectrodeGroup('elec1', 'electrode description', 'electrode location', dev1,
+                               position)
+        self.assertEqual(group.name, 'elec1')
+        self.assertEqual(group.description, 'electrode description')
+        self.assertEqual(group.location, 'electrode location')
+        self.assertEqual(group.device, dev1)
+        self.assertEqual(group.position, position)
 
     def test_init_position_none(self):
         dev1 = Device('dev1')
@@ -226,7 +237,7 @@ def test_init_position_bad(self):
                            description='electrode description',
                            location='electrode location',
                            device=dev1,
-                           position=[(1, 2, 3), (4, 5)])
+                           position=[(1, 2, 3), (4, 5, 6), (7, 8, 9)])
 
 
 class EventDetectionConstructor(TestCase):