[WIP] Simplify expected_to/might logic

42shTests.sh

@@ -71,16 +71,6 @@ function run_verb_be_empty
   fi
 }
 
-function run_verb_be_filled
-{
-  if [ "$(awk '{print}' "${RESPONSE}")" != "" ]
-  then
-    return 0
-  else
-    return 1
-  fi
-}
-
 function run_verb_have_nb_of_lines
 {
   if [ "$(awk 'END {printf NR}' "${RESPONSE}")" == "${EXPECTED_TO_ARGS[0]}" ]
@@ -91,16 +81,6 @@ function run_verb_have_nb_of_lines
   fi
 }
 
-function run_verb_have_not_regexp
-{
-  if [ "$(awk -v regexp="${EXPECTED_TO_ARGS[0]}" '$0 ~ regexp {print}' "${RESPONSE}")" == "" ]
-  then
-    return 0
-  else
-    return 1
-  fi
-}
-
 function run_verb_have_regexp
 {
   if [ "$(awk -v regexp="${EXPECTED_TO_ARGS[0]}" '$0 ~ regexp {print}' "${RESPONSE}")" != "" ]
@@ -175,6 +155,24 @@ function run_expected_to
   esac
 }
 
+function run_expected_to_not
+{
+  shift 1
+  local EXPECTED_TO_CMD="${1}"
+  shift 1
+  local -a EXPECTED_TO_ARGS='(${@})'
+
+  eval "run_verb_${EXPECTED_TO_CMD}"
+  case "${?}" in
+    1)
+      printf "${C_GREEN}  √ ${EXPECTED_STD_NAME} %s${C_CLEAR}\n" "$(eval echo ${LINE})" ;;
+    0)
+      printf "${C_RED}  ~ ${EXPECTED_STD_NAME} %s${C_CLEAR}\n" "$(eval echo ${LINE})" ;;
+    2)
+      printf "${C_RED} [!] INVALID TEST COMMAND: ${EXPECTED_STD_NAME} %s${C_CLEAR}\n" "$(eval echo ${LINE})" ;;
+  esac
+}
+
 function run_might
 {
   shift 1
@@ -193,6 +191,24 @@ function run_might
   esac
 }
 
