Merge pull request #1114 from JuliaSprenger/fix/neuroshare_tests

[neuroshare] extend tests also to linux and IO fixes

Author: samuelgarcia

neo/io/neurosharectypesio.py

@@ -19,6 +19,7 @@
 import sys
 import ctypes
 import os
+import warnings
 
 import numpy as np
 import quantities as pq
@@ -131,6 +132,10 @@ def read_segment(self, import_neuroshare_segment=True,
 
         seg = Segment(file_origin=os.path.basename(self.filename), )
 
+        if self.dllname == '':
+            warnings.warn('No neuroshare dll provided. Can not load data.')
+            return Segment()
+
         if sys.platform.startswith('win'):
             neuroshare = ctypes.windll.LoadLibrary(self.dllname)
         elif sys.platform.startswith('linux'):
@@ -147,7 +152,7 @@ def read_segment(self, import_neuroshare_segment=True,
 
         # open file
         hFile = ctypes.c_uint32(0)
-        neuroshare.ns_OpenFile(ctypes.c_char_p(self.filename), ctypes.byref(hFile))
+        neuroshare.ns_OpenFile(ctypes.c_char_p(bytes(self.filename, 'utf-8')), ctypes.byref(hFile))
         fileinfo = ns_FILEINFO()
         neuroshare.ns_GetFileInfo(hFile, ctypes.byref(fileinfo), ctypes.sizeof(fileinfo))
 
@@ -176,8 +181,6 @@ def read_segment(self, import_neuroshare_segment=True,
                 pdTimeStamp = ctypes.c_double(0.)
                 pdwDataRetSize = ctypes.c_uint32(0)
 
-                ea = Event(name=str(entityInfo.szEntityLabel), )
-
                 times = []
                 labels = []
                 for dwIndex in range(entityInfo.dwItemCount):
@@ -186,9 +189,10 @@ def read_segment(self, import_neuroshare_segment=True,
                                                ctypes.sizeof(pData), ctypes.byref(pdwDataRetSize))
                     times.append(pdTimeStamp.value)
                     labels.append(str(pData.value))
-                ea.times = times * pq.s
-                ea.labels = np.array(labels, dtype='U')
+                times = times * pq.s
+                labels = np.array(labels, dtype='U')
 
+                ea = Event(name=str(entityInfo.szEntityLabel), times=times, labels=labels)
                 seg.events.append(ea)
 
             # analog
@@ -212,7 +216,7 @@ def read_segment(self, import_neuroshare_segment=True,
                                                     ctypes.POINTER(ctypes.c_double)))
                     total_read += pdwContCount.value
 
-                signal = pq.Quantity(pData, units=pAnalogInfo.szUnits, copy=False)
+                signal = pq.Quantity(pData, units=pAnalogInfo.szUnits.decode(), copy=False)
 
                 # t_start
                 dwIndex = 0

neo/test/iotest/test_neuroshareio.py

@@ -8,25 +8,19 @@
 import zipfile
 import tempfile
 import platform
-
 import unittest
-
-try:
-    from urllib import urlretrieve  # Py2
-except ImportError:
-    from urllib.request import urlretrieve  # Py3
+from urllib.request import urlretrieve
 
 from neo.io import NeuroshareIO
 from neo.test.iotest.common_io_test import BaseTestIO
 
 
-@unittest.skipUnless(sys.platform.startswith("win"), "Only works on Windows")
 class TestNeuroshareIO(unittest.TestCase, BaseTestIO):
     ioclass = NeuroshareIO
     entities_to_download = [
         'neuroshare/Multichannel_fil_1.mcd'
     ]
-    entities_to_test = []
+    entities_to_test = ['neuroshare/Multichannel_fil_1.mcd']
 
     def setUp(self):
         BaseTestIO.setUp(self)
@@ -71,7 +65,7 @@ def setUp(self):
             raise unittest.SkipTest("Not currently supported on OS X")
 
     def test_with_multichannel(self):
-        filename0 = self.get_local_path(self.files_to_download[0])
+        filename0 = self.get_local_path(self.files_to_test[0])
         reader = NeuroshareIO(filename0, self.dllname)
         blocks = reader.read()
         n = len(blocks[0].segments[0].analogsignals)