Skip to content

Commit 541455d

Browse files
bogdanmbogdanm
committed
TEST_ASSERT_EQUAL_STRING always tests against the base version
1 parent c6cac23 commit 541455d

File tree

1 file changed

+18
-18
lines changed
  • features/minimal-printf/TESTS/minimal-printf/compliance

1 file changed

+18
-18
lines changed

‎features/minimal-printf/TESTS/minimal-printf/compliance/main.cpp

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,12 @@ static control_t test_snprintf_u(const size_t call_count)
475475
#else
476476
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "ju: %ju\r\n", 0);
477477
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "ju: %ju\r\n", (uintmax_t) 0);
478-
TEST_ASSERT_EQUAL_STRING("ju: 0\r\n", buffer_minimal);
478+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
479479
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
480480

481481
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "ju: %ju\r\n", UINTMAX_MAX);
482482
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "ju: %ju\r\n", UINTMAX_MAX);
483-
TEST_ASSERT_EQUAL_STRING("ju: 0\r\n", buffer_minimal);
483+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
484484
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
485485
#endif
486486

@@ -489,12 +489,12 @@ static control_t test_snprintf_u(const size_t call_count)
489489
#else
490490
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "zu: %zu\r\n", 0);
491491
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "zu: %zu\r\n", 0);
492-
TEST_ASSERT_EQUAL_STRING("zu: 0\r\n", buffer_minimal);
492+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
493493
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
494494

495495
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "zu: %zu\r\n", SIZE_MAX);
496496
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "zu: %zu\r\n", SIZE_MAX);
497-
TEST_ASSERT_EQUAL_STRING("zu: 4294967295\r\n", buffer_minimal);
497+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
498498
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
499499
#endif
500500

@@ -503,12 +503,12 @@ static control_t test_snprintf_u(const size_t call_count)
503503
#else
504504
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "tu: %tu\r\n", 0);
505505
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "tu: %tu\r\n", 0);
506-
TEST_ASSERT_EQUAL_STRING("tu: 0\r\n", buffer_minimal);
506+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
507507
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
508508

509509
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "tu: %tu\r\n", UINTPTR_MAX);
510510
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "tu: %tu\r\n", UINTPTR_MAX);
511-
TEST_ASSERT_EQUAL_STRING("tu: 18446744073709551615\r\n", buffer_minimal);
511+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
512512
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
513513
#endif
514514

@@ -526,7 +526,7 @@ static control_t test_snprintf_x(const size_t call_count)
526526
/*************************************************************************/
527527
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "hhX: %hhX\r\n", 0);
528528
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "hhX: %hhX\r\n", 0);
529-
TEST_ASSERT_EQUAL_STRING("hhX: 0\r\n", buffer_minimal);
529+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
530530
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
531531

532532
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "hhX: %hhX\r\n", UCHAR_MAX);
@@ -536,7 +536,7 @@ static control_t test_snprintf_x(const size_t call_count)
536536

537537
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "hX: %hX\r\n", 0);
538538
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "hX: %hX\r\n", 0);
539-
TEST_ASSERT_EQUAL_STRING("hX: 0\r\n", buffer_minimal);
539+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
540540
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
541541

542542
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "hX: %hX\r\n", USHRT_MAX);
@@ -545,7 +545,7 @@ static control_t test_snprintf_x(const size_t call_count)
545545

546546
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "X: %X\r\n", 0);
547547
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "X: %X\r\n", 0);
548-
TEST_ASSERT_EQUAL_STRING("X: 0\r\n", buffer_minimal);
548+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
549549
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
550550

551551
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "X: %X\r\n", UINT_MAX);
@@ -555,7 +555,7 @@ static control_t test_snprintf_x(const size_t call_count)
555555

556556
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "lX: %lX\r\n", 0);
557557
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "lX: %lX\r\n", 0UL);
558-
TEST_ASSERT_EQUAL_STRING("lX: 0\r\n", buffer_minimal);
558+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
559559
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
560560

561561
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "lX: %lX\r\n", ULONG_MAX);
@@ -565,7 +565,7 @@ static control_t test_snprintf_x(const size_t call_count)
565565

566566
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "llX: %llX\r\n", 0);
567567
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "llX: %llX\r\n", 0ULL);
568-
TEST_ASSERT_EQUAL_STRING("llX: 0\r\n", buffer_minimal);
568+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
569569
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
570570

571571
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "llX: %llX\r\n", ULLONG_MAX);
@@ -578,12 +578,12 @@ static control_t test_snprintf_x(const size_t call_count)
578578
#else
579579
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "jX: %jX\r\n", 0);
580580
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "jX: %jX\r\n", (uintmax_t) 0);
581-
TEST_ASSERT_EQUAL_STRING("jX: 0\r\n", buffer_minimal);
581+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
582582
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
583583

584584
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "jX: %jX\r\n", UINTMAX_MAX);
585585
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "jX: %jX\r\n", UINTMAX_MAX);
586-
TEST_ASSERT_EQUAL_STRING("jX: 0\r\n", buffer_minimal);
586+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
587587
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
588588
#endif
589589

@@ -592,12 +592,12 @@ static control_t test_snprintf_x(const size_t call_count)
592592
#else
593593
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "zX: %zX\r\n", 0);
594594
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "zX: %zX\r\n", 0);
595-
TEST_ASSERT_EQUAL_STRING("zX: 0\r\n", buffer_minimal);
595+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
596596
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
597597

598598
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "zX: %zX\r\n", SIZE_MAX);
599599
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "zX: %zX\r\n", SIZE_MAX);
600-
TEST_ASSERT_EQUAL_STRING("zX: FFFFFFFF\r\n", buffer_minimal);
600+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
601601
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
602602
#endif
603603

@@ -606,12 +606,12 @@ static control_t test_snprintf_x(const size_t call_count)
606606
#else
607607
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "tX: %tX\r\n", 0);
608608
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "tX: %tX\r\n", 0);
609-
TEST_ASSERT_EQUAL_STRING("tX: 0\r\n", buffer_minimal);
609+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
610610
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
611611

612612
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "tX: %tX\r\n", UINTPTR_MAX);
613613
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "tX: %tX\r\n", UINTPTR_MAX);
614-
TEST_ASSERT_EQUAL_STRING("tX: FFFFFFFFFFFFFFFF\r\n", buffer_minimal);
614+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
615615
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
616616
#endif
617617

@@ -663,7 +663,7 @@ static control_t test_snprintf_f(const size_t call_count)
663663

664664
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "f: %f\r\n", 0);
665665
result_baseline = snprintf(buffer_baseline, sizeof(buffer_baseline), "f: %f\r\n", 0);
666-
TEST_ASSERT_EQUAL_STRING("f: 0.0\r\n", buffer_minimal);
666+
TEST_ASSERT_EQUAL_STRING(buffer_baseline, buffer_minimal);
667667
TEST_ASSERT_EQUAL_INT(result_baseline, result_minimal);
668668

669669
result_minimal = mbed_snprintf(buffer_minimal, sizeof(buffer_minimal), "f: %f\r\n", pi);

0 commit comments

Comments
 (0)