From abc65b2eb27cda62699a35d687e01afb549d9537 Mon Sep 17 00:00:00 2001 From: Zouhair AMAZZAL Date: Wed, 7 Dec 2022 15:45:42 +0100 Subject: [PATCH] test(find-files): check if the submitted file is correct and check if echo is used --- sh/tests/find-files_test.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/sh/tests/find-files_test.sh b/sh/tests/find-files_test.sh index ec25caaa4..374451632 100755 --- a/sh/tests/find-files_test.sh +++ b/sh/tests/find-files_test.sh @@ -5,14 +5,31 @@ set -euo pipefail IFS=' ' +FILENAME="student/find-files.sh" script_dirS=$(cd -P "$(dirname "$BASH_SOURCE")" &>/dev/null && pwd) challenge() { - submitted=$(cd "$1" && bash "$script_dirS"/student/find-files.sh) + submitted=$(cd "$1" && bash "$script_dirS"/$FILENAME) expected=$(cd "$1" && bash "$script_dirS"/solutions/find-files.sh) diff <(echo "$submitted") <(echo "$expected") } -challenge find-files/folder1 -challenge find-files/folder2 +# True if FILE exists and is a regular file +if [ -f ${FILENAME} ]; then + # FILE exists and it's not empty + if [ -s ${FILENAME} ]; then + if [[ $(cat $FILENAME | grep echo | wc -l) -ne 0 ]]; then + echo "echo is not allowed in this exercise!"; + exit 1 + fi + challenge find-files/folder1 + challenge find-files/folder2 + else + echo "The file exist but is empty" + exit 1 + fi +else + echo "File does not exist" + exit 1 +fi \ No newline at end of file