+function run_might_not
+{
+  shift 1
+  local EXPECTED_TO_CMD="${1}"
+  shift 1
+  local -a EXPECTED_TO_ARGS=${@}
+
+  eval "run_verb_${EXPECTED_TO_CMD}"
+  case "${?}" in
+    1)
+      printf "${C_GREEN}  √ ${EXPECTED_STD_NAME} %s${C_CLEAR}\n" "$(eval echo ${LINE})" ;;
+    0)
+      printf "${C_YELLOW}  ~ ${EXPECTED_STD_NAME} %s${C_CLEAR}\n" "$(eval echo ${LINE})" ;;
+    2)
+      printf "${C_RED} [!] INVALID TEST COMMAND: ${EXPECTED_STD_NAME} %s${C_CLEAR}\n" "$(eval echo ${LINE})" ;;
+  esac
+}
+
 function run_expector
 {
   local LINE

spec/21sh/redirections/outputs/closing/001-fd-not-specified/stdout

@@ -1 +1 @@
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/closing/002-stdout-specified/stdout

@@ -1 +1 @@
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/closing/003-stderr-specified/stderr

@@ -1 +1 @@
-expected_to have_not_regexp "No such file or directory"
+expected_to_not have_regexp "No such file or directory"

spec/21sh/redirections/outputs/closing/004-twice/stderr

@@ -1 +1 @@
-expected_to have_not_regexp "No such file or directory"
+expected_to_not have_regexp "No such file or directory"

spec/21sh/redirections/outputs/closing/004-twice/stdout

@@ -1 +1 @@
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/001-creates-file-if-not-exits/stdout

@@ -1 +1 @@
-expected_to have_not_regexp TOKEN1
+expected_to_not have_regexp TOKEN1

spec/21sh/redirections/outputs/truncating/002-truncates-file-if-exists/stdout

@@ -1 +1 @@
-expected_to have_not_regexp LAST_TOKEN
+expected_to_not have_regexp LAST_TOKEN

spec/21sh/redirections/outputs/truncating/003-whitespace-before-filename/stdout

@@ -1 +1 @@
-expected_to have_not_regexp TOKEN1
+expected_to_not have_regexp TOKEN1

spec/21sh/redirections/outputs/truncating/multiple/001-separately/stderr

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "No such file or directory"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/multiple/001-separately/stdout

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "No such file or directory"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/multiple/002-together-1/stderr

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "No such file or directory"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/multiple/002-together-1/stdout

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "No such file or directory"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/multiple/003-together-2/stderr

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "No such file or directory"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/multiple/003-together-2/stdout

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "No such file or directory"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/multiple/004-together-3/stderr

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "No such file or directory"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/multiple/004-together-3/stdout

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
-expected_to have_not_regexp "42shTests.sh"
+expected_to_not have_regexp "No such file or directory"
+expected_to_not have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/stderr/001-works/stdout

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "No such file or directory"
+expected_to_not have_regexp "No such file or directory"
 expected_to have_regexp "42shTests.sh"

spec/21sh/redirections/outputs/truncating/stdout/001-with-explicit-fd/stdout

@@ -1 +1 @@
-expected_to have_not_regexp TOKEN1
+expected_to_not have_regexp TOKEN1

spec/bonuses/separators/&&/002-do-not-run-second/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/bonuses/separators/&&/002-do-not-run-second/stdout

@@ -1,2 +1,2 @@
 might be_empty
-might have_not_regexp LAST_TOKEN
+might_not have_regexp LAST_TOKEN

spec/bonuses/separators/&&/003-parse-error-at-beginning/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/bonuses/separators/&&/004-parse-error-at-end/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/bonuses/separators/&&/005-parse-error-too-much-symbol/stderr

@@ -1,2 +1,2 @@
-might be_filled
+might_not be_empty
 might have_nb_of_lines 2

spec/bonuses/separators/||/001-run-first-only/stdout

@@ -1,2 +1,2 @@
 might have_regexp FIRST_TOKEN
-might have_not_regexp LAST_TOKEN
+might_not have_regexp LAST_TOKEN

spec/bonuses/separators/||/002-run-second-only/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/bonuses/separators/||/003-parse-error-at-beginning/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/bonuses/separators/||/004-parse-error-at-end/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/bonuses/separators/||/005-parse-error-too-much-symbol/stderr

@@ -1,2 +1,2 @@
-might be_filled
+might_not be_empty
 might have_nb_of_lines 2

spec/minishell/001-builtins/cd/001-no-arg/before_exec

@@ -1,2 +1,2 @@
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/001-no-arg/stdout

@@ -1,2 +1,2 @@
-expected_to have_not_regexp "${GLOBAL_TMP_DIRECTORY}$"
-expected_to have_regexp "PWD:${HOME}:PWD$"
+expected_to_not have_regexp "${GLOBAL_TMP_DIRECTORY}$"
+expected_to have_regexp "PWD:${HOME}:PWD$"

spec/minishell/001-builtins/cd/002-current-directory/before_exec

@@ -1,2 +1,2 @@
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/003-current-directory-2/before_exec

@@ -1,2 +1,2 @@
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/004-parent-directory/before_exec

@@ -1,2 +1,2 @@
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/005-absolute-path/before_exec

@@ -1,2 +1,2 @@
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/007-symbolic-link/before_exec

@@ -3,4 +3,4 @@ rm -f symbolic_link
 ln -s .. symbolic_link
 
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/008-symbolic-link-2/before_exec

@@ -3,4 +3,4 @@ ln -s .. symbolic_link1
 ln -s symbolic_link1 symbolic_link2
 
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/009-following-links/before_exec

@@ -4,4 +4,4 @@ ln -s subdirectory subdirectory_link
 ln -s subsubdirectory subdirectory/subsubdirectory_link
 
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/errors/001-not-a-directory/before_exec

@@ -1,4 +1,4 @@
 touch not_a_directory
 
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/errors/001-not-a-directory/stderr

@@ -1,2 +1,2 @@
-expected_to be_filled
-might have_regexp "[Nn]ot a directory"
+expected_to_not be_empty
+might have_regexp "[Nn]ot a directory"

spec/minishell/001-builtins/cd/errors/002-permission-denied/before_exec

@@ -2,4 +2,4 @@ if [ -d permission_denied ]; then chmod 777 permission_denied; rm -r permission_
 mkdir -m 0 permission_denied
 
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/errors/002-permission-denied/stderr

@@ -1,2 +1,2 @@
-expected_to be_filled
-might have_regexp "[Pp]ermission denied"
+expected_to_not be_empty
+might have_regexp "[Pp]ermission denied"

spec/minishell/001-builtins/cd/errors/003-too-many-symbolic-links-encountered/before_exec

@@ -4,4 +4,4 @@ ln -s symbolic_link2 symbolic_link3
 ln -s symbolic_link3 symbolic_link1
 
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/errors/003-too-many-symbolic-links-encountered/stderr

@@ -1,2 +1,2 @@
-expected_to be_filled
-might have_regexp "[Tt]oo many symbolic links encountered"
+expected_to_not be_empty
+might have_regexp "[Tt]oo many symbolic links encountered"

spec/minishell/001-builtins/cd/errors/004-no-such-file-or-directory/stderr

@@ -1,2 +1,2 @@
-expected_to be_filled
-might have_regexp "[Nn]o such file or directory"
+expected_to_not be_empty
+might have_regexp "[Nn]o such file or directory"

spec/minishell/001-builtins/cd/options/001-not-following-links/before_exec

@@ -4,4 +4,4 @@ ln -s subdirectory subdirectory_link
 ln -s subsubdirectory subdirectory/subsubdirectory_link
 
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/cd/options/001-not-following-links/stdout

@@ -1,5 +1,5 @@
-might have_not_regexp "${GLOBAL_TMP_DIRECTORY}/subdirectory_link$"
+might_not have_regexp "${GLOBAL_TMP_DIRECTORY}/subdirectory_link$"
 might have_regexp "PWD:${GLOBAL_TMP_DIRECTORY}/subdirectory:PWD$"
 
-might have_not_regexp "${GLOBAL_TMP_DIRECTORY}/subdirectory_link/subsubdirectory_link$"
+might_not have_regexp "${GLOBAL_TMP_DIRECTORY}/subdirectory_link/subsubdirectory_link$"
 might have_regexp "PWD:${GLOBAL_TMP_DIRECTORY}/subdirectory/subsubdirectory:PWD$"

spec/minishell/001-builtins/cd/options/002-oldpwd/before_exec

@@ -1,2 +1,2 @@
 rm -f display_pwd
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-pwd/main.c -o display_pwd
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-pwd/main.c -o display_pwd

spec/minishell/001-builtins/env/003-ignore-environment-1/before_exec

@@ -1,2 +1,2 @@
 rm -f display_env
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-env/main.c -o display_env
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-env/main.c -o display_env

spec/minishell/001-builtins/env/004-ignore-environment-2/before_exec

@@ -1,2 +1,2 @@
 rm -f display_env
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-env/main.c -o display_env
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-env/main.c -o display_env

spec/minishell/001-builtins/env/005-set-variables/before_exec

@@ -1,2 +1,2 @@
 rm -f display_env
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-env/main.c -o display_env
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-env/main.c -o display_env

spec/minishell/001-builtins/env/006-unset-variables-1/before_exec

@@ -1,3 +1,3 @@
 rm -f display_env
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-env/main.c -o display_env
-export TESTVARIABLE=TOKEN
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-env/main.c -o display_env
+export TESTVARIABLE=TOKEN

spec/minishell/001-builtins/env/006-unset-variables-1/stdout

@@ -1,3 +1,3 @@
-might have_not_regexp "HOME="
-might have_not_regexp "PATH="
-might have_not_regexp "TESTVARIABLE="
+might_not have_regexp "HOME="
+might_not have_regexp "PATH="
+might_not have_regexp "TESTVARIABLE="

spec/minishell/001-builtins/env/007-unset-variables-2/before_exec

@@ -1,3 +1,3 @@
 rm -f display_env
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-env/main.c -o display_env
-export TESTVARIABLE=TOKEN
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-env/main.c -o display_env
+export TESTVARIABLE=TOKEN

spec/minishell/001-builtins/env/007-unset-variables-2/stdout

@@ -1,3 +1,3 @@
-might have_not_regexp "HOME="
-might have_not_regexp "PATH="
-might have_not_regexp "TESTVARIABLE="
+might_not have_regexp "HOME="
+might_not have_regexp "PATH="
+might_not have_regexp "TESTVARIABLE="

spec/minishell/001-builtins/env/calling-builtins/001-cd-HOME-without-environment/stderr

@@ -1 +1 @@
-expected_to be_filled
+expected_to_not be_empty

spec/minishell/001-builtins/env/calling-builtins/001-cd-HOME-without-environment/stdout

@@ -1,2 +1,2 @@
 expected_to have_regexp "${GLOBAL_TMP_DIRECTORY}$"
-expected_to have_not_regexp "${HOME}$"
+expected_to_not have_regexp "${HOME}$"

spec/minishell/001-builtins/env/multiple-options/001-ignore-environment-and-set-variable/before_exec

@@ -1,2 +1,2 @@
 rm -f display_env
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-env/main.c -o display_env
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-env/main.c -o display_env

spec/minishell/001-builtins/env/multiple-options/002-unset-and-set-variable/before_exec

@@ -1,2 +1,2 @@
 rm -f display_env
-gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/spec/support/display-env/main.c -o display_env
+gcc -Wall -Werror -Wextra ${GLOBAL_INSTALLDIR}/support/display-env/main.c -o display_env

spec/minishell/001-builtins/env/multiple-options/002-unset-and-set-variable/stdout

@@ -1,5 +1,5 @@
 might have_regexp "START DISPLAYING ENVIRONMENT VARIABLES$"
 might have_regexp "TESTVARIABLE=TOKEN$"
-might have_not_regexp "HOME="
-might have_not_regexp "PATH="
-might have_regexp "END DISPLAYING ENVIRONMENT VARIABLES$"
+might_not have_regexp "HOME="
+might_not have_regexp "PATH="
+might have_regexp "END DISPLAYING ENVIRONMENT VARIABLES$"

spec/minishell/001-builtins/exit/001-simple/stdout

@@ -1 +1 @@
-expected_to have_not_regexp INVISIBLE_TOKEN
+expected_to_not have_regexp INVISIBLE_TOKEN

spec/minishell/001-builtins/exit/003-too-many-args/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/minishell/001-builtins/setenv/002-setenv-noequal/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/minishell/001-builtins/setenv/003-setenv-equal/stderr

@@ -1 +1 @@
-might be_filled
+might_not be_empty

spec/minishell/001-builtins/unsetenv/001-unsetenv-first-elem/stdout

@@ -1 +1 @@
-expected_to have_not_regexp $SSH_AUTH_SOCK
+expected_to_not have_regexp $SSH_AUTH_SOCK