Skip to content

Commit 9606e3e

Browse files
author
Cruz Monrreal
authored
Merge pull request #9087 from theamirocohen/kvstore_general_tests
kvstore tests: reduce reset
2 parents a91dccd + 4fe7834 commit 9606e3e

File tree

3 files changed

+177
-145
lines changed

3 files changed

+177
-145
lines changed

‎features/storage/TESTS/kvstore/general_tests_phase_1/main.cpp

Lines changed: 79 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ static void set_buffer_size_is_zero()
207207
int res = kvstore->set(key, data, 0, 0);
208208
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
209209

210-
res = kvstore->reset();
210+
res = kvstore->remove(key);
211211
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
212212
}
213213

@@ -225,7 +225,7 @@ static void set_same_key_several_time()
225225
res = kvstore->set(key, data, data_size, 0);
226226
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
227227

228-
res = kvstore->reset();
228+
res = kvstore->remove(key);
229229
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
230230
}
231231

@@ -239,7 +239,7 @@ static void test_thread_set(char *th_key)
239239
static void set_several_keys_multithreaded()
240240
{
241241
TEST_SKIP_UNLESS(kvstore != NULL);
242-
242+
int i = 0, res = 0;
243243
rtos::Thread kvstore_thread[num_of_threads];
244244
osStatus threadStatus;
245245

@@ -248,23 +248,25 @@ static void set_several_keys_multithreaded()
248248
kvstore_thread[2].start(callback(test_thread_set, (char *)keys[2]));
249249

250250

251-
for (int i = 0; i < num_of_threads; i++) {
251+
for (i = 0; i < num_of_threads; i++) {
252252
threadStatus = kvstore_thread[i].join();
253253
if (threadStatus != 0) {
254254
utest_printf("\nthread %d join failed!", i + 1);
255255
}
256256
}
257257

258-
for (int i = 0; i < num_of_threads; i++) {
259-
int res = kvstore->get(keys[i], buffer, buffer_size, &actual_size, 0);
258+
for (i = 0; i < num_of_threads; i++) {
259+
res = kvstore->get(keys[i], buffer, buffer_size, &actual_size, 0);
260260
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
261261

262262
TEST_ASSERT_EQUAL_STRING_LEN(buffer, data, data_size);
263263

264264
}
265265

266-
int res = kvstore->reset();
267-
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
266+
for (i = 0; i < num_of_threads; i++) {
267+
res = kvstore->remove(keys[i]);
268+
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
269+
}
268270
}
269271

270272
//set key "write once" and try to set it again
@@ -313,7 +315,7 @@ static void set_key_value_one_byte_size()
313315
TEST_ASSERT_EQUAL_ERROR_CODE(0, res);
314316
memset(buffer, 0, buffer_size);
315317

316-
res = kvstore->reset();
318+
res = kvstore->remove(key);
317319
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
318320
}
319321

@@ -330,7 +332,7 @@ static void set_key_value_two_byte_size()
330332
TEST_ASSERT_EQUAL_STRING_LEN(buffer, data_two, 1);
331333
memset(buffer, 0, buffer_size);
332334

333-
res = kvstore->reset();
335+
res = kvstore->remove(key);
334336
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
335337
}
336338

@@ -347,7 +349,7 @@ static void set_key_value_five_byte_size()
347349
TEST_ASSERT_EQUAL_STRING_LEN(buffer, data_five, 4);
348350
memset(buffer, 0, buffer_size);
349351

350-
res = kvstore->reset();
352+
res = kvstore->remove(key);
351353
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
352354
}
353355

@@ -364,7 +366,7 @@ static void set_key_value_fifteen_byte_size()
364366
TEST_ASSERT_EQUAL_STRING_LEN(buffer, data_fif, 14);
365367
memset(buffer, 0, buffer_size);
366368

367-
res = kvstore->reset();
369+
res = kvstore->remove(key);
368370
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
369371
}
370372

@@ -381,36 +383,78 @@ static void set_key_value_seventeen_byte_size()
381383
TEST_ASSERT_EQUAL_STRING_LEN(buffer, data_fif, 16);
382384
memset(buffer, 0, buffer_size);
383385

