Merge pull request #82 from TypedDevs/fix-async

Fix async
TypedDevs · Sep 18, 2023 · 7abeda6 · 7abeda6
2 parents db26c9e + c9944f9
commit 7abeda6
Show file tree

Hide file tree

Showing 11 changed files with 133 additions and 106 deletions.
diff --git a/.env.example b/.env.example
@@ -1,2 +0,0 @@
-PARALLEL_RUN=
-

diff --git a/bashunit b/bashunit
@@ -5,6 +5,7 @@ readonly BASH_UNIT_ROOT_DIR="$(dirname "${BASH_SOURCE[0]}")"
 source "$BASH_UNIT_ROOT_DIR/src/default_env_config.sh"
 source "$BASH_UNIT_ROOT_DIR/src/env_configuration.sh"
 source "$BASH_UNIT_ROOT_DIR/src/check_os.sh"
+source "$BASH_UNIT_ROOT_DIR/src/state.sh"
 source "$BASH_UNIT_ROOT_DIR/src/colors.sh"
 source "$BASH_UNIT_ROOT_DIR/src/console_results.sh"
 source "$BASH_UNIT_ROOT_DIR/src/helpers.sh"

diff --git a/bin/pre-commit b/bin/pre-commit
@@ -4,7 +4,7 @@ echo "Running pre-commit checks..."
 make pre_commit/run
 EXIT_CODE=$?
 
-if [ ${EXIT_CODE} -ne 0 ]; then
+if [[ ${EXIT_CODE} -ne 0 ]]; then
     echo "Pre Commit checks failed. Please fix the above issues before committing"
     exit ${EXIT_CODE}
 else

