Skip to content
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

Jump to bottom

Do not use hardcoded directory for tests #788

Closed
wants to merge 1 commit into from
Closed

Do not use hardcoded directory for tests #788

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 17 additions & 12 deletions python/jsbeautifier/tests/shell-smoke-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,31 +77,36 @@ test_cli_js_beautify()
exit 1
}

rm -rf /tmp/js-beautify-mkdir
$CLI_SCRIPT -o /tmp/js-beautify-mkdir/js-beautify.js $SCRIPT_DIR/../../../js/bin/js-beautify.js && diff $SCRIPT_DIR/../../../js/bin/js-beautify.js /tmp/js-beautify-mkdir/js-beautify.js || {
echo "js-beautify output for $SCRIPT_DIR/../../../js/bin/js-beautify.js should have been created in /tmp/js-beautify-mkdir/js-beautify.js."
JS_BEAUTIFY_MKDIR=`mktemp --tmpdir -d js-beautify-mkdir-XXXX`
$CLI_SCRIPT -o $JS_BEAUTIFY_MKDIR/js-beautify.js $SCRIPT_DIR/../../../js/bin/js-beautify.js && diff $SCRIPT_DIR/../../../js/bin/js-beautify.js $JS_BEAUTIFY_MKDIR/js-beautify.js || {
echo "js-beautify output for $SCRIPT_DIR/../../../js/bin/js-beautify.js should have been created in $JS_BEAUTIFY_MKDIR/js-beautify.js."
exit 1
}

# ensure unchanged files are not overwritten
cp -p /tmp/js-beautify-mkdir/js-beautify.js /tmp/js-beautify-mkdir/js-beautify-old.js
touch -A -05 /tmp/js-beautify-mkdir/js-beautify.js
touch -A -01 /tmp/js-beautify-mkdir/js-beautify-old.js
$CLI_SCRIPT -r /tmp/js-beautify-mkdir/js-beautify.js && test /tmp/js-beautify-mkdir/js-beautify.js -nt /tmp/js-beautify-mkdir/js-beautify-old.js && {
echo "js-beautify should not replace unchanged file /tmp/js-beautify-mkdir/js-beautify.js when using -r"
cp -p $JS_BEAUTIFY_MKDIR/js-beautify.js $JS_BEAUTIFY_MKDIR/js-beautify-old.js
touch -A -05 $JS_BEAUTIFY_MKDIR/js-beautify.js
touch -A -01 $JS_BEAUTIFY_MKDIR/js-beautify-old.js
$CLI_SCRIPT -r $JS_BEAUTIFY_MKDIR/js-beautify.js && test $JS_BEAUTIFY_MKDIR/js-beautify.js -nt $JS_BEAUTIFY_MKDIR/js-beautify-old.js && {
echo "js-beautify should not replace unchanged file $JS_BEAUTIFY_MKDIR/js-beautify.js when using -r"
rm -rf $JS_BEAUTIFY_MKDIR
Copy link
Member

Choose a reason for hiding this comment

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

Instead of adding this multiple times, could you move this and the exit 1 into a function?

exit 1
}

$CLI_SCRIPT -o /tmp/js-beautify-mkdir/js-beautify.js /tmp/js-beautify-mkdir/js-beautify.js && test /tmp/js-beautify-mkdir/js-beautify.js -nt /tmp/js-beautify-mkdir/js-beautify-old.js && {
echo "js-beautify should not replace unchanged file /tmp/js-beautify-mkdir/js-beautify.js when using -o and same file name"
$CLI_SCRIPT -o $JS_BEAUTIFY_MKDIR/js-beautify.js $JS_BEAUTIFY_MKDIR/js-beautify.js && test $JS_BEAUTIFY_MKDIR/js-beautify.js -nt $JS_BEAUTIFY_MKDIR/js-beautify-old.js && {
echo "js-beautify should not replace unchanged file $JS_BEAUTIFY_MKDIR/js-beautify.js when using -o and same file name"
rm -rf $JS_BEAUTIFY_MKDIR
exit 1
}

$CLI_SCRIPT -o /tmp/js-beautify-mkdir/js-beautify.js /tmp/js-beautify-mkdir/js-beautify-old.js && test /tmp/js-beautify-mkdir/js-beautify.js -nt /tmp/js-beautify-mkdir/js-beautify-old.js && {
echo "js-beautify should not replace unchanged file /tmp/js-beautify-mkdir/js-beautify.js when using -o and different file name"
$CLI_SCRIPT -o $JS_BEAUTIFY_MKDIR/js-beautify.js $JS_BEAUTIFY_MKDIR/js-beautify-old.js && test $JS_BEAUTIFY_MKDIR/js-beautify.js -nt $JS_BEAUTIFY_MKDIR/js-beautify-old.js && {
echo "js-beautify should not replace unchanged file $JS_BEAUTIFY_MKDIR/js-beautify.js when using -o and different file name"
rm -rf $JS_BEAUTIFY_MKDIR
exit 1
}

rm -rf $JS_BEAUTIFY_MKDIR

$CLI_SCRIPT $SCRIPT_DIR/../../../js/bin/css-beautify.js | diff -q $SCRIPT_DIR/../../../js/bin/css-beautify.js - && {
echo "js-beautify output for $SCRIPT_DIR/../../../js/bin/css-beautify.js was expected to be different."
exit 1
Expand Down