Issue #15 should be fixed correctly this time. Unittest included.

Signed-off-by: David Rebbe <drebbe@intrepidcs.com>

Author: drebbe-intrepid

src/methods.cpp

@@ -176,17 +176,19 @@ PyObject* meth_find_devices(PyObject* self, PyObject* args, PyObject* keywords)
     NeoDevice devices[255];
     int count = 255;
     unsigned long legacy_dev_type = 0xFFFFBFFF;
+    bool use_legacy_device_type = false;
     if (device_type && PyLong_Check(device_type))
     {
         legacy_dev_type = PyLong_AsLong(device_type);
+        use_legacy_device_type = true;
     }
     try
     {
 #ifndef USE_LEGACY_FIND_DEVICES
         // Get the list of device types
         unsigned int* device_type_list = NULL;
         unsigned int device_type_list_size = 0;
-        if (device_type && device_type != Py_None)
+        if (!use_legacy_device_type && device_type && device_type != Py_None)
         {
             std::vector<PyObject*> device_type_vector;
             if (!_convertListOrTupleToArray(device_type, &device_type_vector))
@@ -199,6 +201,8 @@ PyObject* meth_find_devices(PyObject* self, PyObject* args, PyObject* keywords)
         Py_BEGIN_ALLOW_THREADS
         try
         {
+            if (use_legacy_device_type)
+                throw ice::Exception("Use Legacy Function!");
             if (ex_options != -1)
                 throw ice::Exception("Need to use old style find function");
             //int _stdcall icsneoFindNeoDevicesNewStyle(unsigned int* deviceTypes, unsigned int numDeviceTypes, NeoDevice* pNeoDevice, int* pNumDevices)

test/test_find_devices.py

@@ -1,3 +1,98 @@
 import timeit
+import unittest
+import ics
+# This test requries 2 devices attached, one neoVI FIRE2s and one ValueCAN3
 
-print(timeit.timeit("ics.find_devices()", setup="import ics", number=1000))
+_DEBUG = False
+
+class TestFindDevicesLegacy(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        ics.override_library_name(r"C:\Windows\SysWOW64\icsneo40-legacy.dll")
+        if _DEBUG:
+            import os
+            input("Pause... " + str(os.getpid()))
+        
+    def test_default_parameters(self):
+        devices = ics.find_devices()
+        self.assertTrue(len(devices) == 2)
+    
+    def test_default_parameters_time(self):
+        if not _DEBUG:
+            self.assertTrue((timeit.timeit("ics.find_devices()", setup="import ics", number=1000)) <= 5.0)
+
+    def test_find_fire2(self):
+        devices = ics.find_devices(ics.NEODEVICE_FIRE2)
+        self.assertTrue(len(devices) == 1)
+    
+    def test_find_vcan3(self):
+        devices = ics.find_devices(ics.NEODEVICE_VCAN3)
+        self.assertTrue(len(devices) == 1)
+    
+    def test_find_fire2_and_vcan3(self):
+        devices = ics.find_devices(ics.NEODEVICE_FIRE2 | ics.NEODEVICE_VCAN3)
+        self.assertTrue(len(devices) == 2)
+        
+class TestFindDevicesNewStyle(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        ics.override_library_name(r"C:\Windows\SysWOW64\icsneo40.dll")
+        if _DEBUG:
+            import os
+            input("Pause... " + str(os.getpid()))
+        
+    def test_default_parameters(self):
+        devices = ics.find_devices()
+        self.assertTrue(len(devices) == 2)
+    
+    def test_default_parameters_time(self):
+        if not _DEBUG:
+            self.assertTrue((timeit.timeit("ics.find_devices()", setup="import ics", number=1000)) <= 5.0)
+
+    def test_find_fire2(self):
+        devices = ics.find_devices([ics.NEODEVICE_FIRE2,])
+        self.assertTrue(len(devices) == 1)
+    
+    def test_find_vcan3(self):
+        devices = ics.find_devices([ics.NEODEVICE_VCAN3,])
+        self.assertTrue(len(devices) == 1)
+    
+    def test_find_fire2_and_vcan3(self):
+        devices = ics.find_devices([ics.NEODEVICE_FIRE2, ics.NEODEVICE_VCAN3])
+        self.assertTrue(len(devices) == 2)
+
+
+class TestFindDevicesNewStyleWithLegacyDLL(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        import ics
+        ics.override_library_name(r"C:\Windows\SysWOW64\icsneo40-legacy.dll")
+        if _DEBUG:
+            import os
+            input("Pause... " + str(os.getpid()))
+        
+    def test_default_parameters(self):
+        devices = ics.find_devices()
+        self.assertTrue(len(devices) == 2)
+    
+    def test_default_parameters_time(self):
+        self.assertTrue((timeit.timeit("ics.find_devices()", setup="import ics", number=1000)) <= 5.0)
+
+    def test_find_fire2(self):
+        devices = ics.find_devices([ics.NEODEVICE_FIRE2,])
+        self.assertTrue(len(devices) == 2)
+    
+    def test_find_vcan3(self):
+        devices = ics.find_devices([ics.NEODEVICE_VCAN3,])
+        self.assertTrue(len(devices) == 2)
+    
+    def test_find_fire2_and_vcan3(self):
+        devices = ics.find_devices([ics.NEODEVICE_FIRE2, ics.NEODEVICE_VCAN3])
+        self.assertTrue(len(devices) == 2)
+
+
+if __name__ == "__main__":
+    if _DEBUG:
+        import os
+        input("Pause... " + str(os.getpid()))
+    unittest.main()