diff options
| author | David Matson <davidmatson@users.noreply.github.com> | 2024-03-29 03:09:35 (GMT) |
|---|---|---|
| committer | David Matson <davidmatson@users.noreply.github.com> | 2024-04-03 15:49:07 (GMT) |
| commit | f16770d63dcb69019c0547b26a4a433d2cc62bd7 (patch) | |
| tree | b810839a210770d6e0fcd437f4648e2a57ccbe3e /googletest/test | |
| parent | ec7b38672c04c8af3cfb078214edf6751b841014 (diff) | |
| download | googletest-f16770d63dcb69019c0547b26a4a433d2cc62bd7.zip googletest-f16770d63dcb69019c0547b26a4a433d2cc62bd7.tar.gz googletest-f16770d63dcb69019c0547b26a4a433d2cc62bd7.tar.bz2 | |
Add skipped messages to JSON output (fixes #4507).refs/pull/4508/head
Fix the gap between JSON and XML output.
Diffstat (limited to 'googletest/test')
| -rw-r--r-- | googletest/test/googletest-json-output-unittest.py | 18 | ||||
| -rw-r--r-- | googletest/test/gtest_json_test_utils.py | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/googletest/test/googletest-json-output-unittest.py b/googletest/test/googletest-json-output-unittest.py index cb97694..323f4b3 100644 --- a/googletest/test/googletest-json-output-unittest.py +++ b/googletest/test/googletest-json-output-unittest.py @@ -150,6 +150,12 @@ EXPECTED_NON_EMPTY = { 'time': '*', 'timestamp': '*', 'classname': 'SkippedTest', + 'skipped': [{ + 'message': ( + 'gtest_xml_output_unittest_.cc:*\n' + '\n' + ) + }], }, { 'name': 'SkippedWithMessage', @@ -160,6 +166,12 @@ EXPECTED_NON_EMPTY = { 'time': '*', 'timestamp': '*', 'classname': 'SkippedTest', + 'skipped': [{ + 'message': ( + 'gtest_xml_output_unittest_.cc:*\n' + 'It is good practice to tell why you skip a test.\n' + ) + }], }, { 'name': 'SkippedAfterFailure', @@ -179,6 +191,12 @@ EXPECTED_NON_EMPTY = { ), 'type': '', }], + 'skipped': [{ + 'message': ( + 'gtest_xml_output_unittest_.cc:*\n' + 'It is good practice to tell why you skip a test.\n' + ) + }], }, ], }, diff --git a/googletest/test/gtest_json_test_utils.py b/googletest/test/gtest_json_test_utils.py index 86a5925..694a7a6 100644 --- a/googletest/test/gtest_json_test_utils.py +++ b/googletest/test/gtest_json_test_utils.py @@ -51,6 +51,9 @@ def normalize(obj): elif key == 'failure': value = re.sub(r'^.*[/\\](.*:)\d+\n', '\\1*\n', value) return re.sub(r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', value) + elif key == 'message': + value = re.sub(r'^.*[/\\](.*:)\d+\n', '\\1*\n', value) + return re.sub(r'Stack trace:\n(.|\n)*', 'Stack trace:\n*', value) elif key == 'file': return re.sub(r'^.*[/\\](.*)', '\\1', value) else: |