Fixed and added tests asserts

Author: psyciknz

CameraEvents.py

@@ -24,13 +24,9 @@
     # Python 2.7
     from ConfigParser import ConfigParser
 import logging
-import os
 import socket
 import pycurl
-import json
-import time
 from paho.mqtt import client as mqtt_client   # pip install paho-mqtt
-import base64
 import DahuaDevice
 
 version = "0.3.0"
@@ -88,7 +84,7 @@ def __init__(self,  mqtt_cfg, cameras):
         self.homebridge = mqtt_cfg["homebridge"]
 
         self.client = mqtt_client.Client(mqtt_client.CallbackAPIVersion.VERSION2,"CameraEvents-" + socket.gethostname(), clean_session=True)
-        if not mqtt_cfg["user"] is None and not mqtt_cfg["user"] == '':
+        if mqtt_cfg["user"] is not None and not mqtt_cfg["user"] == '':
             self.client.username_pw_set(mqtt_cfg["user"], mqtt_cfg["password"])
         self.client.on_connect = self.mqtt_on_connect
         self.client.on_disconnect = self.mqtt_on_disconnect
@@ -149,7 +145,6 @@ def run(self):
                 break
 
         Ret = self.CurlMultiObj.select(1.0)
-        while not self.stopped.is_set():
         while not self.stopped.is_set():
             # Sleeps to ease load on processor
             time.sleep(.05)

DahuaDevice.py

@@ -15,12 +15,7 @@
 except:
     # Python 2.7
     from ConfigParser import ConfigParser
-import logging
-import os
-import socket
-import pycurl
 import json
-import time
 #import paho.mqtt.client as paho   # pip install paho-mqtt
 import base64
 

Tests/test_devices.py

@@ -1,6 +1,5 @@
 import logging
 import pytest
-import CameraEvents
 import DahuaDevice
 import datetime
 try:
@@ -69,7 +68,6 @@ def read_config():
         camera_items = cp.items( "Cameras" )
         for key, camera_key in camera_items:
             #do something with path
-            camera_cp = cp.items(camera_key)
             camera = {}
             #temp = cp.get(camera_key,"host")
             camera["host"] = cp.get(camera_key,'host')
@@ -154,4 +152,4 @@ def test_dahua_playback_url():
     result = device.CreatePlaybackUrl(1, starttime)
 
     assert result is not None   
-    assert checktime.strftime("%Y-%m-%d%%20%H:%M:%S") in result
+    assert checktime.strftime("%Y_%m_%d_%H_%M_%S") in result

Tests/test_onreceive.py

@@ -80,20 +80,21 @@ def test_dahua_receive_alarm_local():
     device = Tests.test_devices.create_device()
     data = str.encode("--myboundary\r\nContent-Length:37\r\nCode=AlarmLocal;action=Start;index=1")
     device.OnReceive(data)
-    assert device.client.topic == "CameraEvents/AlarmLocal/1" and device.client.payload == 'ON'
+    assert "CameraEvents/AlarmLocal/1" in device.client.messages and device.client.messages["CameraEvents/AlarmLocal/1"] == 'ON'
     data = str.encode("--myboundary\r\nContent-Length:37\r\nCode=AlarmLocal;action=Stop;index=1")
     device.OnReceive(data)
-    assert device.client.topic == "CameraEvents/AlarmLocal/1" and device.client.payload == 'OFF'
+    assert "CameraEvents/AlarmLocal/1" in device.client.messages and device.client.messages["CameraEvents/AlarmLocal/1"] == 'OFF'
+    
 
 def test_dahua_receive_alarm_local_Index_mismatch():
     device = Tests.test_devices.create_device()
     data = str.encode("--myboundary\r\nContent-Length:37\r\nCode=AlarmLocal;action=Start;index=5")
     device.OnReceive(data)
-    assert device.client.topic == "CameraEvents/AlarmLocal/5" and device.client.payload == 'ON'
+    assert "CameraEvents/AlarmLocal/5" in device.client.messages and device.client.messages["CameraEvents/AlarmLocal/5"] == 'ON'
     data = str.encode("--myboundary\r\nContent-Length:37\r\nCode=AlarmLocal;action=Stop;index=5")
     device.OnReceive(data)
