wrote initial tests for OBDCommand objects

Brendan Whitfield · Brendan Whitfield · commit c0f0c9bdfd0f · 2014-11-25T22:22:47.000-05:00
diff --git a/obd/commands.py b/obd/commands.py
@@ -82,7 +82,7 @@ def compute(self, _data):
 
 			# constrain number of bytes in response
 			if (self.bytes > 0): # zero bytes means flexible response
-				constrainHex(_data, self.bytes)
+				_data = constrainHex(_data, self.bytes)
 
 			# decoded value into the response object
 			r.set(self.decode(_data))
diff --git a/obd/decoders.py b/obd/decoders.py
@@ -52,7 +52,7 @@ def noop(_hex):
 
 # hex in, bitstring out
 def pid(_hex):
-	v = bitstring(_hex)
+	v = bitstring(_hex, len(_hex) * 4)
 	return (v, Unit.NONE)
 
 '''
diff --git a/obd/obd.py b/obd/obd.py
@@ -98,7 +98,7 @@ def load_commands(self):
 
 			response = self.query(get) # ask nicely
 
-			if response.isEmpty():
+			if response.isNull():
 				continue
 			
 			supported = response.value # string of binary 01010101010101
diff --git a/obd/utils.py b/obd/utils.py
@@ -63,8 +63,8 @@ def __init__(self, raw_data=""):
 		self.unit    = Unit.NONE
 		self.raw_data = raw_data
 
-	def isEmpty(self):
-		return (self.value == None) or (len(self.raw_data) == 0)
+	def isNull(self):
+		return (self.value == "No Data") or (len(self.raw_data) == 0)
 
 	def set(self, decode):
 		self.value = decode[0]
diff --git a/tests/test_OBDCommand.py b/tests/test_OBDCommand.py
@@ -0,0 +1,46 @@
+
+from obd.commands import OBDCommand
+from obd.decoders import noop
+
+
+def test_basic_OBDCommand():
+	#                 name       description        mode  cmd bytes decoder
+	cmd = OBDCommand("Test", "example OBD command", "01", "23", 2, noop)
+	assert cmd.name      == "Test"
+	assert cmd.desc      == "example OBD command"
+	assert cmd.mode      == "01"
+	assert cmd.pid       == "23"
+	assert cmd.bytes     == 2
+	assert cmd.decode    == noop
+	assert cmd.supported == False
+
+	assert cmd.get_command()  == "0123"
+	assert cmd.get_mode_int() == 1
+	assert cmd.get_pid_int()  == 35
+
+	cmd = OBDCommand("Test", "example OBD command", "01", "23", 2, noop, True)
+	assert cmd.supported == True
+
+
+def test_data_stripping():
+	#                 name       description        mode  cmd bytes decoder
+	cmd = OBDCommand("Test", "example OBD command", "01", "00", 2, noop)
+	r = cmd.compute("41 00 01 01\r\n")
+	assert not r.isNull()
+	assert r.value == "0101"
+
+
+def test_data_not_hex():
+	#                 name       description        mode  cmd bytes decoder
+	cmd = OBDCommand("Test", "example OBD command", "01", "00", 2, noop)
+	r = cmd.compute("41 00 wx yz\r\n")
+	assert r.isNull()
+	
+
+def test_data_length():
+	#                 name       description        mode  cmd bytes decoder
+	cmd = OBDCommand("Test", "example OBD command", "01", "00", 2, noop)
+	r = cmd.compute("41 00 01 23 45\r\n")
+	assert r.value == "0123"
+	r = cmd.compute("41 00 01\r\n")
+	assert r.value == "0100"
diff --git a/tests/test_decoders.py b/tests/test_decoders.py
@@ -3,6 +3,13 @@
 import obd.decoders as d
 
 
+def test_noop():
+	assert d.noop("No Operation") == ("No Operation", Unit.NONE)
+
+def test_pid():
+	assert d.pid("00000000") == ("00000000000000000000000000000000", Unit.NONE)
+	assert d.pid("F00AA00F") == ("11110000000010101010000000001111", Unit.NONE)
+
 def test_count():
 	assert d.count("0")   == (0,    Unit.COUNT)
 	assert d.count("F")   == (15,   Unit.COUNT)
@@ -64,8 +71,8 @@ def test_evap_pressure():
 	#assert d.evap_pressure("0000") == (0.0, Unit.PA)
 
 def test_abs_evap_pressure():
-	assert d.abs_evap_pressure("0000") == (0,   Unit.KPA)
-	assert d.abs_evap_pressure("FFFF") == (327, Unit.KPA)
+	assert d.abs_evap_pressure("0000") == (0,       Unit.KPA)
+	assert d.abs_evap_pressure("FFFF") == (327.675, Unit.KPA)
 
 def test_evap_pressure_alt():
 	assert d.evap_pressure_alt("0000") == (-32767, Unit.PA)	
