Replace classmethod encode with instance encode in tests

test/protocol/new/admin/test_new_admin.py

@@ -30,14 +30,14 @@ def test_create_topics_request_roundtrip(version):
             configs=[]
         )
     ]
-    data = CreateTopicsRequest(
+    request = CreateTopicsRequest(
         topics=topics,
         timeout_ms=10000,
         validate_only=False
     )
-    encoded = CreateTopicsRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = CreateTopicsRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request
 
 
 @pytest.mark.parametrize("version", range(DeleteTopicsRequest.min_version, DeleteTopicsRequest.max_version + 1))
@@ -50,47 +50,47 @@ def test_delete_topics_request_roundtrip(version):
         for t_name in topic_names:
             topics.append(Topic(name=t_name, topic_id=uuid.uuid4()))
 
-    data = DeleteTopicsRequest(
+    request = DeleteTopicsRequest(
         topic_names=topic_names if version < 6 else [],
         timeout_ms=10000,
         topics=topics
     )
-    encoded = DeleteTopicsRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = DeleteTopicsRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request
 
 
 @pytest.mark.parametrize("version", range(DescribeGroupsRequest.min_version, DescribeGroupsRequest.max_version + 1))
 def test_describe_groups_request_roundtrip(version):
-    data = DescribeGroupsRequest(
+    request = DescribeGroupsRequest(
         groups=["group-1"],
         include_authorized_operations=True if version >= 3 else False
     )
-    encoded = DescribeGroupsRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = DescribeGroupsRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request
 
 
 @pytest.mark.parametrize("version", range(ListGroupsRequest.min_version, ListGroupsRequest.max_version + 1))
 def test_list_groups_request_roundtrip(version):
-    data = ListGroupsRequest(
+    request = ListGroupsRequest(
         states_filter=["Stable"] if version >= 4 else []
     )
-    encoded = ListGroupsRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = ListGroupsRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request
 
 
 @pytest.mark.parametrize("version", range(DescribeClusterRequest.min_version, DescribeClusterRequest.max_version + 1))
 def test_describe_cluster_request_roundtrip(version):
-    data = DescribeClusterRequest(
+    request = DescribeClusterRequest(
         include_cluster_authorized_operations=True,
         endpoint_type=1 if version >= 1 else 1,
         include_fenced_brokers=False if version >= 2 else False
     )
-    encoded = DescribeClusterRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = DescribeClusterRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request
 
 
 @pytest.mark.parametrize("version", range(DescribeConfigsRequest.min_version, DescribeConfigsRequest.max_version + 1))
@@ -161,12 +161,12 @@ def test_create_acls_request_roundtrip(version):
             permission_type=3
         )
     ]
-    data = CreateAclsRequest(
+    request = CreateAclsRequest(
         creations=creations
     )
-    encoded = CreateAclsRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = CreateAclsRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request
 
 
 @pytest.mark.parametrize("version", range(CreatePartitionsRequest.min_version, CreatePartitionsRequest.max_version + 1))
@@ -182,19 +182,19 @@ def test_create_partitions_request_roundtrip(version):
             ]
         )
     ]
-    data = CreatePartitionsRequest(
+    request = CreatePartitionsRequest(
         topics=topic_partitions,
         timeout_ms=10000,
         validate_only=False
     )
-    encoded = CreatePartitionsRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = CreatePartitionsRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request
 
 
 @pytest.mark.parametrize("version", range(DescribeAclsRequest.min_version, DescribeAclsRequest.max_version + 1))
 def test_describe_acls_request_roundtrip(version):
-    data = DescribeAclsRequest(
+    request = DescribeAclsRequest(
         resource_type_filter=2,
         resource_name_filter="test-topic",
         pattern_type_filter=3 if version >= 1 else 3,
@@ -203,9 +203,9 @@ def test_describe_acls_request_roundtrip(version):
         operation=3,
         permission_type=3
     )
-    encoded = DescribeAclsRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = DescribeAclsRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request
 
 
 @pytest.mark.parametrize("version", range(DeleteAclsRequest.min_version, DeleteAclsRequest.max_version + 1))
@@ -222,9 +222,9 @@ def test_delete_acls_request_roundtrip(version):
             permission_type=3
         )
     ]
-    data = DeleteAclsRequest(
+    request = DeleteAclsRequest(
         filters=filters
     )
-    encoded = DeleteAclsRequest.encode(data, version=version)
+    encoded = request.encode(version=version)
     decoded = DeleteAclsRequest.decode(encoded, version=version)
-    assert decoded == data
+    assert decoded == request

test/protocol/new/consumer/test_new_fetch.py

@@ -75,7 +75,7 @@ def test_fetch_request_roundtrip(version):
         topics=topic_data
     )
 
-    encoded = FetchRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = FetchRequest.decode(encoded, version=version)
 
     assert decoded == data
@@ -122,7 +122,7 @@ def test_fetch_response_roundtrip(version):
         responses=resp_topic_data
     )
 
-    encoded = FetchResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = FetchResponse.decode(encoded, version=version)
 
     assert decoded == data

test/protocol/new/consumer/test_new_group.py

