include, tests: Address concerns from -Wsign-compare
After switching to Debian Trixie these surfaced as issues when building
locally.
Change-Id: I92a4d19579257e796aa29be8d4fb79fe92466780
Signed-off-by: Andrew Jeffery <andrew@codeconstruct.com.au>
diff --git a/tests/dsp/base.cpp b/tests/dsp/base.cpp
index a9f9c8a..a926104 100644
--- a/tests/dsp/base.cpp
+++ b/tests/dsp/base.cpp
@@ -1202,7 +1202,7 @@
ASSERT_EQ(0, rc);
EXPECT_EQ(0, memcmp(responsePtr->payload, responseMsg.data(),
sizeof(responseMsg)));
- EXPECT_EQ(payload_length, 1);
+ EXPECT_EQ(payload_length, 1ul);
}
#endif
diff --git a/tests/dsp/bios_table.cpp b/tests/dsp/bios_table.cpp
index bdef5a6..0186a44 100644
--- a/tests/dsp/bios_table.cpp
+++ b/tests/dsp/bios_table.cpp
@@ -1050,7 +1050,7 @@
EXPECT_EQ(pldm_bios_table_string_entry_decode_string(
entry, buffer.data(), 2 + 1 /* sizeof '\0'*/),
PLDM_SUCCESS);
- EXPECT_EQ(strlen(buffer.data()), 2);
+ EXPECT_EQ(strlen(buffer.data()), 2ul);
EXPECT_EQ(std::strcmp("Al", buffer.data()), 0);
auto rc = pldm_bios_table_string_entry_decode_string(entry, buffer.data(),
diff --git a/tests/dsp/file.cpp b/tests/dsp/file.cpp
index cf5b11d..b8fe67f 100644
--- a/tests/dsp/file.cpp
+++ b/tests/dsp/file.cpp
@@ -555,7 +555,7 @@
auto rc = encode_pldm_file_df_open_resp(instance_id, &resp_data,
responsePtr, &payload_length);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(payload_length, 1); // Completion code only
+ EXPECT_EQ(payload_length, 1ul); // Completion code only
}
#endif
diff --git a/tests/dsp/firmware_update.cpp b/tests/dsp/firmware_update.cpp
index 2aefdc6..6d4f5a6 100644
--- a/tests/dsp/firmware_update.cpp
+++ b/tests/dsp/firmware_update.cpp
@@ -520,7 +520,7 @@
uuid.begin(), uuid.end()));
EXPECT_EQ(outFwDevicePkgData.ptr, nullptr);
- EXPECT_EQ(outFwDevicePkgData.length, 0);
+ EXPECT_EQ(outFwDevicePkgData.length, 0ul);
}
TEST(DecodeFirmwareDeviceIdRecord, ErrorPaths)
@@ -1316,7 +1316,7 @@
outPendingCompImageSetVersion.length);
EXPECT_EQ(pendingCompImageSetVersionStr, pendingCompImageSetVersion);
EXPECT_EQ(outCompParameterTable.ptr, nullptr);
- EXPECT_EQ(outCompParameterTable.length, 0);
+ EXPECT_EQ(outCompParameterTable.length, 0ul);
}
TEST(GetFirmwareParameters,
@@ -1361,16 +1361,16 @@
activeCompImageSetVersion.size());
EXPECT_EQ(outResp.pending_comp_image_set_ver_str_type,
PLDM_STR_TYPE_UNKNOWN);
- EXPECT_EQ(outResp.pending_comp_image_set_ver_str_len, 0);
+ EXPECT_EQ(outResp.pending_comp_image_set_ver_str_len, 0u);
std::string activeCompImageSetVersionStr(
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
reinterpret_cast<const char*>(outActiveCompImageSetVersion.ptr),
outActiveCompImageSetVersion.length);
EXPECT_EQ(activeCompImageSetVersionStr, activeCompImageSetVersion);
EXPECT_EQ(outPendingCompImageSetVersion.ptr, nullptr);
- EXPECT_EQ(outPendingCompImageSetVersion.length, 0);
+ EXPECT_EQ(outPendingCompImageSetVersion.length, 0ul);
EXPECT_EQ(outCompParameterTable.ptr, nullptr);
- EXPECT_EQ(outCompParameterTable.length, 0);
+ EXPECT_EQ(outCompParameterTable.length, 0ul);
}
TEST(GetFirmwareParameters, decodeResponseErrorCompletionCode)
@@ -2097,7 +2097,7 @@
devIndex++;
}
ASSERT_EQ(rc, 0);
- EXPECT_EQ(devIndex, 2);
+ EXPECT_EQ(devIndex, 2ul);
}
TEST(QueryDownstreamIdentifiers, decodeResponseTwoDevicesTwoOneDescriptors)
@@ -2211,8 +2211,8 @@
devIndex++;
}
ASSERT_EQ(rc, 0);
- EXPECT_EQ(devIndex, 2);
- EXPECT_EQ(descIndex, 3);
+ EXPECT_EQ(devIndex, 2ul);
+ EXPECT_EQ(descIndex, 3ul);
}
TEST(QueryDownstreamIdentifiers, decodeResponseTwoDevicesOneTwoDescriptors)
@@ -2326,8 +2326,8 @@
devIndex++;
}
ASSERT_EQ(rc, 0);
- EXPECT_EQ(devIndex, 2);
- EXPECT_EQ(descIndex, 3);
+ EXPECT_EQ(devIndex, 2ul);
+ EXPECT_EQ(descIndex, 3ul);
}
TEST(QueryDownstreamIdentifiers, decodeRequestErrorPaths)
@@ -2580,19 +2580,19 @@
size_t entries = 0;
foreach_pldm_downstream_device_parameters_entry(iter, entry, rc)
{
- EXPECT_EQ(entry.downstream_device_index, 0);
- EXPECT_EQ(entry.active_comp_comparison_stamp, 0);
- EXPECT_EQ(entry.active_comp_ver_str_type, 1);
+ EXPECT_EQ(entry.downstream_device_index, 0u);
+ EXPECT_EQ(entry.active_comp_comparison_stamp, 0u);
+ EXPECT_EQ(entry.active_comp_ver_str_type, 1u);
EXPECT_EQ(entry.active_comp_ver_str_len,
activeComponentVersionStringLength);
EXPECT_STREQ("20241206", entry.active_comp_release_date);
- EXPECT_EQ(entry.pending_comp_comparison_stamp, 0);
- EXPECT_EQ(entry.pending_comp_ver_str_type, 1);
+ EXPECT_EQ(entry.pending_comp_comparison_stamp, 0u);
+ EXPECT_EQ(entry.pending_comp_ver_str_type, 1u);
EXPECT_EQ(entry.pending_comp_ver_str_len,
pendingComponentVersionStringLength);
EXPECT_STREQ("20241206", entry.pending_comp_release_date);
- EXPECT_EQ(entry.comp_activation_methods.value, 1);
- EXPECT_EQ(entry.capabilities_during_update.value, 0);
+ EXPECT_EQ(entry.comp_activation_methods.value, 1u);
+ EXPECT_EQ(entry.capabilities_during_update.value, 0u);
EXPECT_FALSE(memcmp("abcdefgh", entry.active_comp_ver_str,
entry.active_comp_ver_str_len));
EXPECT_FALSE(memcmp("zyxwvuts", entry.pending_comp_ver_str,
@@ -2600,7 +2600,7 @@
entries++;
}
EXPECT_EQ(rc, 0);
- EXPECT_EQ(entries, 1);
+ EXPECT_EQ(entries, 1ul);
}
TEST(GetDownstreamFirmwareParameters, goodPathDecodeResponseTwoEntries)
@@ -5071,38 +5071,38 @@
EXPECT_EQ(hdr.component_bitmap_bit_length, 8);
EXPECT_EQ(hdr.package_version_string_type, 1);
- ASSERT_EQ(hdr.package_version_string.length, 4);
+ ASSERT_EQ(hdr.package_version_string.length, 4ul);
EXPECT_EQ(memcmp("test", hdr.package_version_string.ptr,
hdr.package_version_string.length),
0);
EXPECT_NE(pkg.areas.ptr, nullptr);
- EXPECT_NE(pkg.areas.length, 0);
+ EXPECT_NE(pkg.areas.length, 0ul);
EXPECT_NE(pkg.package.ptr, nullptr);
- EXPECT_NE(pkg.package.length, 0);
+ EXPECT_NE(pkg.package.length, 0ul);
foreach_pldm_package_firmware_device_id_record(pkg, fdrec, rc)
{
struct pldm_descriptor desc;
- EXPECT_EQ(fdrec.descriptor_count, 1);
- EXPECT_EQ(fdrec.device_update_option_flags.value, 0);
- EXPECT_EQ(fdrec.component_image_set_version_string_type, 1);
- ASSERT_EQ(fdrec.component_image_set_version_string.length, 4);
+ EXPECT_EQ(fdrec.descriptor_count, 1u);
+ EXPECT_EQ(fdrec.device_update_option_flags.value, 0u);
+ EXPECT_EQ(fdrec.component_image_set_version_string_type, 1u);
+ ASSERT_EQ(fdrec.component_image_set_version_string.length, 4ul);
EXPECT_EQ(memcmp("v0.1", fdrec.component_image_set_version_string.ptr,
fdrec.component_image_set_version_string.length),
0);
- ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1);
- EXPECT_NE(fdrec.record_descriptors.length, 0);
+ ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1u);
+ EXPECT_NE(fdrec.record_descriptors.length, 0ul);
EXPECT_NE(fdrec.record_descriptors.ptr, nullptr);
- ASSERT_EQ(fdrec.firmware_device_package_data.length, 0);
+ ASSERT_EQ(fdrec.firmware_device_package_data.length, 0ul);
foreach_pldm_package_firmware_device_id_record_descriptor(pkg, fdrec,
desc, rc)
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1ul);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -5140,7 +5140,7 @@
expected_info.component_image.length);
EXPECT_EQ(info.component_version_string_type,
expected_info.component_version_string_type);
- ASSERT_EQ(info.component_version_string.length, 4);
+ ASSERT_EQ(info.component_version_string.length, 4ul);
EXPECT_EQ(memcmp("v0.2", info.component_version_string.ptr,
info.component_version_string.length),
0);
@@ -5201,40 +5201,40 @@
timestamp.size()),
0);
- EXPECT_EQ(hdr.component_bitmap_bit_length, 8);
- EXPECT_EQ(hdr.package_version_string_type, 1);
- ASSERT_EQ(hdr.package_version_string.length, 4);
+ EXPECT_EQ(hdr.component_bitmap_bit_length, 8u);
+ EXPECT_EQ(hdr.package_version_string_type, 1u);
+ ASSERT_EQ(hdr.package_version_string.length, 4ul);
EXPECT_EQ(memcmp("test", hdr.package_version_string.ptr,
hdr.package_version_string.length),
0);
EXPECT_NE(pkg.areas.ptr, nullptr);
- EXPECT_NE(pkg.areas.length, 0);
+ EXPECT_NE(pkg.areas.length, 0ul);
EXPECT_NE(pkg.package.ptr, nullptr);
- EXPECT_NE(pkg.package.length, 0);
+ EXPECT_NE(pkg.package.length, 0ul);
foreach_pldm_package_firmware_device_id_record(pkg, fdrec, rc)
{
struct pldm_descriptor desc;
- EXPECT_EQ(fdrec.descriptor_count, 1);
- EXPECT_EQ(fdrec.device_update_option_flags.value, 0);
- EXPECT_EQ(fdrec.component_image_set_version_string_type, 1);
- ASSERT_EQ(fdrec.component_image_set_version_string.length, 4);
+ EXPECT_EQ(fdrec.descriptor_count, 1u);
+ EXPECT_EQ(fdrec.device_update_option_flags.value, 0u);
+ EXPECT_EQ(fdrec.component_image_set_version_string_type, 1u);
+ ASSERT_EQ(fdrec.component_image_set_version_string.length, 4ul);
EXPECT_EQ(memcmp("v0.1", fdrec.component_image_set_version_string.ptr,
fdrec.component_image_set_version_string.length),
0);
- ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1);
- EXPECT_NE(fdrec.record_descriptors.length, 0);
+ ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1u);
+ EXPECT_NE(fdrec.record_descriptors.length, 0ul);
EXPECT_NE(fdrec.record_descriptors.ptr, nullptr);
- ASSERT_EQ(fdrec.firmware_device_package_data.length, 0);
+ ASSERT_EQ(fdrec.firmware_device_package_data.length, 0ul);
foreach_pldm_package_firmware_device_id_record_descriptor(pkg, fdrec,
desc, rc)
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1u);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -5309,40 +5309,40 @@
timestamp.size()),
0);
- EXPECT_EQ(hdr.component_bitmap_bit_length, 8);
- EXPECT_EQ(hdr.package_version_string_type, 1);
- ASSERT_EQ(hdr.package_version_string.length, 4);
+ EXPECT_EQ(hdr.component_bitmap_bit_length, 8u);
+ EXPECT_EQ(hdr.package_version_string_type, 1u);
+ ASSERT_EQ(hdr.package_version_string.length, 4ul);
EXPECT_EQ(memcmp("test", hdr.package_version_string.ptr,
hdr.package_version_string.length),
0);
EXPECT_NE(pkg.areas.ptr, nullptr);
- EXPECT_NE(pkg.areas.length, 0);
+ EXPECT_NE(pkg.areas.length, 0ul);
EXPECT_NE(pkg.package.ptr, nullptr);
- EXPECT_NE(pkg.package.length, 0);
+ EXPECT_NE(pkg.package.length, 0ul);
foreach_pldm_package_firmware_device_id_record(pkg, fdrec, rc)
{
struct pldm_descriptor desc;
- EXPECT_EQ(fdrec.descriptor_count, 1);
- EXPECT_EQ(fdrec.device_update_option_flags.value, 0);
- EXPECT_EQ(fdrec.component_image_set_version_string_type, 1);
- ASSERT_EQ(fdrec.component_image_set_version_string.length, 4);
+ EXPECT_EQ(fdrec.descriptor_count, 1u);
+ EXPECT_EQ(fdrec.device_update_option_flags.value, 0u);
+ EXPECT_EQ(fdrec.component_image_set_version_string_type, 1u);
+ ASSERT_EQ(fdrec.component_image_set_version_string.length, 4ul);
EXPECT_EQ(memcmp("v0.1", fdrec.component_image_set_version_string.ptr,
fdrec.component_image_set_version_string.length),
0);
- ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1);
- EXPECT_NE(fdrec.record_descriptors.length, 0);
+ ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1u);
+ EXPECT_NE(fdrec.record_descriptors.length, 0ul);
EXPECT_NE(fdrec.record_descriptors.ptr, nullptr);
- ASSERT_EQ(fdrec.firmware_device_package_data.length, 0);
+ ASSERT_EQ(fdrec.firmware_device_package_data.length, 0ul);
foreach_pldm_package_firmware_device_id_record_descriptor(pkg, fdrec,
desc, rc)
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1u);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -5398,7 +5398,7 @@
expected_info.component_image.length);
EXPECT_EQ(info.component_version_string_type,
expected_info.component_version_string_type);
- ASSERT_EQ(info.component_version_string.length, 4);
+ ASSERT_EQ(info.component_version_string.length, 4ul);
EXPECT_EQ(memcmp("v0.2", info.component_version_string.ptr,
info.component_version_string.length),
0);
@@ -5473,40 +5473,40 @@
timestamp.size()),
0);
- EXPECT_EQ(hdr.component_bitmap_bit_length, 8);
- EXPECT_EQ(hdr.package_version_string_type, 1);
- ASSERT_EQ(hdr.package_version_string.length, 4);
+ EXPECT_EQ(hdr.component_bitmap_bit_length, 8u);
+ EXPECT_EQ(hdr.package_version_string_type, 1u);
+ ASSERT_EQ(hdr.package_version_string.length, 4ul);
EXPECT_EQ(memcmp("test", hdr.package_version_string.ptr,
hdr.package_version_string.length),
0);
EXPECT_NE(pkg.areas.ptr, nullptr);
- EXPECT_NE(pkg.areas.length, 0);
+ EXPECT_NE(pkg.areas.length, 0ul);
EXPECT_NE(pkg.package.ptr, nullptr);
- EXPECT_NE(pkg.package.length, 0);
+ EXPECT_NE(pkg.package.length, 0ul);
foreach_pldm_package_firmware_device_id_record(pkg, fdrec, rc)
{
struct pldm_descriptor desc;
- EXPECT_EQ(fdrec.descriptor_count, 1);
- EXPECT_EQ(fdrec.device_update_option_flags.value, 0);
- EXPECT_EQ(fdrec.component_image_set_version_string_type, 1);
- ASSERT_EQ(fdrec.component_image_set_version_string.length, 4);
+ EXPECT_EQ(fdrec.descriptor_count, 1u);
+ EXPECT_EQ(fdrec.device_update_option_flags.value, 0u);
+ EXPECT_EQ(fdrec.component_image_set_version_string_type, 1u);
+ ASSERT_EQ(fdrec.component_image_set_version_string.length, 4ul);
EXPECT_EQ(memcmp("v0.1", fdrec.component_image_set_version_string.ptr,
fdrec.component_image_set_version_string.length),
0);
- ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1);
- EXPECT_NE(fdrec.record_descriptors.length, 0);
+ ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1u);
+ EXPECT_NE(fdrec.record_descriptors.length, 0ul);
EXPECT_NE(fdrec.record_descriptors.ptr, nullptr);
- ASSERT_EQ(fdrec.firmware_device_package_data.length, 0);
+ ASSERT_EQ(fdrec.firmware_device_package_data.length, 0ul);
foreach_pldm_package_firmware_device_id_record_descriptor(pkg, fdrec,
desc, rc)
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1u);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -5527,29 +5527,30 @@
{
struct pldm_descriptor desc;
- EXPECT_EQ(ddrec.descriptor_count, 1);
- EXPECT_EQ(ddrec.update_option_flags.value, 0);
- EXPECT_EQ(ddrec.self_contained_activation_min_version_string_type, 1);
- ASSERT_EQ(ddrec.self_contained_activation_min_version_string.length, 4);
+ EXPECT_EQ(ddrec.descriptor_count, 1u);
+ EXPECT_EQ(ddrec.update_option_flags.value, 0u);
+ EXPECT_EQ(ddrec.self_contained_activation_min_version_string_type, 1u);
+ ASSERT_EQ(ddrec.self_contained_activation_min_version_string.length,
+ 4ul);
EXPECT_EQ(
memcmp("v1.0",
ddrec.self_contained_activation_min_version_string.ptr,
ddrec.self_contained_activation_min_version_string.length),
0);
EXPECT_EQ(ddrec.self_contained_activation_min_version_comparison_stamp,
- 0);
- ASSERT_EQ(ddrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*ddrec.applicable_components.bitmap.ptr, 2);
- EXPECT_NE(ddrec.record_descriptors.length, 0);
+ 0u);
+ ASSERT_EQ(ddrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*ddrec.applicable_components.bitmap.ptr, 2u);
+ EXPECT_NE(ddrec.record_descriptors.length, 0ul);
EXPECT_NE(ddrec.record_descriptors.ptr, nullptr);
- EXPECT_EQ(ddrec.package_data.length, 0);
+ EXPECT_EQ(ddrec.package_data.length, 0ul);
foreach_pldm_package_downstream_device_id_record_descriptor(pkg, ddrec,
desc, rc)
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1u);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -5616,7 +5617,7 @@
EXPECT_EQ(*info.component_image.ptr, image);
EXPECT_EQ(info.component_version_string_type,
expected->component_version_string_type);
- ASSERT_EQ(info.component_version_string.length, 4);
+ ASSERT_EQ(info.component_version_string.length, 4ul);
EXPECT_EQ(memcmp(version, info.component_version_string.ptr,
info.component_version_string.length),
0);
@@ -5693,40 +5694,40 @@
timestamp.size()),
0);
- EXPECT_EQ(hdr.component_bitmap_bit_length, 8);
- EXPECT_EQ(hdr.package_version_string_type, 1);
- ASSERT_EQ(hdr.package_version_string.length, 4);
+ EXPECT_EQ(hdr.component_bitmap_bit_length, 8u);
+ EXPECT_EQ(hdr.package_version_string_type, 1u);
+ ASSERT_EQ(hdr.package_version_string.length, 4ul);
EXPECT_EQ(memcmp("test", hdr.package_version_string.ptr,
hdr.package_version_string.length),
0);
EXPECT_NE(pkg.areas.ptr, nullptr);
- EXPECT_NE(pkg.areas.length, 0);
+ EXPECT_NE(pkg.areas.length, 0ul);
EXPECT_NE(pkg.package.ptr, nullptr);
- EXPECT_NE(pkg.package.length, 0);
+ EXPECT_NE(pkg.package.length, 0ul);
foreach_pldm_package_firmware_device_id_record(pkg, fdrec, rc)
{
struct pldm_descriptor desc;
- EXPECT_EQ(fdrec.descriptor_count, 1);
- EXPECT_EQ(fdrec.device_update_option_flags.value, 0);
- EXPECT_EQ(fdrec.component_image_set_version_string_type, 1);
- ASSERT_EQ(fdrec.component_image_set_version_string.length, 4);
+ EXPECT_EQ(fdrec.descriptor_count, 1u);
+ EXPECT_EQ(fdrec.device_update_option_flags.value, 0u);
+ EXPECT_EQ(fdrec.component_image_set_version_string_type, 1u);
+ ASSERT_EQ(fdrec.component_image_set_version_string.length, 4ul);
EXPECT_EQ(memcmp("v0.1", fdrec.component_image_set_version_string.ptr,
fdrec.component_image_set_version_string.length),
0);
- ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1);
- EXPECT_NE(fdrec.record_descriptors.length, 0);
+ ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1u);
+ EXPECT_NE(fdrec.record_descriptors.length, 0ul);
EXPECT_NE(fdrec.record_descriptors.ptr, nullptr);
- ASSERT_EQ(fdrec.firmware_device_package_data.length, 0);
+ ASSERT_EQ(fdrec.firmware_device_package_data.length, 0ul);
foreach_pldm_package_firmware_device_id_record_descriptor(pkg, fdrec,
desc, rc)
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1u);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -5747,29 +5748,30 @@
{
struct pldm_descriptor desc;
- EXPECT_EQ(ddrec.descriptor_count, 1);
- EXPECT_EQ(ddrec.update_option_flags.value, 0);
- EXPECT_EQ(ddrec.self_contained_activation_min_version_string_type, 1);
- ASSERT_EQ(ddrec.self_contained_activation_min_version_string.length, 4);
+ EXPECT_EQ(ddrec.descriptor_count, 1u);
+ EXPECT_EQ(ddrec.update_option_flags.value, 0u);
+ EXPECT_EQ(ddrec.self_contained_activation_min_version_string_type, 1u);
+ ASSERT_EQ(ddrec.self_contained_activation_min_version_string.length,
+ 4ul);
EXPECT_EQ(
memcmp("v1.0",
ddrec.self_contained_activation_min_version_string.ptr,
ddrec.self_contained_activation_min_version_string.length),
0);
EXPECT_EQ(ddrec.self_contained_activation_min_version_comparison_stamp,
- 0);
- ASSERT_EQ(ddrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*ddrec.applicable_components.bitmap.ptr, 2);
- EXPECT_NE(ddrec.record_descriptors.length, 0);
+ 0u);
+ ASSERT_EQ(ddrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*ddrec.applicable_components.bitmap.ptr, 2u);
+ EXPECT_NE(ddrec.record_descriptors.length, 0ul);
EXPECT_NE(ddrec.record_descriptors.ptr, nullptr);
- EXPECT_EQ(ddrec.package_data.length, 0);
+ EXPECT_EQ(ddrec.package_data.length, 0ul);
foreach_pldm_package_downstream_device_id_record_descriptor(pkg, ddrec,
desc, rc)
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1u);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -5841,7 +5843,7 @@
EXPECT_EQ(*info.component_image.ptr, image);
EXPECT_EQ(info.component_version_string_type,
expected->component_version_string_type);
- ASSERT_EQ(info.component_version_string.length, 4);
+ ASSERT_EQ(info.component_version_string.length, 4ul);
EXPECT_EQ(memcmp(version, info.component_version_string.ptr,
info.component_version_string.length),
0);
@@ -5925,16 +5927,16 @@
timestamp.size()),
0);
- EXPECT_EQ(hdr.component_bitmap_bit_length, 8);
- EXPECT_EQ(hdr.package_version_string_type, 1);
- ASSERT_EQ(hdr.package_version_string.length, 4);
+ EXPECT_EQ(hdr.component_bitmap_bit_length, 8u);
+ EXPECT_EQ(hdr.package_version_string_type, 1u);
+ ASSERT_EQ(hdr.package_version_string.length, 4ul);
EXPECT_EQ(memcmp("test", hdr.package_version_string.ptr,
hdr.package_version_string.length),
0);
EXPECT_NE(pkg.areas.ptr, nullptr);
- EXPECT_NE(pkg.areas.length, 0);
+ EXPECT_NE(pkg.areas.length, 0ul);
EXPECT_NE(pkg.package.ptr, nullptr);
- EXPECT_NE(pkg.package.length, 0);
+ EXPECT_NE(pkg.package.length, 0ul);
foreach_pldm_package_firmware_device_id_record(pkg, fdrec, rc)
{
@@ -5942,18 +5944,18 @@
static const uint8_t expected_reference_manifest_data[] = {0x87, 0x65};
- EXPECT_EQ(fdrec.descriptor_count, 1);
- EXPECT_EQ(fdrec.device_update_option_flags.value, 0);
- EXPECT_EQ(fdrec.component_image_set_version_string_type, 1);
- ASSERT_EQ(fdrec.component_image_set_version_string.length, 4);
+ EXPECT_EQ(fdrec.descriptor_count, 1u);
+ EXPECT_EQ(fdrec.device_update_option_flags.value, 0u);
+ EXPECT_EQ(fdrec.component_image_set_version_string_type, 1u);
+ ASSERT_EQ(fdrec.component_image_set_version_string.length, 4ul);
EXPECT_EQ(memcmp("v0.1", fdrec.component_image_set_version_string.ptr,
fdrec.component_image_set_version_string.length),
0);
- ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1);
- EXPECT_NE(fdrec.record_descriptors.length, 0);
+ ASSERT_EQ(fdrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*fdrec.applicable_components.bitmap.ptr, 1u);
+ EXPECT_NE(fdrec.record_descriptors.length, 0ul);
EXPECT_NE(fdrec.record_descriptors.ptr, nullptr);
- ASSERT_EQ(fdrec.firmware_device_package_data.length, 0);
+ ASSERT_EQ(fdrec.firmware_device_package_data.length, 0ul);
EXPECT_EQ(fdrec.reference_manifest_data.length,
sizeof(expected_reference_manifest_data));
EXPECT_EQ(memcmp(fdrec.reference_manifest_data.ptr,
@@ -5965,7 +5967,7 @@
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1u);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -5988,22 +5990,23 @@
static const uint8_t expected_reference_manifest_data[] = {0x87, 0x65};
- EXPECT_EQ(ddrec.descriptor_count, 1);
- EXPECT_EQ(ddrec.update_option_flags.value, 0);
- EXPECT_EQ(ddrec.self_contained_activation_min_version_string_type, 1);
- ASSERT_EQ(ddrec.self_contained_activation_min_version_string.length, 4);
+ EXPECT_EQ(ddrec.descriptor_count, 1u);
+ EXPECT_EQ(ddrec.update_option_flags.value, 0u);
+ EXPECT_EQ(ddrec.self_contained_activation_min_version_string_type, 1u);
+ ASSERT_EQ(ddrec.self_contained_activation_min_version_string.length,
+ 4ul);
EXPECT_EQ(
memcmp("v1.0",
ddrec.self_contained_activation_min_version_string.ptr,
ddrec.self_contained_activation_min_version_string.length),
0);
EXPECT_EQ(ddrec.self_contained_activation_min_version_comparison_stamp,
- 0);
- ASSERT_EQ(ddrec.applicable_components.bitmap.length, 1);
- EXPECT_EQ(*ddrec.applicable_components.bitmap.ptr, 2);
- EXPECT_NE(ddrec.record_descriptors.length, 0);
+ 0u);
+ ASSERT_EQ(ddrec.applicable_components.bitmap.length, 1ul);
+ EXPECT_EQ(*ddrec.applicable_components.bitmap.ptr, 2u);
+ EXPECT_NE(ddrec.record_descriptors.length, 0ul);
EXPECT_NE(ddrec.record_descriptors.ptr, nullptr);
- EXPECT_EQ(ddrec.package_data.length, 0);
+ EXPECT_EQ(ddrec.package_data.length, 0ul);
EXPECT_EQ(fdrec.reference_manifest_data.length,
sizeof(expected_reference_manifest_data));
EXPECT_EQ(memcmp(fdrec.reference_manifest_data.ptr,
@@ -6016,7 +6019,7 @@
{
static const uint8_t iana_pen_dmtf[] = {0x9c, 0x01, 0x00, 0x00};
- EXPECT_EQ(desc.descriptor_type, 1);
+ EXPECT_EQ(desc.descriptor_type, 1u);
ASSERT_EQ(desc.descriptor_length, sizeof(iana_pen_dmtf));
EXPECT_EQ(memcmp(iana_pen_dmtf, desc.descriptor_data,
sizeof(iana_pen_dmtf)),
@@ -6088,7 +6091,7 @@
EXPECT_EQ(*info.component_image.ptr, image);
EXPECT_EQ(info.component_version_string_type,
expected->component_version_string_type);
- ASSERT_EQ(info.component_version_string.length, 4);
+ ASSERT_EQ(info.component_version_string.length, 4ul);
EXPECT_EQ(memcmp(version, info.component_version_string.ptr,
info.component_version_string.length),
0);
diff --git a/tests/dsp/pdr.cpp b/tests/dsp/pdr.cpp
index 9c48215..0cd95dc 100644
--- a/tests/dsp/pdr.cpp
+++ b/tests/dsp/pdr.cpp
@@ -791,19 +791,19 @@
int rc =
pldm_pdr_delete_by_sensor_id(repo, 1, false, &removed_record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(removed_record_handle, 1);
+ EXPECT_EQ(removed_record_handle, 1u);
EXPECT_EQ(pldm_pdr_get_record_count(repo), 3u);
// Error case where the effceter ID is not present in the repo
uint32_t removed_rec_handle{};
rc = pldm_pdr_delete_by_sensor_id(repo, 15, false, &removed_rec_handle);
EXPECT_EQ(rc, -ENOENT);
- EXPECT_EQ(removed_rec_handle, 0);
+ EXPECT_EQ(removed_rec_handle, 0u);
EXPECT_EQ(pldm_pdr_get_record_count(repo), 3u);
rc = pldm_pdr_delete_by_sensor_id(repo, 10, false, &removed_record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(removed_record_handle, 3);
+ EXPECT_EQ(removed_record_handle, 3u);
EXPECT_EQ(pldm_pdr_get_record_count(repo), 2u);
pldm_pdr_destroy(repo);
@@ -966,20 +966,20 @@
int rc =
pldm_pdr_delete_by_effecter_id(repo, 1, false, &removed_record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(removed_record_handle, 1);
+ EXPECT_EQ(removed_record_handle, 1u);
EXPECT_EQ(pldm_pdr_get_record_count(repo), 3u);
// Error case where the effceter ID is not present in the repo
uint32_t removed_rec_handle{};
rc = pldm_pdr_delete_by_effecter_id(repo, 15, false, &removed_rec_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(removed_rec_handle, 0);
+ EXPECT_EQ(removed_rec_handle, 0u);
EXPECT_EQ(pldm_pdr_get_record_count(repo), 3u);
rc =
pldm_pdr_delete_by_effecter_id(repo, 20, false, &removed_record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(removed_record_handle, 4);
+ EXPECT_EQ(removed_record_handle, 4u);
EXPECT_EQ(pldm_pdr_get_record_count(repo), 2u);
pldm_pdr_destroy(repo);
@@ -2308,14 +2308,14 @@
EXPECT_NE(hdl1, nullptr);
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
pldm_pdr_hdr* hdr = reinterpret_cast<pldm_pdr_hdr*>(outData);
- EXPECT_EQ(hdr->record_handle, 2);
+ EXPECT_EQ(hdr->record_handle, 2u);
outData = nullptr;
auto hdl2 = pldm_pdr_find_record(repo, 23, &outData, &size, &nextRecHdl);
EXPECT_NE(hdl2, nullptr);
// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
pldm_pdr_hdr* hdr1 = reinterpret_cast<pldm_pdr_hdr*>(outData);
- EXPECT_EQ(hdr1->record_handle, 23);
+ EXPECT_EQ(hdr1->record_handle, 23u);
outData = nullptr;
auto hdl3 = pldm_pdr_find_record(repo, 3, &outData, &size, &nextRecHdl);
@@ -2443,7 +2443,7 @@
repo, 34, &entity2[0], &entity3[0], &updated_record_handle),
0);
- EXPECT_EQ(updated_record_handle, 35);
+ EXPECT_EQ(updated_record_handle, 35u);
free(entities);
pldm_pdr_destroy(repo);
@@ -2499,21 +2499,21 @@
EXPECT_EQ(pldm_entity_association_pdr_remove_contained_entity(
repo, entity, false, &removed_record_handle),
0);
- EXPECT_EQ(removed_record_handle, 3);
+ EXPECT_EQ(removed_record_handle, 3u);
// Remove second contained entity from the entity association PDR
removed_record_handle = 0;
EXPECT_EQ(pldm_entity_association_pdr_remove_contained_entity(
repo, &entities[1], false, &removed_record_handle),
0);
- EXPECT_EQ(removed_record_handle, 3);
+ EXPECT_EQ(removed_record_handle, 3u);
// Remove third contained entity from the entity association PDR
removed_record_handle = 0;
EXPECT_EQ(pldm_entity_association_pdr_remove_contained_entity(
repo, &entities[2], false, &removed_record_handle),
0);
- EXPECT_EQ(removed_record_handle, 3);
+ EXPECT_EQ(removed_record_handle, 3u);
// As all the contained entities are removed the entity association PDR
// also gets deleted
@@ -2529,7 +2529,7 @@
{
auto repo = pldm_pdr_init();
- uint32_t record_handle = 1;
+ uint32_t record_handle = 1u;
int rc = pldm_pdr_add_fru_record_set(repo, 1, 1, 1, 0, 100, &record_handle);
EXPECT_EQ(rc, 0);
record_handle = 2;
@@ -2538,14 +2538,14 @@
record_handle = 3;
rc = pldm_pdr_add_fru_record_set(repo, 1, 3, 1, 2, 100, &record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(pldm_pdr_get_record_count(repo), 3);
+ EXPECT_EQ(pldm_pdr_get_record_count(repo), 3u);
uint32_t removed_record_handle{};
rc = pldm_pdr_remove_fru_record_set_by_rsi(repo, 2, false,
&removed_record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(removed_record_handle, 2);
- EXPECT_EQ(pldm_pdr_get_record_count(repo), 2);
+ EXPECT_EQ(removed_record_handle, 2u);
+ EXPECT_EQ(pldm_pdr_get_record_count(repo), 2u);
uint16_t terminusHdl{};
uint16_t entityType{};
@@ -2555,13 +2555,13 @@
repo, 1, &terminusHdl, &entityType, &entityInstanceNum, &containerId);
EXPECT_NE(record, nullptr);
record_handle = pldm_pdr_get_record_handle(repo, record);
- EXPECT_EQ(record_handle, 1);
+ EXPECT_EQ(record_handle, 1u);
record = pldm_pdr_fru_record_set_find_by_rsi(
repo, 3, &terminusHdl, &entityType, &entityInstanceNum, &containerId);
EXPECT_NE(record, nullptr);
record_handle = pldm_pdr_get_record_handle(repo, record);
- EXPECT_EQ(record_handle, 3);
+ EXPECT_EQ(record_handle, 3u);
record = pldm_pdr_fru_record_set_find_by_rsi(
repo, 2, &terminusHdl, &entityType, &entityInstanceNum, &containerId);
@@ -2570,22 +2570,22 @@
rc = pldm_pdr_remove_fru_record_set_by_rsi(repo, 1, false,
&removed_record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(removed_record_handle, 1);
+ EXPECT_EQ(removed_record_handle, 1u);
// remove the same record again
removed_record_handle = 5;
rc = pldm_pdr_remove_fru_record_set_by_rsi(repo, 1, false,
&removed_record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_NE(removed_record_handle, 1);
- EXPECT_EQ(removed_record_handle, 5);
+ EXPECT_NE(removed_record_handle, 1u);
+ EXPECT_EQ(removed_record_handle, 5u);
rc = pldm_pdr_remove_fru_record_set_by_rsi(repo, 3, false,
&removed_record_handle);
EXPECT_EQ(rc, 0);
- EXPECT_EQ(removed_record_handle, 3);
+ EXPECT_EQ(removed_record_handle, 3u);
- EXPECT_EQ(pldm_pdr_get_record_count(repo), 0);
+ EXPECT_EQ(pldm_pdr_get_record_count(repo), 0u);
pldm_pdr_destroy(repo);
}
diff --git a/tests/dsp/platform.cpp b/tests/dsp/platform.cpp
index 8450e11..13a3229 100644
--- a/tests/dsp/platform.cpp
+++ b/tests/dsp/platform.cpp
@@ -54,7 +54,7 @@
rc = encode_state_effecter_pdr(&effecter, sizeof(effecter),
&possible_states, 1, &actual_size);
EXPECT_EQ(rc, PLDM_ERROR);
- EXPECT_EQ(actual_size, 0);
+ EXPECT_EQ(actual_size, 0ul);
}
TEST(StateEffecterPdr, testReasonableInvocations)
@@ -496,11 +496,11 @@
sizeof(resp_data) - sizeof(*resp), &crc);
ASSERT_EQ(rc, 0);
EXPECT_EQ(resp->completion_code, PLDM_SUCCESS);
- EXPECT_EQ(resp->next_record_handle, 0);
- EXPECT_EQ(resp->next_data_transfer_handle, 0);
+ EXPECT_EQ(resp->next_record_handle, 0u);
+ EXPECT_EQ(resp->next_data_transfer_handle, 0u);
EXPECT_EQ(resp->transfer_flag, PLDM_END);
ASSERT_EQ(resp->response_count, sizeof(recordData) - 1);
- EXPECT_EQ(crc, 96);
+ EXPECT_EQ(crc, 96u);
EXPECT_EQ(0, memcmp(recordData, resp->record_data, resp->response_count));
}
#endif
@@ -762,8 +762,8 @@
memcmp(updateTime, resp.update_time, sizeof(resp.update_time)));
EXPECT_EQ(0, memcmp(oemUpdateTime, resp.oem_update_time,
sizeof(resp.oem_update_time)));
- EXPECT_EQ(100, resp.record_count);
- EXPECT_EQ(100, resp.repository_size);
+ EXPECT_EQ(100u, resp.record_count);
+ EXPECT_EQ(100u, resp.repository_size);
EXPECT_EQ(UINT32_MAX, resp.largest_record_size);
EXPECT_EQ(PLDM_NO_TIMEOUT, resp.data_transfer_handle_timeout);
}
@@ -3616,7 +3616,7 @@
rc = decode_set_numeric_sensor_enable_req(msg, 4, &decoded);
EXPECT_EQ(rc, 0);
EXPECT_EQ(decoded.sensor_id, 0x4567);
- EXPECT_EQ(decoded.op_state, PLDM_SENSOR_ENABLED);
+ EXPECT_EQ(decoded.op_state, PLDM_SET_SENSOR_ENABLED);
EXPECT_EQ(decoded.event_enable, PLDM_EVENTS_DISABLED);
// Fail short
@@ -4173,51 +4173,51 @@
auto rc =
decode_numeric_sensor_pdr_data(pdr1.data(), pdr1.size(), &decodedPdr);
EXPECT_EQ(PLDM_SUCCESS, rc);
- EXPECT_EQ(1, decodedPdr.hdr.record_handle);
- EXPECT_EQ(1, decodedPdr.hdr.version);
+ EXPECT_EQ(1u, decodedPdr.hdr.record_handle);
+ EXPECT_EQ(1u, decodedPdr.hdr.version);
EXPECT_EQ(PLDM_NUMERIC_SENSOR_PDR, decodedPdr.hdr.type);
- EXPECT_EQ(0, decodedPdr.hdr.record_change_num);
+ EXPECT_EQ(0u, decodedPdr.hdr.record_change_num);
EXPECT_EQ(PLDM_PDR_NUMERIC_SENSOR_PDR_MIN_LENGTH, decodedPdr.hdr.length);
- EXPECT_EQ(1, decodedPdr.sensor_id);
+ EXPECT_EQ(1u, decodedPdr.sensor_id);
EXPECT_EQ(PLDM_ENTITY_POWER_SUPPLY, decodedPdr.entity_type);
- EXPECT_EQ(1, decodedPdr.entity_instance_num);
- EXPECT_EQ(1, decodedPdr.container_id);
+ EXPECT_EQ(1u, decodedPdr.entity_instance_num);
+ EXPECT_EQ(1u, decodedPdr.container_id);
EXPECT_EQ(PLDM_NO_INIT, decodedPdr.sensor_init);
EXPECT_EQ(false, decodedPdr.sensor_auxiliary_names_pdr);
EXPECT_EQ(PLDM_SENSOR_UNIT_DEGRESS_C, decodedPdr.base_unit);
EXPECT_EQ(0, decodedPdr.unit_modifier);
- EXPECT_EQ(0, decodedPdr.rate_unit);
- EXPECT_EQ(0, decodedPdr.base_oem_unit_handle);
- EXPECT_EQ(0, decodedPdr.aux_unit);
+ EXPECT_EQ(0u, decodedPdr.rate_unit);
+ EXPECT_EQ(0u, decodedPdr.base_oem_unit_handle);
+ EXPECT_EQ(0u, decodedPdr.aux_unit);
EXPECT_EQ(0, decodedPdr.aux_unit_modifier);
- EXPECT_EQ(0, decodedPdr.aux_rate_unit);
- EXPECT_EQ(0, decodedPdr.rel);
- EXPECT_EQ(0, decodedPdr.aux_oem_unit_handle);
+ EXPECT_EQ(0u, decodedPdr.aux_rate_unit);
+ EXPECT_EQ(0u, decodedPdr.rel);
+ EXPECT_EQ(0u, decodedPdr.aux_oem_unit_handle);
EXPECT_EQ(true, decodedPdr.is_linear);
EXPECT_EQ(PLDM_SENSOR_DATA_SIZE_UINT8, decodedPdr.sensor_data_size);
EXPECT_FLOAT_EQ(1.5f, decodedPdr.resolution);
EXPECT_FLOAT_EQ(1.0f, decodedPdr.offset);
- EXPECT_EQ(0, decodedPdr.accuracy);
- EXPECT_EQ(0, decodedPdr.plus_tolerance);
- EXPECT_EQ(0, decodedPdr.minus_tolerance);
- EXPECT_EQ(3, decodedPdr.hysteresis.value_u8);
- EXPECT_EQ(0, decodedPdr.supported_thresholds.byte);
- EXPECT_EQ(0, decodedPdr.threshold_and_hysteresis_volatility.byte);
+ EXPECT_EQ(0u, decodedPdr.accuracy);
+ EXPECT_EQ(0u, decodedPdr.plus_tolerance);
+ EXPECT_EQ(0u, decodedPdr.minus_tolerance);
+ EXPECT_EQ(3u, decodedPdr.hysteresis.value_u8);
+ EXPECT_EQ(0u, decodedPdr.supported_thresholds.byte);
+ EXPECT_EQ(0u, decodedPdr.threshold_and_hysteresis_volatility.byte);
EXPECT_FLOAT_EQ(1.0f, decodedPdr.state_transition_interval);
EXPECT_FLOAT_EQ(1.0f, decodedPdr.update_interval);
- EXPECT_EQ(255, decodedPdr.max_readable.value_u8);
- EXPECT_EQ(0, decodedPdr.min_readable.value_u8);
+ EXPECT_EQ(255u, decodedPdr.max_readable.value_u8);
+ EXPECT_EQ(0u, decodedPdr.min_readable.value_u8);
EXPECT_EQ(PLDM_RANGE_FIELD_FORMAT_UINT8, decodedPdr.range_field_format);
- EXPECT_EQ(0, decodedPdr.range_field_support.byte);
- EXPECT_EQ(50, decodedPdr.nominal_value.value_u8);
- EXPECT_EQ(60, decodedPdr.normal_max.value_u8);
- EXPECT_EQ(40, decodedPdr.normal_min.value_u8);
- EXPECT_EQ(70, decodedPdr.warning_high.value_u8);
- EXPECT_EQ(30, decodedPdr.warning_low.value_u8);
- EXPECT_EQ(80, decodedPdr.critical_high.value_u8);
- EXPECT_EQ(20, decodedPdr.critical_low.value_u8);
- EXPECT_EQ(90, decodedPdr.fatal_high.value_u8);
- EXPECT_EQ(10, decodedPdr.fatal_low.value_u8);
+ EXPECT_EQ(0u, decodedPdr.range_field_support.byte);
+ EXPECT_EQ(50u, decodedPdr.nominal_value.value_u8);
+ EXPECT_EQ(60u, decodedPdr.normal_max.value_u8);
+ EXPECT_EQ(40u, decodedPdr.normal_min.value_u8);
+ EXPECT_EQ(70u, decodedPdr.warning_high.value_u8);
+ EXPECT_EQ(30u, decodedPdr.warning_low.value_u8);
+ EXPECT_EQ(80u, decodedPdr.critical_high.value_u8);
+ EXPECT_EQ(20u, decodedPdr.critical_low.value_u8);
+ EXPECT_EQ(90u, decodedPdr.fatal_high.value_u8);
+ EXPECT_EQ(10u, decodedPdr.fatal_low.value_u8);
}
TEST(decodeNumericSensorPdrData, Sint8Test)
@@ -4410,18 +4410,18 @@
EXPECT_EQ(PLDM_SUCCESS, rc);
EXPECT_EQ(PLDM_SENSOR_DATA_SIZE_UINT16, decodedPdr.sensor_data_size);
- EXPECT_EQ(4096, decodedPdr.max_readable.value_u16);
- EXPECT_EQ(0, decodedPdr.min_readable.value_u16);
+ EXPECT_EQ(4096u, decodedPdr.max_readable.value_u16);
+ EXPECT_EQ(0u, decodedPdr.min_readable.value_u16);
EXPECT_EQ(PLDM_RANGE_FIELD_FORMAT_UINT16, decodedPdr.range_field_format);
- EXPECT_EQ(5000, decodedPdr.nominal_value.value_u16);
- EXPECT_EQ(6000, decodedPdr.normal_max.value_u16);
- EXPECT_EQ(4000, decodedPdr.normal_min.value_u16);
- EXPECT_EQ(7000, decodedPdr.warning_high.value_u16);
- EXPECT_EQ(3000, decodedPdr.warning_low.value_u16);
- EXPECT_EQ(8000, decodedPdr.critical_high.value_u16);
- EXPECT_EQ(2000, decodedPdr.critical_low.value_u16);
- EXPECT_EQ(9000, decodedPdr.fatal_high.value_u16);
- EXPECT_EQ(1000, decodedPdr.fatal_low.value_u16);
+ EXPECT_EQ(5000u, decodedPdr.nominal_value.value_u16);
+ EXPECT_EQ(6000u, decodedPdr.normal_max.value_u16);
+ EXPECT_EQ(4000u, decodedPdr.normal_min.value_u16);
+ EXPECT_EQ(7000u, decodedPdr.warning_high.value_u16);
+ EXPECT_EQ(3000u, decodedPdr.warning_low.value_u16);
+ EXPECT_EQ(8000u, decodedPdr.critical_high.value_u16);
+ EXPECT_EQ(2000u, decodedPdr.critical_low.value_u16);
+ EXPECT_EQ(9000u, decodedPdr.fatal_high.value_u16);
+ EXPECT_EQ(1000u, decodedPdr.fatal_low.value_u16);
}
TEST(decodeNumericSensorPdrData, Sint16Test)
@@ -4650,18 +4650,18 @@
EXPECT_EQ(PLDM_SUCCESS, rc);
EXPECT_EQ(PLDM_SENSOR_DATA_SIZE_UINT32, decodedPdr.sensor_data_size);
- EXPECT_EQ(4096, decodedPdr.max_readable.value_u32);
- EXPECT_EQ(0, decodedPdr.min_readable.value_u32);
+ EXPECT_EQ(4096u, decodedPdr.max_readable.value_u32);
+ EXPECT_EQ(0u, decodedPdr.min_readable.value_u32);
EXPECT_EQ(PLDM_RANGE_FIELD_FORMAT_UINT32, decodedPdr.range_field_format);
- EXPECT_EQ(5000000, decodedPdr.nominal_value.value_u32);
- EXPECT_EQ(6000000, decodedPdr.normal_max.value_u32);
- EXPECT_EQ(4000000, decodedPdr.normal_min.value_u32);
- EXPECT_EQ(7000000, decodedPdr.warning_high.value_u32);
- EXPECT_EQ(3000000, decodedPdr.warning_low.value_u32);
- EXPECT_EQ(8000000, decodedPdr.critical_high.value_u32);
- EXPECT_EQ(2000000, decodedPdr.critical_low.value_u32);
- EXPECT_EQ(9000000, decodedPdr.fatal_high.value_u32);
- EXPECT_EQ(1000000, decodedPdr.fatal_low.value_u32);
+ EXPECT_EQ(5000000u, decodedPdr.nominal_value.value_u32);
+ EXPECT_EQ(6000000u, decodedPdr.normal_max.value_u32);
+ EXPECT_EQ(4000000u, decodedPdr.normal_min.value_u32);
+ EXPECT_EQ(7000000u, decodedPdr.warning_high.value_u32);
+ EXPECT_EQ(3000000u, decodedPdr.warning_low.value_u32);
+ EXPECT_EQ(8000000u, decodedPdr.critical_high.value_u32);
+ EXPECT_EQ(2000000u, decodedPdr.critical_low.value_u32);
+ EXPECT_EQ(9000000u, decodedPdr.fatal_high.value_u32);
+ EXPECT_EQ(1000000u, decodedPdr.fatal_low.value_u32);
}
TEST(decodeNumericSensorPdrData, Sint32Test)
@@ -5057,44 +5057,44 @@
auto rc =
decode_numeric_effecter_pdr_data(pdr1.data(), pdr1.size(), &decodedPdr);
EXPECT_EQ(PLDM_SUCCESS, rc);
- EXPECT_EQ(1, decodedPdr.hdr.record_handle);
- EXPECT_EQ(1, decodedPdr.hdr.version);
+ EXPECT_EQ(1u, decodedPdr.hdr.record_handle);
+ EXPECT_EQ(1u, decodedPdr.hdr.version);
EXPECT_EQ(PLDM_NUMERIC_EFFECTER_PDR, decodedPdr.hdr.type);
- EXPECT_EQ(0, decodedPdr.hdr.record_change_num);
+ EXPECT_EQ(0u, decodedPdr.hdr.record_change_num);
EXPECT_EQ(PLDM_PDR_NUMERIC_EFFECTER_PDR_MIN_LENGTH, decodedPdr.hdr.length);
- EXPECT_EQ(1, decodedPdr.effecter_id);
+ EXPECT_EQ(1u, decodedPdr.effecter_id);
EXPECT_EQ(PLDM_ENTITY_POWER_SUPPLY, decodedPdr.entity_type);
- EXPECT_EQ(1, decodedPdr.entity_instance);
- EXPECT_EQ(1, decodedPdr.container_id);
- EXPECT_EQ(2, decodedPdr.effecter_semantic_id);
+ EXPECT_EQ(1u, decodedPdr.entity_instance);
+ EXPECT_EQ(1u, decodedPdr.container_id);
+ EXPECT_EQ(2u, decodedPdr.effecter_semantic_id);
EXPECT_EQ(PLDM_NO_INIT, decodedPdr.effecter_init);
EXPECT_EQ(false, decodedPdr.effecter_auxiliary_names);
EXPECT_EQ(PLDM_SENSOR_UNIT_DEGRESS_C, decodedPdr.base_unit);
EXPECT_EQ(0, decodedPdr.unit_modifier);
- EXPECT_EQ(0, decodedPdr.rate_unit);
+ EXPECT_EQ(0u, decodedPdr.rate_unit);
EXPECT_EQ(0, decodedPdr.base_oem_unit_handle);
- EXPECT_EQ(0, decodedPdr.aux_unit);
+ EXPECT_EQ(0u, decodedPdr.aux_unit);
EXPECT_EQ(0, decodedPdr.aux_unit_modifier);
- EXPECT_EQ(4, decodedPdr.aux_rate_unit);
- EXPECT_EQ(0, decodedPdr.aux_oem_unit_handle);
+ EXPECT_EQ(4u, decodedPdr.aux_rate_unit);
+ EXPECT_EQ(0u, decodedPdr.aux_oem_unit_handle);
EXPECT_EQ(true, decodedPdr.is_linear);
EXPECT_EQ(PLDM_EFFECTER_DATA_SIZE_UINT8, decodedPdr.effecter_data_size);
EXPECT_FLOAT_EQ(1.5f, decodedPdr.resolution);
EXPECT_FLOAT_EQ(1.0f, decodedPdr.offset);
- EXPECT_EQ(0, decodedPdr.accuracy);
- EXPECT_EQ(0, decodedPdr.plus_tolerance);
- EXPECT_EQ(0, decodedPdr.minus_tolerance);
+ EXPECT_EQ(0u, decodedPdr.accuracy);
+ EXPECT_EQ(0u, decodedPdr.plus_tolerance);
+ EXPECT_EQ(0u, decodedPdr.minus_tolerance);
EXPECT_FLOAT_EQ(1.0f, decodedPdr.state_transition_interval);
EXPECT_FLOAT_EQ(1.0f, decodedPdr.transition_interval);
- EXPECT_EQ(255, decodedPdr.max_settable.value_u8);
- EXPECT_EQ(0, decodedPdr.min_settable.value_u8);
+ EXPECT_EQ(255u, decodedPdr.max_settable.value_u8);
+ EXPECT_EQ(0u, decodedPdr.min_settable.value_u8);
EXPECT_EQ(PLDM_RANGE_FIELD_FORMAT_UINT8, decodedPdr.range_field_format);
- EXPECT_EQ(0x1f, decodedPdr.range_field_support.byte);
- EXPECT_EQ(50, decodedPdr.nominal_value.value_u8);
- EXPECT_EQ(60, decodedPdr.normal_max.value_u8);
- EXPECT_EQ(40, decodedPdr.normal_min.value_u8);
- EXPECT_EQ(90, decodedPdr.rated_max.value_u8);
- EXPECT_EQ(10, decodedPdr.rated_min.value_u8);
+ EXPECT_EQ(0x1fu, decodedPdr.range_field_support.byte);
+ EXPECT_EQ(50u, decodedPdr.nominal_value.value_u8);
+ EXPECT_EQ(60u, decodedPdr.normal_max.value_u8);
+ EXPECT_EQ(40u, decodedPdr.normal_min.value_u8);
+ EXPECT_EQ(90u, decodedPdr.rated_max.value_u8);
+ EXPECT_EQ(10u, decodedPdr.rated_min.value_u8);
}
#endif
@@ -5272,15 +5272,15 @@
EXPECT_EQ(PLDM_SUCCESS, rc);
EXPECT_EQ(PLDM_EFFECTER_DATA_SIZE_UINT16, decodedPdr.effecter_data_size);
- EXPECT_EQ(4096, decodedPdr.max_settable.value_u16);
- EXPECT_EQ(0, decodedPdr.min_settable.value_u16);
+ EXPECT_EQ(4096u, decodedPdr.max_settable.value_u16);
+ EXPECT_EQ(0u, decodedPdr.min_settable.value_u16);
EXPECT_EQ(PLDM_RANGE_FIELD_FORMAT_UINT16, decodedPdr.range_field_format);
- EXPECT_EQ(0x1f, decodedPdr.range_field_support.byte);
- EXPECT_EQ(5000, decodedPdr.nominal_value.value_u16);
- EXPECT_EQ(6000, decodedPdr.normal_max.value_u16);
- EXPECT_EQ(4000, decodedPdr.normal_min.value_u16);
- EXPECT_EQ(9000, decodedPdr.rated_max.value_u16);
- EXPECT_EQ(1000, decodedPdr.rated_min.value_u16);
+ EXPECT_EQ(0x1fu, decodedPdr.range_field_support.byte);
+ EXPECT_EQ(5000u, decodedPdr.nominal_value.value_u16);
+ EXPECT_EQ(6000u, decodedPdr.normal_max.value_u16);
+ EXPECT_EQ(4000u, decodedPdr.normal_min.value_u16);
+ EXPECT_EQ(9000u, decodedPdr.rated_max.value_u16);
+ EXPECT_EQ(1000u, decodedPdr.rated_min.value_u16);
}
#endif
@@ -5480,15 +5480,15 @@
EXPECT_EQ(PLDM_SUCCESS, rc);
EXPECT_EQ(PLDM_EFFECTER_DATA_SIZE_UINT32, decodedPdr.effecter_data_size);
- EXPECT_EQ(4096, decodedPdr.max_settable.value_u32);
- EXPECT_EQ(0, decodedPdr.min_settable.value_u32);
+ EXPECT_EQ(4096u, decodedPdr.max_settable.value_u32);
+ EXPECT_EQ(0u, decodedPdr.min_settable.value_u32);
EXPECT_EQ(PLDM_RANGE_FIELD_FORMAT_UINT32, decodedPdr.range_field_format);
- EXPECT_EQ(0x1f, decodedPdr.range_field_support.byte);
- EXPECT_EQ(5000000, decodedPdr.nominal_value.value_u32);
- EXPECT_EQ(6000000, decodedPdr.normal_max.value_u32);
- EXPECT_EQ(4000000, decodedPdr.normal_min.value_u32);
- EXPECT_EQ(9000000, decodedPdr.rated_max.value_u32);
- EXPECT_EQ(1000000, decodedPdr.rated_min.value_u32);
+ EXPECT_EQ(0x1fu, decodedPdr.range_field_support.byte);
+ EXPECT_EQ(5000000u, decodedPdr.nominal_value.value_u32);
+ EXPECT_EQ(6000000u, decodedPdr.normal_max.value_u32);
+ EXPECT_EQ(4000000u, decodedPdr.normal_min.value_u32);
+ EXPECT_EQ(9000000u, decodedPdr.rated_max.value_u32);
+ EXPECT_EQ(1000000u, decodedPdr.rated_min.value_u32);
}
#endif
@@ -5918,18 +5918,18 @@
decodedPdr, decodedPdrSize);
EXPECT_EQ(0, rc);
- EXPECT_EQ(1, decodedPdr->hdr.record_handle);
- EXPECT_EQ(1, decodedPdr->hdr.version);
+ EXPECT_EQ(1u, decodedPdr->hdr.record_handle);
+ EXPECT_EQ(1u, decodedPdr->hdr.version);
EXPECT_EQ(PLDM_ENTITY_AUXILIARY_NAMES_PDR, decodedPdr->hdr.type);
- EXPECT_EQ(1, decodedPdr->hdr.record_change_num);
+ EXPECT_EQ(1u, decodedPdr->hdr.record_change_num);
EXPECT_EQ(pdr1.size() - sizeof(struct pldm_pdr_hdr),
decodedPdr->hdr.length);
- EXPECT_EQ(3, decodedPdr->container.entity_type);
- EXPECT_EQ(1, decodedPdr->container.entity_instance_num);
+ EXPECT_EQ(3u, decodedPdr->container.entity_type);
+ EXPECT_EQ(1u, decodedPdr->container.entity_instance_num);
EXPECT_EQ(PLDM_PLATFORM_ENTITY_SYSTEM_CONTAINER_ID,
decodedPdr->container.entity_container_id);
- EXPECT_EQ(0, decodedPdr->shared_name_count);
- EXPECT_EQ(3, decodedPdr->name_string_count);
+ EXPECT_EQ(0u, decodedPdr->shared_name_count);
+ EXPECT_EQ(3u, decodedPdr->name_string_count);
decodedPdr->names = (struct pldm_entity_auxiliary_name*)calloc(
decodedPdr->name_string_count,
@@ -5944,12 +5944,12 @@
EXPECT_EQ(strncmp(expectTag0, decodedPdr->names[0].tag, length + 1), 0);
// NOLINTBEGIN(clang-analyzer-unix.Malloc)
- ASSERT_EQ(0,
+ ASSERT_EQ(0ul,
(uintptr_t)decodedPdr->names[0].name & (alignof(char16_t) - 1));
// NOLINTEND(clang-analyzer-unix.Malloc)
length = str16len((char16_t*)decodedPdr->names[0].name);
EXPECT_EQ(str16len((char16_t*)expectName0), length);
- EXPECT_EQ(3, str16len((char16_t*)expectName0));
+ EXPECT_EQ(3ul, str16len((char16_t*)expectName0));
EXPECT_EQ(memcmp(expectName0, decodedPdr->names[0].name,
sizeof(char16_t) * (length + 1)),
0);
@@ -5959,12 +5959,12 @@
EXPECT_EQ(strncmp(expectTag1, decodedPdr->names[1].tag, length + 1), 0);
// NOLINTBEGIN(clang-analyzer-unix.Malloc)
- ASSERT_EQ(0,
+ ASSERT_EQ(0ul,
(uintptr_t)decodedPdr->names[1].name & (alignof(char16_t) - 1));
// NOLINTEND(clang-analyzer-unix.Malloc)
length = str16len((char16_t*)decodedPdr->names[1].name);
EXPECT_EQ(str16len((char16_t*)expectName1), length);
- EXPECT_EQ(2, str16len((char16_t*)expectName1));
+ EXPECT_EQ(2ul, str16len((char16_t*)expectName1));
EXPECT_EQ(memcmp(expectName1, decodedPdr->names[1].name,
sizeof(char16_t) * (length + 1)),
0);
@@ -5974,12 +5974,12 @@
EXPECT_EQ(strncmp(expectTag2, decodedPdr->names[2].tag, length + 1), 0);
// NOLINTBEGIN(clang-analyzer-unix.Malloc)
- ASSERT_EQ(0,
+ ASSERT_EQ(0ul,
(uintptr_t)decodedPdr->names[2].name & (alignof(char16_t) - 1));
// NOLINTEND(clang-analyzer-unix.Malloc)
length = str16len((char16_t*)decodedPdr->names[2].name);
EXPECT_EQ(str16len((char16_t*)expectName2), length);
- EXPECT_EQ(3, str16len((char16_t*)expectName2));
+ EXPECT_EQ(3ul, str16len((char16_t*)expectName2));
EXPECT_EQ(memcmp(expectName2, decodedPdr->names[2].name,
sizeof(char16_t) * (length + 1)),
0);
@@ -6208,9 +6208,9 @@
EXPECT_EQ(0xff, decodedPdr.file_version.update);
EXPECT_EQ(0xff, decodedPdr.file_version.minor);
EXPECT_EQ(0xff, decodedPdr.file_version.major);
- EXPECT_EQ(10240, decodedPdr.file_maximum_size);
- EXPECT_EQ(2, decodedPdr.file_maximum_file_descriptor_count);
- EXPECT_EQ(6, decodedPdr.file_name.length);
+ EXPECT_EQ(10240u, decodedPdr.file_maximum_size);
+ EXPECT_EQ(2u, decodedPdr.file_maximum_file_descriptor_count);
+ EXPECT_EQ(6ul, decodedPdr.file_name.length);
EXPECT_EQ(memcmp(expectFileName, decodedPdr.file_name.ptr,
sizeof(char) * decodedPdr.file_name.length),
@@ -6218,7 +6218,7 @@
if (decodedPdr.oem_file_classification)
{
- EXPECT_EQ(9, decodedPdr.oem_file_classification_name.length);
+ EXPECT_EQ(9ul, decodedPdr.oem_file_classification_name.length);
EXPECT_EQ(memcmp(expectOEMClassificationName,
decodedPdr.oem_file_classification_name.ptr,
sizeof(char) *
diff --git a/tests/msgbuf.cpp b/tests/msgbuf.cpp
index 68f17ae..67064fc 100644
--- a/tests/msgbuf.cpp
+++ b/tests/msgbuf.cpp
@@ -265,7 +265,7 @@
ASSERT_EQ(pldm_msgbuf_init_errno(ctx, sizeof(buf), buf, sizeof(buf)), 0);
ASSERT_EQ(pldm_msgbuf_extract_uint32(ctx, val), 0);
- EXPECT_EQ(val, 0x5a00ffa5);
+ EXPECT_EQ(val, 0x5a00ffa5u);
EXPECT_EQ(pldm_msgbuf_complete(ctx), 0);
}
@@ -1010,8 +1010,8 @@
EXPECT_EQ(pldm_msgbuf_extract_uint16(ctxExtract, testVal1), 0);
EXPECT_EQ(0x1234, testVal1);
- ASSERT_EQ(0, (uintptr_t)retBuff & (alignof(char16_t) - 1));
- EXPECT_EQ(6, str16len((char16_t*)retBuff) + 1);
+ ASSERT_EQ(0ul, (uintptr_t)retBuff & (alignof(char16_t) - 1));
+ EXPECT_EQ(6ul, str16len((char16_t*)retBuff) + 1);
EXPECT_EQ(0, memcmp(expectData, retBuff, sizeof(expectData)));
EXPECT_EQ(pldm_msgbuf_complete(ctxExtract), 0);
}
@@ -1040,8 +1040,8 @@
EXPECT_EQ(pldm_msgbuf_span_string_utf16(ctxExtract, (void**)&retBuff, NULL),
0);
- ASSERT_EQ(0, (uintptr_t)retBuff & (alignof(char16_t) - 1));
- EXPECT_EQ(6, str16len((char16_t*)retBuff) + 1);
+ ASSERT_EQ(0ul, (uintptr_t)retBuff & (alignof(char16_t) - 1));
+ EXPECT_EQ(6ul, str16len((char16_t*)retBuff) + 1);
EXPECT_EQ(memcmp(expectData, retBuff,
sizeof(char16_t) * (str16len((char16_t*)retBuff) + 1)),
0);
@@ -1053,7 +1053,7 @@
pldm_msgbuf_span_string_utf16(ctxExtract, (void**)&retBuff1, &length),
0);
- EXPECT_EQ(0, length % 2);
+ EXPECT_EQ(0ul, length % 2);
EXPECT_EQ(memcmp(expectData1, retBuff1, length), 0);
EXPECT_EQ(pldm_msgbuf_extract_uint16(ctxExtract, testVal1), 0);
@@ -1150,8 +1150,8 @@
EXPECT_EQ(pldm_msgbuf_span_string_utf16(ctxExtract, (void**)&name, NULL),
0);
- ASSERT_EQ(0, (uintptr_t)name & (alignof(char16_t) - 1));
- EXPECT_EQ(5, str16len((char16_t*)name) + 1);
+ ASSERT_EQ(0ul, (uintptr_t)name & (alignof(char16_t) - 1));
+ EXPECT_EQ(5ul, str16len((char16_t*)name) + 1);
EXPECT_EQ(memcmp(expectName0, name,
sizeof(char16_t) * (str16len((char16_t*)name) + 1)),
0);
@@ -1161,7 +1161,7 @@
EXPECT_EQ(strncmp(expectTag1, tag1, length), 0);
EXPECT_EQ(
pldm_msgbuf_span_string_utf16(ctxExtract, (void**)&name1, &length), 0);
- EXPECT_EQ(0, length % 2);
+ EXPECT_EQ(0ul, length % 2);
EXPECT_EQ(memcmp(expectName1, name1, length), 0);
EXPECT_EQ(pldm_msgbuf_span_string_ascii(ctxExtract, (void**)&tag2, NULL),
@@ -1169,8 +1169,8 @@
EXPECT_EQ(strncmp(expectTag2, tag2, strlen(tag2) + 1), 0);
EXPECT_EQ(pldm_msgbuf_span_string_utf16(ctxExtract, (void**)&name2, NULL),
0);
- ASSERT_EQ(0, (uintptr_t)name2 & (alignof(char16_t) - 1));
- EXPECT_EQ(4, str16len((char16_t*)name2) + 1);
+ ASSERT_EQ(0ul, (uintptr_t)name2 & (alignof(char16_t) - 1));
+ EXPECT_EQ(4ul, str16len((char16_t*)name2) + 1);
EXPECT_EQ(memcmp(expectName2, name2,
sizeof(char16_t) * (str16len((char16_t*)name2) + 1)),
0);
@@ -1271,7 +1271,7 @@
EXPECT_EQ(pldm_msgbuf_span_until(ctx, 0, &start, &len), 0);
ASSERT_EQ(pldm_msgbuf_complete_consumed(ctx), 0);
EXPECT_EQ(buf, start);
- EXPECT_EQ(len, 1);
+ EXPECT_EQ(len, 1ul);
}
TEST(msgbuf, pldm_msgbuf_span_until_1_1)
@@ -1312,7 +1312,7 @@
EXPECT_EQ(pldm_msgbuf_span_until(ctx, 1, nullptr, nullptr), 0);
ASSERT_EQ(pldm_msgbuf_extract_uint8(ctx, val), 0);
ASSERT_EQ(pldm_msgbuf_complete_consumed(ctx), 0);
- EXPECT_EQ(val, 2);
+ EXPECT_EQ(val, 2u);
}
TEST(msgbuf, pldm_msgbuf_span_until_2_3)
@@ -1328,8 +1328,8 @@
ASSERT_EQ(pldm_msgbuf_extract_uint8(ctx, val0), 0);
ASSERT_EQ(pldm_msgbuf_extract_uint8(ctx, val1), 0);
ASSERT_EQ(pldm_msgbuf_complete_consumed(ctx), 0);
- EXPECT_EQ(val0, 1);
- EXPECT_EQ(val1, 2);
+ EXPECT_EQ(val0, 1u);
+ EXPECT_EQ(val1, 2u);
}
TEST(msgbuf, pldm_msgbuf_span_until_short)
@@ -1558,7 +1558,7 @@
ASSERT_EQ(pldm_msgbuf_init_errno(ctx, sizeof(buf), buf, sizeof(buf)), 0);
EXPECT_EQ(pldm_msgbuf_extract_uint8_to_size(ctx, val), 0);
- EXPECT_EQ(val, 0xa5);
+ EXPECT_EQ(val, (size_t)0xa5);
EXPECT_EQ(pldm_msgbuf_complete(ctx), 0);
}
@@ -1593,7 +1593,7 @@
ASSERT_EQ(pldm_msgbuf_init_errno(ctx, sizeof(buf), buf, sizeof(buf)), 0);
EXPECT_EQ(pldm_msgbuf_extract_uint16_to_size(ctx, val), 0);
- EXPECT_EQ(val, 0x5aa5);
+ EXPECT_EQ(val, (size_t)0x5aa5);
EXPECT_EQ(pldm_msgbuf_complete(ctx), 0);
}
@@ -1627,8 +1627,8 @@
size_t val;
ASSERT_EQ(pldm_msgbuf_init_errno(ctx, sizeof(buf), buf, sizeof(buf)), 0);
- EXPECT_EQ(pldm_msgbuf_extract_uint32_to_size(ctx, val), 0);
- EXPECT_EQ(val, 0x5a00ffa5);
+ ASSERT_EQ(pldm_msgbuf_extract_uint32_to_size(ctx, val), 0);
+ EXPECT_EQ(val, 0x5a00ffa5u);
EXPECT_EQ(pldm_msgbuf_complete(ctx), 0);
}