384-
res = kvstore->reset();
386+
res = kvstore->remove(key);
385387
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
386388
}
387389

388-
//set several different key value byte size
390+
//set several different keys and retrieve them
389391
static void set_several_key_value_sizes()
390392
{
391393
TEST_SKIP_UNLESS(kvstore != NULL);
392394

393395
char name[7] = "name_";
394-
char c[2] = {0};
396+
char c = 0;
395397
int i = 0, res = 0;
396398

397-
for (i = 0; i < 30; i++) {
398-
c[0] = i + '0';
399-
name[6] = c[0];
399+
name[6] = 0;
400+
401+
for (i = 0; i < 26; i++) {
402+
c = i + 'a';
403+
name[5] = c;
400404
res = kvstore->set(name, name, sizeof(name), 0);
401405
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
402406
}
403407

404-
for (i = 0; i < 30; i++) {
405-
c[0] = i + '0';
406-
name[6] = c[0];
408+
for (i = 0; i < 26; i++) {
409+
c = i + 'a';
410+
name[5] = c;
407411
res = kvstore->get(name, buffer, sizeof(buffer), &actual_size, 0);
408412
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
409413
TEST_ASSERT_EQUAL_STRING_LEN(name, buffer, sizeof(name));
410414
memset(buffer, 0, sizeof(buffer));
415+
416+
res = kvstore->remove(name);
417+
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
411418
}
419+
}
412420

413-
res = kvstore->reset();
421+
//try to set several different unvalid key names
422+
static void set_several_unvalid_key_names()
423+
{
424+
TEST_SKIP_UNLESS(kvstore != NULL);
425+
426+
char name[7] = "name_";
427+
char unvalid[] = {'*', '?', ':', ';', '"', '|', ' ', '<', '>', '\\', '/'};
428+
int i = 0, res = 0;
429+
430+
name[6] = 0;
431+
432+
for (i = 0; i < 11; i++) {
433+
name[5] = unvalid[i];
434+
res = kvstore->set(name, name, sizeof(name), 0);
435+
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_ERROR_INVALID_ARGUMENT, res);
436+
}
437+
}
438+
439+
//set key initialize kvstore and retrieve it
440+
static void set_key_init_deinit()
441+
{
442+
TEST_SKIP_UNLESS(kvstore != NULL);
443+
444+
int res = kvstore->set(key, data, data_size, 0);
445+
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
446+
447+
res = kvstore->deinit();
448+
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
449+
450+
res = kvstore->init();
451+
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
452+
453+
res = kvstore->get(key, buffer, buffer_size, &actual_size, 0);
454+
TEST_ASSERT_EQUAL_STRING(buffer, data);
455+
memset(buffer, 0, buffer_size);
456+
457+
res = kvstore->remove(key);
414458
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
415459
}
416460

@@ -453,29 +497,13 @@ static void Sec_set_key_encrypt()
453497
res = kvstore->get(key, buffer, sizeof(buffer), &actual_size, 0);
454498
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
455499
TEST_ASSERT_EQUAL_STRING_LEN(data, buffer, sizeof(data));
456-
memset(buffer, 0, sizeof(buffer));
457500

458-
res = kvstore->reset();
501+
res = kvstore->get_info(key, &info);
459502
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
460-
}
461-
462-
//set key with AUTH flag and retrieve it
463-
static void Sec_set_key_auth()
464-
{
465-
TEST_SKIP_UNLESS(kvstore != NULL);
466-
if (kv_setup != SecStoreSet) {
467-
return;
468-
}
469-
470-
int res = kvstore->set(key, data, data_size, 0);
471-
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
472-
473-
res = kvstore->get(key, buffer, sizeof(buffer), &actual_size, 0);
474-
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
475-
TEST_ASSERT_EQUAL_STRING_LEN(data, buffer, sizeof(data));
503+
TEST_ASSERT_EQUAL_ERROR_CODE(KVStore::REQUIRE_CONFIDENTIALITY_FLAG, info.flags);
476504
memset(buffer, 0, sizeof(buffer));
477505

478-
res = kvstore->reset();
506+
res = kvstore->remove(key);
479507
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
480508
}
481509

