espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 20:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

nvs: fix string/blob comparison lengths in host tests

Browse Source
This commit is contained in:
Ivan Grokhotkov
2023-04-18 08:02:38 +02:00
parent 630343e4b9
commit f64ac33554
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/nvs_flash/test_nvs_host/test_nvs.cpp
View File

@@ -905,9 +905,9 @@ static void check_nvs_part_gen_args(SpiFlashEmulator *spi_flash_emulator,
CHECK(memeq(buf, buflen, hexfiledata, sizeof(hexfiledata))); CHECK(memeq(buf, buflen, hexfiledata, sizeof(hexfiledata)));
buflen = 64; buflen = 64;
uint8_t strfiledata[64] = "abcdefghijklmnopqrstuvwxyz\0"; const char strfiledata[64] = "abcdefghijklmnopqrstuvwxyz";
TEST_ESP_OK( nvs_get_str(handle, "stringFileKey", buf, &buflen)); TEST_ESP_OK( nvs_get_str(handle, "stringFileKey", buf, &buflen));
CHECK(memeq(buf, buflen, strfiledata, sizeof(strfiledata))); CHECK(strcmp(buf, strfiledata) == 0);
char bin_data[5200]; char bin_data[5200];
size_t bin_len = sizeof(bin_data); size_t bin_len = sizeof(bin_data);
@@ -915,8 +915,9 @@ static void check_nvs_part_gen_args(SpiFlashEmulator *spi_flash_emulator,
ifstream file; ifstream file;
file.open(filename); file.open(filename);
file.read(binfiledata,5200); file.read(binfiledata,5200);
size_t binfile_len = file.gcount();
TEST_ESP_OK( nvs_get_blob(handle, "binFileKey", bin_data, &bin_len)); TEST_ESP_OK( nvs_get_blob(handle, "binFileKey", bin_data, &bin_len));
CHECK(memeq(bin_data, bin_len, binfiledata, sizeof(binfiledata))); CHECK(memeq(bin_data, bin_len, binfiledata, binfile_len));
file.close(); file.close();
@@ -990,9 +991,9 @@ static void check_nvs_part_gen_args_mfg(SpiFlashEmulator *spi_flash_emulator,
CHECK(memeq(buf, buflen, hexfiledata, sizeof(hexfiledata))); CHECK(memeq(buf, buflen, hexfiledata, sizeof(hexfiledata)));
buflen = 64; buflen = 64;
uint8_t strfiledata[64] = "abcdefghijklmnopqrstuvwxyz\0"; const char strfiledata[64] = "abcdefghijklmnopqrstuvwxyz";
TEST_ESP_OK( nvs_get_str(handle, "stringFileKey", buf, &buflen)); TEST_ESP_OK( nvs_get_str(handle, "stringFileKey", buf, &buflen));
CHECK(memeq(buf, buflen, strfiledata, sizeof(strfiledata))); CHECK(strcmp(buf, strfiledata) == 0);
char bin_data[5200]; char bin_data[5200];
size_t bin_len = sizeof(bin_data); size_t bin_len = sizeof(bin_data);
@@ -1000,8 +1001,9 @@ static void check_nvs_part_gen_args_mfg(SpiFlashEmulator *spi_flash_emulator,
ifstream file; ifstream file;
file.open(filename); file.open(filename);
file.read(binfiledata,5200); file.read(binfiledata,5200);
size_t binfile_len = file.gcount();
TEST_ESP_OK( nvs_get_blob(handle, "binFileKey", bin_data, &bin_len)); TEST_ESP_OK( nvs_get_blob(handle, "binFileKey", bin_data, &bin_len));
CHECK(memeq(bin_data, bin_len, binfiledata, sizeof(binfiledata))); CHECK(memeq(bin_data, bin_len, binfiledata, binfile_len));
file.close(); file.close();