@@ -19,7 +19,7 @@ def test_find_coordinator_request_roundtrip(version):
         key_type=0,
         coordinator_keys=["test-group"] if version >= 4 else []
     )
-    encoded = FindCoordinatorRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = FindCoordinatorRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -45,7 +45,7 @@ def test_find_coordinator_response_roundtrip(version):
         port=9092 if version < 4 else 0,
         coordinators=coordinators if version >= 4 else []
     )
-    encoded = FindCoordinatorResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = FindCoordinatorResponse.decode(encoded, version=version)
     assert decoded == data
 
@@ -68,7 +68,7 @@ def test_join_group_request_roundtrip(version):
         protocols=protocols,
         reason="joining" if version >= 8 else None
     )
-    encoded = JoinGroupRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = JoinGroupRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -92,7 +92,7 @@ def test_join_group_response_roundtrip(version):
         member_id="test-member",
         members=members
     )
-    encoded = JoinGroupResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = JoinGroupResponse.decode(encoded, version=version)
     assert decoded == data
 
@@ -114,7 +114,7 @@ def test_sync_group_request_roundtrip(version):
         protocol_type="consumer" if version >= 5 else None,
         protocol_name="range" if version >= 5 else None
     )
-    encoded = SyncGroupRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = SyncGroupRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -128,7 +128,7 @@ def test_sync_group_response_roundtrip(version):
         protocol_name="range" if version >= 5 else None,
         assignment=b"test-assignment"
     )
-    encoded = SyncGroupResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = SyncGroupResponse.decode(encoded, version=version)
     assert decoded == data
 
@@ -141,7 +141,7 @@ def test_heartbeat_request_roundtrip(version):
         member_id="test-member",
         group_instance_id=None
     )
-    encoded = HeartbeatRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = HeartbeatRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -152,7 +152,7 @@ def test_heartbeat_response_roundtrip(version):
         throttle_time_ms=100 if version >= 1 else 0,
         error_code=0
     )
-    encoded = HeartbeatResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = HeartbeatResponse.decode(encoded, version=version)
     assert decoded == data
 
@@ -171,7 +171,7 @@ def test_leave_group_request_roundtrip(version):
         member_id="test-member" if version < 3 else "",
         members=members if version >= 3 else []
     )
-    encoded = LeaveGroupRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = LeaveGroupRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -190,7 +190,7 @@ def test_leave_group_response_roundtrip(version):
         error_code=0,
         members=members if version >= 3 else []
     )
-    encoded = LeaveGroupResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = LeaveGroupResponse.decode(encoded, version=version)
     assert decoded == data
 
@@ -226,7 +226,7 @@ def test_offset_fetch_request_roundtrip(version):
             require_stable=False
         )
 
-    encoded = OffsetFetchRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = OffsetFetchRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -279,7 +279,7 @@ def test_offset_fetch_response_roundtrip(version):
             groups=groups
         )
 
-    encoded = OffsetFetchResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = OffsetFetchResponse.decode(encoded, version=version)
     assert decoded == data
 
@@ -308,7 +308,7 @@ def test_offset_commit_request_roundtrip(version):
         retention_time_ms=5000 if 2 <= version <= 4 else -1,
         topics=topics
     )
-    encoded = OffsetCommitRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = OffsetCommitRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -330,7 +330,7 @@ def test_offset_commit_response_roundtrip(version):
         throttle_time_ms=100 if version >= 3 else 0,
         topics=topics
     )
-    encoded = OffsetCommitResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = OffsetCommitResponse.decode(encoded, version=version)
     assert decoded == data
 

test/protocol/new/consumer/test_new_list_offsets.py

@@ -27,7 +27,7 @@ def test_list_offsets_request_roundtrip(version):
         topics=topics
     )
 
-    encoded = ListOffsetsRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = ListOffsetsRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -54,7 +54,7 @@ def test_list_offsets_response_roundtrip(version):
         topics=topics
     )
 
-    encoded = ListOffsetsResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = ListOffsetsResponse.decode(encoded, version=version)
     assert decoded == data
 

test/protocol/new/metadata/test_new_metadata.py

@@ -19,7 +19,7 @@ def test_metadata_request_roundtrip(version):
         include_topic_authorized_operations=True if version >= 8 else False
     )
 
-    encoded = MetadataRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = MetadataRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -58,6 +58,6 @@ def test_metadata_response_roundtrip(version):
         authorized_operations=None
     )
 
-    encoded = MetadataResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = MetadataResponse.decode(encoded, version=version)
     assert decoded == data

test/protocol/new/producer/test_new_produce.py

@@ -23,7 +23,7 @@ def test_produce_request_roundtrip(version):
         topic_data=topic_data
     )
 
-    encoded = ProduceRequest.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = ProduceRequest.decode(encoded, version=version)
     assert decoded == data
 
@@ -49,6 +49,6 @@ def test_produce_response_roundtrip(version):
         throttle_time_ms=10 if version >= 1 else 0
     )
 
-    encoded = ProduceResponse.encode(data, version=version)
+    encoded = data.encode(version=version)
     decoded = ProduceResponse.decode(encoded, version=version)
     assert decoded == data