@@ -537,7 +565,7 @@ static void get_buffer_size_smaller_than_data_real_size()
537565
TEST_ASSERT_EQUAL_STRING_LEN(buffer, big_data, &actual_size);
538566
memset(buffer, 0, buffer_size);
539567

540-
res = kvstore->reset();
568+
res = kvstore->remove(key);
541569
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
542570
}
543571

@@ -555,7 +583,7 @@ static void get_buffer_size_bigger_than_data_real_size()
555583
TEST_ASSERT_EQUAL_STRING_LEN(big_buffer, data, &actual_size);
556584
memset(buffer, 0, buffer_size);
557585

558-
res = kvstore->reset();
586+
res = kvstore->remove(key);
559587
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
560588
}
561589

@@ -570,7 +598,7 @@ static void get_offset_bigger_than_data_size()
570598
res = kvstore->get(key, buffer, buffer_size, &actual_size, data_size + 1);
571599
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_ERROR_INVALID_SIZE, res);
572600

573-
res = kvstore->reset();
601+
res = kvstore->remove(key);
574602
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
575603
}
576604

@@ -596,9 +624,6 @@ static void get_removed_key()
596624

597625
res = kvstore->get(key, buffer, buffer_size, &actual_size, 0);
598626
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_ERROR_ITEM_NOT_FOUND, res);
599-
600-
res = kvstore->reset();
601-
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
602627
}
603628

604629
//set the same key twice and get latest data
@@ -618,7 +643,7 @@ static void get_key_that_was_set_twice()
618643
TEST_ASSERT_EQUAL_STRING_LEN(buffer, new_data, &actual_size);
619644
memset(buffer, 0, buffer_size);
620645

621-
res = kvstore->reset();
646+
res = kvstore->remove(key);
622647
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
623648
}
624649

@@ -652,8 +677,10 @@ static void get_several_keys_multithreaded()
652677
}
653678
}
654679

655-
int res = kvstore->reset();
656-
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
680+
for (int i = 0; i < num_of_threads; i++) {
681+
int res = kvstore->remove(keys[i]);
682+
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
683+
}
657684
}
658685

659686

@@ -702,9 +729,6 @@ static void remove_removed_key()
702729

703730
res = kvstore->remove(key);
704731
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_ERROR_ITEM_NOT_FOUND, res);
705-
706-
res = kvstore->reset();
707-
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
708732
}
709733

710734
//key exist - valid flow
@@ -717,9 +741,6 @@ static void remove_existed_key()
717741

718742
res = kvstore->remove(key);
719743
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
720-
721-
res = kvstore->reset();
722-
TEST_ASSERT_EQUAL_ERROR_CODE(MBED_SUCCESS, res);
723744
}
724745

725746
/*----------------setup------------------*/
@@ -755,10 +776,11 @@ template_case_t template_cases[] = {
755776
{"set_key_value_fifteen_byte_size", set_key_value_fifteen_byte_size, greentea_failure_handler},
756777
{"set_key_value_seventeen_byte_size", set_key_value_seventeen_byte_size, greentea_failure_handler},
757778
{"set_several_key_value_sizes", set_several_key_value_sizes, greentea_failure_handler},
779+
{"set_several_unvalid_key_names", set_several_unvalid_key_names, greentea_failure_handler},
780+
{"set_key_init_deinit", set_key_init_deinit, greentea_failure_handler},
758781

759782
{"Sec_set_key_rollback_set_again_no_rollback", Sec_set_key_rollback_set_again_no_rollback, greentea_failure_handler},
760783
{"Sec_set_key_encrypt", Sec_set_key_encrypt, greentea_failure_handler},
761-
{"Sec_set_key_auth", Sec_set_key_auth, greentea_failure_handler},
762784

763785
{"get_key_null", get_key_null, greentea_failure_handler},
764786
{"get_key_length_exceeds_max", get_key_length_exceeds_max, greentea_failure_handler},

0 commit comments

Comments
 (0)