updated tests to include headers

Brendan Whitfield · Brendan Whitfield · commit 7c569054de08 · 2015-01-20T20:37:37.000-05:00
diff --git a/obd/port.py b/obd/port.py
@@ -106,7 +106,7 @@ def __error(self, msg=None):
 		debug("Connection Error:", True)
 
 		if msg is not None:
-			debug('    ' + msg, True)
+			debug('    ' + str(msg), True)
 		
 		if self.port is not None:
 			self.port.close()
diff --git a/tests/test_OBD.py b/tests/test_OBD.py
@@ -18,41 +18,42 @@ def test_query():
 	# forge our own command, to control the output
 	cmd = OBDCommand("", "", "01", "23", 2, noop)
 
-	# forge IO from the car by overwriting the get/send functions
+	# forge IO from the car by overwriting the read/write functions
 	
 	# buffers
 	toCar = [""] # needs to be inside mutable object to allow assignment in closure
 	fromCar = ""
 
-	def send(cmd):
+	def write(cmd):
 		toCar[0] = cmd
 
 	o.is_connected = lambda *args: True
-	o.port.send = send
-	o.port.get = lambda *args: fromCar
+	o.port.port = True
+	o.port._OBDPort__write = write
+	o.port._OBDPort__read = lambda *args: fromCar
 
-	# make sure unsupported commands don't send
-	fromCar = "41 23 AB CD\r\r"
+	# make sure unsupported commands don't write
+	fromCar = "48 6B 10 41 23 AB CD\r\r"
 	r = o.query(cmd)
 	assert toCar[0] == ""
 	assert r.is_null()
 
 	# a correct command transaction
-	fromCar = "41 23 AB CD\r\r"  # preset the response
+	fromCar = "48 6B 10 41 23 AB CD\r\r"  # preset the response
 	r = o.query(cmd, force=True)       # run
 	assert toCar[0] == "0123"    # verify that the command was sent correctly
 	assert r.raw_data == fromCar # verify that raw_data was stored in the Response
 	assert r.value == "ABCD"     # verify that the response was parsed correctly
 
 	# response of greater length
-	fromCar = "41 23 AB CD EF\r\r"
+	fromCar = "48 6B 10 41 23 AB CD EF\r\r"
 	r = o.query(cmd, force=True)
 	assert toCar[0] == "0123"
 	assert r.raw_data == fromCar
 	assert r.value == "ABCD"
 
 	# response of greater length
-	fromCar = "41 23 AB\r\r"
+	fromCar = "48 6B 10 41 23 AB\r\r"
 	r = o.query(cmd, force=True)
 	assert toCar[0] == "0123"
 	assert r.raw_data == fromCar
diff --git a/tests/test_OBDCommand.py b/tests/test_OBDCommand.py
@@ -39,22 +39,22 @@ def test_clone():
 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")
+	r = cmd.compute("48 6B 10 41 00 01 01\r\n")
 	assert not r.is_null()
 	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")
+	r = cmd.compute("48 6B 10 41 00 wx yz\r\n")
 	assert r.is_null()
 	
 
 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")
+	r = cmd.compute("48 6B 10 41 00 01 23 45\r\n")
 	assert r.value == "0123"
-	r = cmd.compute("41 00 01\r\n")
+	r = cmd.compute("48 6B 10 41 00 01\r\n")
 	assert r.value == "0100"