diff --git a/src/assert.sh b/src/assert.sh
@@ -6,38 +6,38 @@ function assertEquals() {
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
   if [[ "$expected" != "$actual" ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${expected}" "but got" "${actual}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${expected}" "but got" "${actual}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertEmpty() {
   local expected="$1"
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
   if [[ "$expected" != "" ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "to be empty" "but got" "${expected}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "to be empty" "but got" "${expected}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertNotEmpty() {
   local expected="$1"
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
   if [[ "$expected" == "" ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "to not be empty" "but got" "${expected}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "to not be empty" "but got" "${expected}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertNotEquals() {
@@ -46,12 +46,12 @@ function assertNotEquals() {
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
   if [[ "$expected" == "$actual" ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${expected}" "but got" "${actual}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${expected}" "but got" "${actual}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertContains() {
@@ -60,12 +60,12 @@ function assertContains() {
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
   if ! [[ $actual == *"$expected"* ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual}" "to contain" "${expected}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual}" "to contain" "${expected}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertNotContains() {
@@ -74,12 +74,12 @@ function assertNotContains() {
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
   if [[ $actual == *"$expected"* ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual}" "to not contain" "${expected}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual}" "to not contain" "${expected}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertMatches() {
@@ -88,12 +88,12 @@ function assertMatches() {
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
   if ! [[ $actual =~ $expected ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual}" "to match" "${expected}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual}" "to match" "${expected}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertNotMatches() {
@@ -102,54 +102,54 @@ function assertNotMatches() {
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
   if [[ $actual =~ $expected ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual}" "to not match" "${expected}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual}" "to not match" "${expected}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertExitCode() {
   local actual_exit_code=$?
   local expected_exit_code="$1"
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
-  if [ $actual_exit_code -ne "$expected_exit_code" ]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual_exit_code}" "to be" "${expected_exit_code}"
+  if [[ $actual_exit_code -ne "$expected_exit_code" ]]; then
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual_exit_code}" "to be" "${expected_exit_code}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertSuccessfulCode() {
   local actual_exit_code=$?
   local expected_exit_code=0
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
-  if [[ $actual_exit_code != "$expected_exit_code" ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual_exit_code}" "to be exactly" "${expected_exit_code}"
+  if [[ $actual_exit_code -ne "$expected_exit_code" ]]; then
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual_exit_code}" "to be exactly" "${expected_exit_code}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertGeneralError() {
   local actual_exit_code=$?
   local expected_exit_code=1
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
-  if [ $actual_exit_code -ne "$expected_exit_code" ]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual_exit_code}" "to be exactly" "${expected_exit_code}"
+  if [[ $actual_exit_code -ne "$expected_exit_code" ]]; then
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual_exit_code}" "to be exactly" "${expected_exit_code}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 
@@ -158,13 +158,13 @@ function assertCommandNotFound() {
   local expected_exit_code=127
   local label="${3:-$(Helper::normalizeTestFunctionName "${FUNCNAME[1]}")}"
 
-  if [ $actual_exit_code -ne "$expected_exit_code" ]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual_exit_code}" "to be exactly" "${expected_exit_code}"
+  if [[ $actual_exit_code -ne "$expected_exit_code" ]]; then
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual_exit_code}" "to be exactly" "${expected_exit_code}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertArrayContains() {
@@ -174,12 +174,12 @@ function assertArrayContains() {
   local actual=("$@")
 
   if ! [[ "${actual[*]}" == *"$expected"* ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual[*]}" "to contain" "${expected}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual[*]}" "to contain" "${expected}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
 
 function assertArrayNotContains() {
@@ -189,10 +189,10 @@ function assertArrayNotContains() {
   local actual=("$@")
 
   if [[ "${actual[*]}" == *"$expected"* ]]; then
-    ((_ASSERTIONS_FAILED++))
-    Console::printFailedTest  "${label}" "${actual[*]}" "to not contain" "${expected}"
+    State::addAssertionsFailed
+    Console::printFailedTest "${label}" "${actual[*]}" "to not contain" "${expected}"
     return
   fi
 
-  ((_ASSERTIONS_PASSED++))
+  State::addAssertionsPassed
 }
diff --git a/src/check_os.sh b/src/check_os.sh
@@ -3,9 +3,9 @@
 # shellcheck disable=SC2034
 _OS="Unknown"
 
-if [ "$(uname)" == "Linux" ]; then
+if [[ "$(uname)" == "Linux" ]]; then
   _OS="Linux"
-elif [ "$(uname)" == "Darwin" ]; then
+elif [[ "$(uname)" == "Darwin" ]]; then
   _OS="OSX"
 elif [[ $(uname) == *"MINGW"* ]]; then
   _OS="Windows"

diff --git a/src/console_results.sh b/src/console_results.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 
 _START_TIME=$(date +%s%N);
-_TESTS_PASSED=0
-_TESTS_FAILED=0
-_ASSERTIONS_PASSED=0
-_ASSERTIONS_FAILED=0
 
 function Console::renderResult() {
   local tests_passed=$1
@@ -46,7 +42,7 @@ function Console::renderResult() {
 }
 
 function Console::printExecutionTime() {
-  if [ "$_OS" != "OSX" ]; then
+  if [[ "$_OS" != "OSX" ]]; then
     _EXECUTION_TIME=$((($(date +%s%N) - "$_START_TIME") / 1000000))
     printf "${_COLOR_BOLD}%s${_COLOR_DEFAULT}\n" "Time taken: ${_EXECUTION_TIME} ms"
   fi
@@ -70,6 +66,3 @@ ${_COLOR_FAILED}✗ Failed${_COLOR_DEFAULT}: %s
     "${test_name}" "${expected}" "${failure_condition_message}" "${actual}"
 
 }
-
-# Set a trap to call renderResult when the script exits
-trap 'Console::renderResult $_TESTS_PASSED $_TESTS_FAILED $_ASSERTIONS_PASSED $_ASSERTIONS_FAILED' EXIT
diff --git a/src/default_env_config.sh b/src/default_env_config.sh
@@ -1,2 +1,4 @@
 #!/bin/bash
-export _DEFAULT_PARALLEL_RUN=false
+
+# shellcheck disable=SC2034
+_DEFAULT_PARALLEL_RUN=false
diff --git a/src/env_configuration.sh b/src/env_configuration.sh
@@ -5,6 +5,6 @@ set -o allexport
 [[ -f ".env" ]] && source .env set
 set +o allexport
 
-if [ -z "$PARALLEL_RUN" ]; then
+if [[ -z "$PARALLEL_RUN" ]]; then
   PARALLEL_RUN=$_DEFAULT_PARALLEL_RUN
 fi