Fix bugged Device constructor (#1209)

* Fix bugged device constructor * Update integration test
NeurodataWithoutBorders · Mar 18, 2020 · 12b0d18 · 12b0d18
1 parent 929972d
commit 12b0d18
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/src/pynwb/device.py b/src/pynwb/device.py
@@ -1,11 +1,12 @@
-from hdmf.utils import docval, call_docval_func
+from hdmf.utils import docval, call_docval_func, popargs
 from . import register_class, CORE_NAMESPACE
 from .core import NWBContainer
 
 
 @register_class('Device', CORE_NAMESPACE)
 class Device(NWBContainer):
     """
+    Metadata about a data acquisition device, e.g., recording system, electrode, microscope.
     """
 
     __nwbfields__ = ('name',
@@ -19,4 +20,7 @@ class Device(NWBContainer):
             {'name': 'manufacturer', 'type': str, 'doc': 'the name of the manufacturer of this device',
             'default': None})
     def __init__(self, **kwargs):
-        call_docval_func(super(Device, self).__init__, kwargs)
+        description, manufacturer = popargs('description', 'manufacturer', kwargs)
+        call_docval_func(super().__init__, kwargs)
+        self.description = description
+        self.manufacturer = manufacturer
diff --git a/tests/integration/hdf5/test_device.py b/tests/integration/hdf5/test_device.py
@@ -6,7 +6,9 @@ class TestDeviceIO(NWBH5IOMixin, TestCase):
 
     def setUpContainer(self):
         """ Return the test Device to read/write """
-        return Device(name='device_name')
+        return Device(name='device_name',
+                      description='description',
+                      manufacturer='manufacturer')
 
     def addContainer(self, nwbfile):
         """ Add the test Device to the given NWBFile """

diff --git a/tests/unit/test_device.py b/tests/unit/test_device.py
@@ -2,9 +2,13 @@
 from pynwb.testing import TestCase
 
 
-class DeviceConstructorBoth(TestCase):
+class TestDevice(TestCase):
 
     def test_init(self):
-        device = Device(name='device_name')
+        device = Device(name='device_name',
+                        description='description',
+                        manufacturer='manufacturer')
 
         self.assertEqual(device.name, 'device_name')
+        self.assertEqual(device.description, 'description')
+        self.assertEqual(device.manufacturer, 'manufacturer')