commit 192907f11d0b5b07e51d648a62ccde44304c3a96
author Wyatt Hepler <hepler@google.com> Wed Jan 25 00:47:30 2023 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jan 25 00:47:30 2023 +0000
tree 84b6c830d820416fe9533e66f03ad7b902956345
parent 9eb406a3c3d0ac8aa21c7c2b38f3fa37f91cb46e

pw_unit_test: Switch "SKIPPED" to "DISABLED" to match GoogleTest

Disabled tests are labeled as DISABLED in GoogleTest. Update
pw_unit_test, which previously used SKIPPED, to match GoogleTest.

Change-Id: I4a4232576e57a4121c66a52cd7636989149db73f
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/126687
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>
Reviewed-by: Erik Gilling <konkers@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>

pw_unit_test/googletest_style_event_handler.cc

diff --git a/pw_unit_test/googletest_style_event_handler.cc b/pw_unit_test/googletest_style_event_handler.cc
index edc1aa1..de8bd09 100644
--- a/pw_unit_test/googletest_style_event_handler.cc
+++ b/pw_unit_test/googletest_style_event_handler.cc
@@ -29,7 +29,7 @@
   WriteLine(PW_UNIT_TEST_GOOGLETEST_PASSED_SUMMARY,
             run_tests_summary.passed_tests);
   if (run_tests_summary.skipped_tests) {
-    WriteLine(PW_UNIT_TEST_GOOGLETEST_SKIPPED_SUMMARY,
+    WriteLine(PW_UNIT_TEST_GOOGLETEST_DISABLED_SUMMARY,
               run_tests_summary.skipped_tests);
   }
   if (run_tests_summary.failed_tests) {
@@ -59,7 +59,7 @@
                 test_case.test_name);
       break;
     case TestResult::kSkipped:
-      WriteLine(PW_UNIT_TEST_GOOGLETEST_CASE_SKIPPED,
+      WriteLine(PW_UNIT_TEST_GOOGLETEST_CASE_DISABLED,
                 test_case.suite_name,
                 test_case.test_name);
       break;

pw_unit_test/logging_event_handler.cc

diff --git a/pw_unit_test/logging_event_handler.cc b/pw_unit_test/logging_event_handler.cc
index 80d00f8..e18fdf5 100644
--- a/pw_unit_test/logging_event_handler.cc
+++ b/pw_unit_test/logging_event_handler.cc
@@ -31,7 +31,7 @@
   PW_LOG_INFO(PW_UNIT_TEST_GOOGLETEST_PASSED_SUMMARY,
               run_tests_summary.passed_tests);
   if (run_tests_summary.skipped_tests) {
-    PW_LOG_WARN(PW_UNIT_TEST_GOOGLETEST_SKIPPED_SUMMARY,
+    PW_LOG_WARN(PW_UNIT_TEST_GOOGLETEST_DISABLED_SUMMARY,
                 run_tests_summary.skipped_tests);
   }
   if (run_tests_summary.failed_tests) {
@@ -61,7 +61,7 @@
                    test_case.test_name);
       break;
     case TestResult::kSkipped:
-      PW_LOG_WARN(PW_UNIT_TEST_GOOGLETEST_CASE_SKIPPED,
+      PW_LOG_WARN(PW_UNIT_TEST_GOOGLETEST_CASE_DISABLED,
                   test_case.suite_name,
                   test_case.test_name);
       break;

pw_unit_test/public/pw_unit_test/googletest_style_event_handler.h

diff --git a/pw_unit_test/public/pw_unit_test/googletest_style_event_handler.h b/pw_unit_test/public/pw_unit_test/googletest_style_event_handler.h
index f9a8db9..8711d96 100644
--- a/pw_unit_test/public/pw_unit_test/googletest_style_event_handler.h
+++ b/pw_unit_test/public/pw_unit_test/googletest_style_event_handler.h
@@ -25,13 +25,13 @@
   "[==========] Done running all tests."
 
 #define PW_UNIT_TEST_GOOGLETEST_PASSED_SUMMARY "[  PASSED  ] %d test(s)."
-#define PW_UNIT_TEST_GOOGLETEST_SKIPPED_SUMMARY "[  SKIPPED ] %d test(s)."
+#define PW_UNIT_TEST_GOOGLETEST_DISABLED_SUMMARY "[ DISABLED ] %d test(s)."
 #define PW_UNIT_TEST_GOOGLETEST_FAILED_SUMMARY "[  FAILED  ] %d test(s)."
 
 #define PW_UNIT_TEST_GOOGLETEST_CASE_START "[ RUN      ] %s.%s"
 #define PW_UNIT_TEST_GOOGLETEST_CASE_OK "[       OK ] %s.%s"
 #define PW_UNIT_TEST_GOOGLETEST_CASE_FAILED "[  FAILED  ] %s.%s"
-#define PW_UNIT_TEST_GOOGLETEST_CASE_SKIPPED "[  SKIPPED ] %s.%s"
+#define PW_UNIT_TEST_GOOGLETEST_CASE_DISABLED "[ DISABLED ] %s.%s"
 
 namespace pw {
 namespace unit_test {