From d100f021e89a56117252d67c79e24ac5364a862b Mon Sep 17 00:00:00 2001 From: Dave Shepherd Date: Fri, 14 Dec 2018 09:41:32 +0000 Subject: [PATCH 1/2] Improve output when string not equal for long strings --- shunit2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/shunit2 b/shunit2 index fd83d51..392fe88 100755 --- a/shunit2 +++ b/shunit2 @@ -630,7 +630,12 @@ failNotEquals() { shunit_actual_=$2 shunit_message_=${shunit_message_%% } - _shunit_assertFail "${shunit_message_:+${shunit_message_} }expected:<${shunit_expected_}> but was:<${shunit_actual_}>" + if command [ $(echo "${shunit_expected_}" | wc -l) -gt 10 ] || command [ $(echo "${shunit_actual_}" | wc -l) -gt 10 ]; then + diff_output_=$(diff <(echo "${shunit_expected_}") <(echo "${shunit_actual_}")) + _shunit_assertFail "${shunit_message_:+${shunit_message_} }diff:<${diff_output_}>" + else + _shunit_assertFail "${shunit_message_:+${shunit_message_} }expected:<${shunit_expected_}> but was:<${shunit_actual_}>" + fi unset shunit_message_ shunit_expected_ shunit_actual_ return ${SHUNIT_FALSE} From 783fefa6b7aa9734ece33cf016f09985e76d1696 Mon Sep 17 00:00:00 2001 From: Dave Shepherd Date: Thu, 21 Feb 2019 08:17:42 +0000 Subject: [PATCH 2/2] Fix style issues around improved diff output --- shunit2 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/shunit2 b/shunit2 index 392fe88..94e157c 100755 --- a/shunit2 +++ b/shunit2 @@ -630,14 +630,16 @@ failNotEquals() { shunit_actual_=$2 shunit_message_=${shunit_message_%% } - if command [ $(echo "${shunit_expected_}" | wc -l) -gt 10 ] || command [ $(echo "${shunit_actual_}" | wc -l) -gt 10 ]; then - diff_output_=$(diff <(echo "${shunit_expected_}") <(echo "${shunit_actual_}")) - _shunit_assertFail "${shunit_message_:+${shunit_message_} }diff:<${diff_output_}>" + if command [ "$(echo "${shunit_expected_}" | wc -l)" -gt 10 ] \ + || command [ "$(echo "${shunit_actual_}" | wc -l)" -gt 10 ]; + then + shunit_diff_=$(diff <(echo "${shunit_expected_}") <(echo "${shunit_actual_}")) + _shunit_assertFail "${shunit_message_:+${shunit_message_} }diff:<${shunit_diff_}>" else _shunit_assertFail "${shunit_message_:+${shunit_message_} }expected:<${shunit_expected_}> but was:<${shunit_actual_}>" fi - unset shunit_message_ shunit_expected_ shunit_actual_ + unset shunit_message_ shunit_expected_ shunit_actual_ shunit_diff_ return ${SHUNIT_FALSE} } # shellcheck disable=SC2016,SC2034