fix #100

fdefelici · Apr 21, 2024 · 7f0dacc · 7f0dacc
1 parent a2cc3de
commit 7f0dacc
Show file tree

Hide file tree

Showing 2 changed files with 85 additions and 30 deletions.
diff --git a/clove-unit.h b/clove-unit.h
@@ -2662,7 +2662,7 @@ void __clove_report_pretty_start(__clove_report_t* _this, __clove_vector_t* suit
  size_t longest_suite_and_test_name = 0; 
  __CLOVE_VECTOR_FOREACH(suites, __clove_suite_t, each_suite, {
  size_t suite_length = __clove_string_length(each_suite->name);
- __CLOVE_VECTOR_FOREACH(suites, __clove_test_t, each_test, { 
+ __CLOVE_VECTOR_FOREACH(&each_suite->tests, __clove_test_t, each_test, { 
  size_t test_length = __clove_string_length(each_test->name);
 
  if (longest_suite_and_test_name < suite_length + test_length) {

diff --git a/tests/functs/src/unit/report_pretty_full_test.c b/tests/functs/src/unit/report_pretty_full_test.c
@@ -67,35 +67,6 @@ CLOVE_TEST(ReportOneSuiteWithOnePassedTest) {
  CLOVE_STRING_EQ(expected, actual);
 }
 
-CLOVE_TEST(ReportWithTestNameLongerThanSuiteName) {
- __clove_suite_t suite = create_suite("bl_blitters");
- __clove_test_t test11 = create_test("bl_blitters_select_color__blit_color");
- //bl_blitters.bl_blitters_select_color__blit_color_blend
-
- suite_add_test(&suite, &test11);
- __CLOVE_VECTOR_ADD(&suites, __clove_suite_t, suite);
-
- __clove_report_t* base = (__clove_report_t*)report;
- base->start(base, &suites, 1);
- base->begin_suite(base, &suite, 0);
- base->end_test(base, &suite, &test11, 1);
- base->end_suite(base, &suite, 0);
- base->end(base, 1, 0, 0);
-
- const char* expected = 
- "[INFO] Executing Test Runner with detail level: 'Full'\n"
- "[INFO] Suites / Tests found: 1 / 1\n"
- "[INFO] 1) bl_blitters.bl_blitters_select_color__blit_color..[PASS] (0.000 ms)\n"
- "[INFO] Total: 1, Passed: 1, Failed: 0, Skipped: 0\n"
- "[INFO] Run duration: 0 ms\n"
- "[INFO] Run result: SUCCESS :-)\n"
- ;
-
- char* actual = __clove_stream_memory_as_string(stream);
-
- CLOVE_STRING_EQ(expected, actual);
-}
-
 CLOVE_TEST(ReportOneSuiteWithTwoTests) {
  __clove_suite_t suite = create_suite("Suite1");
  __clove_test_t test11 = create_test("Test11");
@@ -232,3 +203,87 @@ CLOVE_TEST(ReportTwoSuitesWithTenTests) {
 
  CLOVE_STRING_EQ(expected, actual);
 }
+
+CLOVE_TEST(ReportWithTestIdentifierLength45) {
+ __clove_suite_t suite = create_suite("Suite12345");
+ __clove_test_t test11 = create_test("Suite12345_Test1234567890__1234567");
+
+ suite_add_test(&suite, &test11);
+ __CLOVE_VECTOR_ADD(&suites, __clove_suite_t, suite);
+
+ __clove_report_t* base = (__clove_report_t*)report;
+ base->start(base, &suites, 1);
+ base->begin_suite(base, &suite, 0);
+ base->end_test(base, &suite, &test11, 1);
+ base->end_suite(base, &suite, 0);
+ base->end(base, 1, 0, 0);
+
+ const char* expected = 
+ "[INFO] Executing Test Runner with detail level: 'Full'\n"
+ "[INFO] Suites / Tests found: 1 / 1\n"
+ "[INFO] 1) Suite12345.Suite12345_Test1234567890__1234567.....[PASS] (0.000 ms)\n"
+ "[INFO] Total: 1, Passed: 1, Failed: 0, Skipped: 0\n"
+ "[INFO] Run duration: 0 ms\n"
+ "[INFO] Run result: SUCCESS :-)\n"
+ ;
+
+ char* actual = __clove_stream_memory_as_string(stream);
+
+ CLOVE_STRING_EQ(expected, actual);
+}
+
+CLOVE_TEST(ReportWithTestIdentifierLength48) {
+ __clove_suite_t suite = create_suite("Suite12345");
+ __clove_test_t test11 = create_test("Suite12345_Test1234567890__1234567890");
+
+ suite_add_test(&suite, &test11);
+ __CLOVE_VECTOR_ADD(&suites, __clove_suite_t, suite);
+
+ __clove_report_t* base = (__clove_report_t*)report;
+ base->start(base, &suites, 1);
+ base->begin_suite(base, &suite, 0);
+ base->end_test(base, &suite, &test11, 1);
+ base->end_suite(base, &suite, 0);
+ base->end(base, 1, 0, 0);
+
+ const char* expected = 
+ "[INFO] Executing Test Runner with detail level: 'Full'\n"
+ "[INFO] Suites / Tests found: 1 / 1\n"
+ "[INFO] 1) Suite12345.Suite12345_Test1234567890__1234567890...[PASS] (0.000 ms)\n"
+ "[INFO] Total: 1, Passed: 1, Failed: 0, Skipped: 0\n"
+ "[INFO] Run duration: 0 ms\n"
+ "[INFO] Run result: SUCCESS :-)\n"
+ ;
+
+ char* actual = __clove_stream_memory_as_string(stream);
+
+ CLOVE_STRING_EQ(expected, actual);
+}
+
+CLOVE_TEST(ReportWithTestIdentifierLength50) {
+ __clove_suite_t suite = create_suite("Suite12345");
+ __clove_test_t test11 = create_test("Suite12345_Test1234567890__123456789012");
+
+ suite_add_test(&suite, &test11);
+ __CLOVE_VECTOR_ADD(&suites, __clove_suite_t, suite);
+
+ __clove_report_t* base = (__clove_report_t*)report;
+ base->start(base, &suites, 1);
+ base->begin_suite(base, &suite, 0);
+ base->end_test(base, &suite, &test11, 1);
+ base->end_suite(base, &suite, 0);
+ base->end(base, 1, 0, 0);
+
+ const char* expected = 
+ "[INFO] Executing Test Runner with detail level: 'Full'\n"
+ "[INFO] Suites / Tests found: 1 / 1\n"
+ "[INFO] 1) Suite12345.Suite12345_Test1234567890__123456789012...[PASS] (0.000 ms)\n"
+ "[INFO] Total: 1, Passed: 1, Failed: 0, Skipped: 0\n"
+ "[INFO] Run duration: 0 ms\n"
+ "[INFO] Run result: SUCCESS :-)\n"
+ ;
+
+ char* actual = __clove_stream_memory_as_string(stream);
+
+ CLOVE_STRING_EQ(expected, actual);
+}