Skip to content

Improve output when string not equal for long strings #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daveshepherd wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Improve output when string not equal for long strings #104

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d100f02
Improve output when string not equal for long strings
daveshepherd Dec 14, 2018
783fefa
Fix style issues around improved diff output
daveshepherd Feb 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion shunit2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
daveshepherd marked this conversation as resolved.
Outdated
Comment thread
daveshepherd marked this conversation as resolved.
Outdated
diff_output_=$(diff <(echo "${shunit_expected_}") <(echo "${shunit_actual_}"))
Comment thread
daveshepherd marked this conversation as resolved.
Outdated
Copy link
Copy Markdown

@cbandy cbandy Feb 18, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recognize process substitution <() as a Bashism, though I don't know the details.

Copy link
Copy Markdown
Author

@daveshepherd daveshepherd Feb 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is process substitution, it provides a way of passing the output of a command to another command where pipe is not available. diff takes filenames, but the items that want to be diff'd are in variables.
I suspect this might be why the tests are failing, as it probably doesn't work in other shells.
If anyone has any suggestions on how I can do this differently then let me know.

_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_
Copy link
Copy Markdown
Owner

@kward kward Feb 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add your new variable here.

return ${SHUNIT_FALSE}
Expand Down