-    assert device.client.topic == "CameraEvents/AlarmLocal/5" and device.client.payload == 'OFF'
-
+    assert "CameraEvents/AlarmLocal/5" in device.client.messages and device.client.messages["CameraEvents/AlarmLocal/5"] == 'OFF'
+    
 
 def test_dahua_receive_crossRegion():
     device = Tests.test_devices.create_device()
@@ -146,6 +147,8 @@ def test_dahua_receive_crossRegion():
     device.OnReceive(data)
 
     assert device is not None
+    assert "CameraEvents/Camera:1/event" in device.client.messages and device.client.messages["CameraEvents/Camera:1/event"] == 'ON'
+    assert "CameraEvents/IVS/Camera:1" in device.client.messages and device.client.messages["CameraEvents/IVS/Camera:1"] == 'CrossRegionDetection With Human in Enter direction for Courtyard region'
 
 def test_dahua_receive_crossRegion_createSnapshot():
     device = Tests.test_devices.create_device()
@@ -198,6 +201,8 @@ def test_dahua_receive_crossRegion_createSnapshot():
     device.OnReceive(data)
 
     assert device is not None
+    assert "CameraEvents/Camera:1/event" in device.client.messages and device.client.messages["CameraEvents/Camera:1/event"] == 'ON'
+    assert "CameraEvents/IVS/Camera:1" in device.client.messages and device.client.messages["CameraEvents/IVS/Camera:1"] == 'CrossRegionDetection With Human in Enter direction for Courtyard region'
 
 def test_dahua_receive_crossRegion_NoDirection():
     device = Tests.test_devices.create_device()
@@ -247,6 +252,9 @@ def test_dahua_receive_crossRegion_NoDirection():
     '"UTCMS" : 633 ' \
     '} ' )
     device.OnReceive(data)
+    assert device is not None
+    assert "CameraEvents/Camera:1/event" in device.client.messages and device.client.messages["CameraEvents/Camera:1/event"] == 'ON'
+    assert "CameraEvents/IVS/Camera:1" in device.client.messages and device.client.messages["CameraEvents/IVS/Camera:1"] == 'CrossRegionDetection With Human in unknown direction for Courtyard region'
 
 def test_dahua_receive_crossRegion_NoName():
     device = Tests.test_devices.create_device()
@@ -297,10 +305,12 @@ def test_dahua_receive_crossRegion_NoName():
     device.OnReceive(data)
 
     assert device is not None
+    assert "CameraEvents/Camera:1/event" in device.client.messages and device.client.messages["CameraEvents/Camera:1/event"] == 'ON'
+    assert "CameraEvents/IVS/Camera:1" in device.client.messages and device.client.messages["CameraEvents/IVS/Camera:1"] == 'CrossRegionDetection'
 
 def test_dahua_receive_crossLine():
-   device = Tests.test_devices.create_device()
-   data = str.encode('Code=CrossLineDetection;action=Start;index=0;data={'\
+    device = Tests.test_devices.create_device()
+    data = str.encode('Code=CrossLineDetection;action=Start;index=0;data={'\
    '"Class" : "Normal",'\
    '"CountInGroup" : 1,'\
    '"DetectLine" : ['\
@@ -336,6 +346,8 @@ def test_dahua_receive_crossLine():
    '"UTC" : 1549080650.0,'\
    '"UTCMS" : 702'\
    '} ')
-   device.OnReceive(data)
+    device.OnReceive(data)
 
-   assert device is not None
+    assert device is not None
+    assert "CameraEvents/Camera/event" in device.client.messages and device.client.messages["CameraEvents/Camera/event"] == 'ON'
+    assert "CameraEvents/IVS/Camera" in device.client.messages and device.client.messages["CameraEvents/IVS/Camera"] == 'CrossLineDetection With Smoke in RightToLeft direction for Gate region'