CommunicationControl now handles properly integer communication_type + unit tests

Author: pylessard

test/client/test_communication_control.py

@@ -9,9 +9,10 @@ def __init__(self, *args, **kwargs):
 		ClientServerTest.__init__(self, *args, **kwargs)
 
 	def test_comcontrol_enable_node(self):
-		request = self.conn.touserqueue.get(timeout=0.2)
-		self.assertEqual(request, b"\x28\x00\x01")
-		self.conn.fromuserqueue.put(b"\x68\x00")	# Positive response
+		for i in range(3):
+				request = self.conn.touserqueue.get(timeout=0.2)
+				self.assertEqual(request, b"\x28\x00\x01")
+				self.conn.fromuserqueue.put(b"\x68\x00")	# Positive response
 
 	def _test_comcontrol_enable_node(self):
 		control_type = services.CommunicationControl.ControlType.enableRxAndTx
@@ -20,6 +21,16 @@ def _test_comcontrol_enable_node(self):
 		self.assertTrue(response.positive)
 		self.assertEqual(response.service_data.control_type_echo, control_type)
 
+		response = self.udsclient.communication_control(control_type=control_type, communication_type=com_type.get_byte())
+		self.assertTrue(response.positive)
+		self.assertEqual(response.service_data.control_type_echo, control_type)
+
+		response = self.udsclient.communication_control(control_type=control_type, communication_type=com_type.get_byte_as_int())
+		self.assertTrue(response.positive)
+		self.assertEqual(response.service_data.control_type_echo, control_type)
+
+
+
 	def test_comcontrol_enable_node_spr(self):
 		request = self.conn.touserqueue.get(timeout=0.2)
 		self.assertEqual(request, b"\x28\x80\x01")

test/test_helper_class.py

@@ -146,6 +146,9 @@ def test_from_byte(self):
 		comtype = CommunicationType.from_byte(b'\x33')
 		self.assertEqual(comtype.get_byte(), b'\x33')
 
+		comtype = CommunicationType.from_byte(0x01)
+		self.assertEqual(comtype.get_byte(), b'\x01')
+
 	def test_oob_values(self):
 		with self.assertRaises(ValueError):
 			CommunicationType(subnet=0, normal_msg=False, network_management_msg=False)

udsoncan/__init__.py

@@ -844,9 +844,9 @@ def get_byte(self):
 		return struct.pack('B', self.get_byte_as_int())
 
 	@classmethod
-	def from_byte(cls, byte):
-		if isinstance(byte, bytes):
-			val = struct.unpack('B', byte)[0]
+	def from_byte(cls, val):
+		if isinstance(val, bytes):
+			val = struct.unpack('B', val)[0]
 		val = int(val)
 		subnet = (val & 0xF0) >> 4
 		normal_msg = True if val & 1 > 0 else False

udsoncan/client.py

@@ -624,10 +624,10 @@ def communication_control(self, control_type, communication_type):
 		:dependent configuration: ``exception_on_<type>_response``
 		
 		:param control_type: The action to request such as enabling or disabling some messages. See :class:`CommunicationControl.ControlType<udsoncan.services.CommunicationControl.ControlType>`. This value can also be ECU manufacturer-specific
-		:type control_type: bytes
+		:type control_type: int
 
-		:param communication_type: Indicates what section of the network and the type of message that should be affected by the command. Refer to :ref:`CommunicationType<CommunicationType>` for more details
-		:type communication_type: :ref:`CommunicationType<CommunicationType>`
+		:param communication_type: Indicates what section of the network and the type of message that should be affected by the command. Refer to :ref:`CommunicationType<CommunicationType>` for more details. If an `integer` or a `bytes` is given, the value will be decoded to create the required :ref:`CommunicationType<CommunicationType>` object
+		:type communication_type: :ref:`CommunicationType<CommunicationType>`, bytes, int
 
 		:return: The server response parsed by :meth:`CommunicationControl.interpret_response<udsoncan.services.CommunicationControl.interpret_response>`
 		:rtype: :ref:`Response<Response>`

udsoncan/services/CommunicationControl.py

@@ -26,10 +26,10 @@ class ControlType(BaseSubfunction):
 	def normalize_communication_type(self, communication_type):
 		from udsoncan import CommunicationType
 
-		if not isinstance(communication_type, CommunicationType) and not isinstance(communication_type, int):
+		if not isinstance(communication_type, CommunicationType) and not isinstance(communication_type, int) and not isinstance(communication_type, bytes):
 			raise ValueError('communication_type must either be a CommunicationType object or an integer')
 
-		if isinstance(communication_type, int):
+		if isinstance(communication_type, int) or isinstance(communication_type, bytes):
 			communication_type = CommunicationType.from_byte(communication_type)
 
 		return communication_type
@@ -43,7 +43,7 @@ def make_request(cls, control_type, communication_type):
 		:type control_type: int
 
 		:param communication_type: The communication type requested.
-		:type communication_type: :ref:`CommunicationType <CommunicationType>`
+		:type communication_type: :ref:`CommunicationType <CommunicationType>`, int, bytes
 
 		:raises ValueError: If parameters are out of range, missing or wrong type
 		"""