Fixing old tests

Author: macartur

tests/v0x04/test_common/test_table_feature.py

@@ -7,8 +7,8 @@
 from tests.v0x04.test_struct import TestStruct
 
 
-class TestTableFeatures(TestStruct):
-    """Test TableFeatures."""
+class TestMultipartReply(TestStruct):
+    """Test MultipartReply."""
 
     @classmethod
     def setUpClass(cls):
@@ -17,5 +17,5 @@ def setUpClass(cls):
         super().set_message(MultipartReply, xid=16,
                             multipart_type=MultipartTypes.OFPMP_METER_CONFIG,
                             flags=MultipartReplyFlags.OFPMPF_REPLY_MORE,
-                            body=b'this is a test')
+                            body='')
         super().set_minimum_size(16)

tests/v0x04/test_controller2switch/test_meter_features.py

@@ -1,7 +1,8 @@
 """MultipartRequest message test."""
-from pyof.v0x04.controller2switch.multipart_request import MultipartRequest
+from pyof.v0x04.controller2switch.multipart_request import (
+    MultipartRequest, MultipartRequestFlags, MultipartTypes, TableFeatures)
 
-from tests.test_struct import TestStruct
+from tests.v0x04.test_struct import TestStruct
 
 
 class TestMultipartRequest(TestStruct):
@@ -11,7 +12,21 @@ class TestMultipartRequest(TestStruct):
     def setUpClass(cls):
         """Configure raw file and its object in parent class (TestDump)."""
         super().setUpClass()
-        super().set_raw_dump_file('v0x04', 'ofpt_multipart_request')
-        super().set_raw_dump_object(MultipartRequest, xid=3, multipart_type=0,
-                                    flags=1, body=0)
+
+        super().set_message(MultipartRequest, xid=16,
+                            multipart_type=MultipartTypes.OFPMP_TABLE_FEATURES,
+                            flags=MultipartRequestFlags.OFPMPF_REQ_MORE,
+                            body=b'')
         super().set_minimum_size(16)
+
+    def test_body_table_features(self):
+        """Method to test pack and unpack using table_features as body."""
+        table_features = [TableFeatures(table_id=2),
+                          TableFeatures(table_id=6),
+                          TableFeatures(table_id=4)]
+
+        options = {'xid': 16,
+                   'multipart_type': MultipartTypes.OFPMP_TABLE_FEATURES,
+                   'flags': MultipartRequestFlags.OFPMPF_REQ_MORE,
+                   'body': table_features}
+        self._test_pack_unpack(**options)

tests/v0x04/test_controller2switch/test_meter_stats.py

@@ -88,16 +88,16 @@ def test_pack_unpack(self):
         """Pack the message, unpack and check whether they are the same."""
         if self._msg_cls:
             args, kwargs = self._msg_params
-            self._test_pack_unpack(self._msg_cls, args, kwargs)
+            self._test_pack_unpack(*args, **kwargs)
 
-    def _test_pack_unpack(self, cls, *args, **kwargs):
+    def _test_pack_unpack(self, *args, **kwargs):
         """Pack the message, unpack and check whether they are the same.
 
         Call this method multiple times if you want to test more than one
         object.
         """
-        args, kwargs = self._msg_params
-        packed = self._msg_cls(*args, **kwargs).pack()
+        obj = self._msg_cls(*args, **kwargs)
+        packed = obj.pack()
         header = Header()
         header_size = header.get_size()
         header.unpack(packed[:header_size])