Fix for review

Author: ddidier

shunit2

@@ -629,21 +629,21 @@ assertFileExists() {
   if command [ $# -eq 2 ]; then
     shunit_custom_message_=$1
     shunit_file_=$2
-    shunit_message_="${shunit_message_}$shunit_custom_message_"
+    shunit_message_="${shunit_message_}${shunit_custom_message_}"
   else
     shunit_file_=$1
-    shunit_message_="${shunit_message_}The file '$shunit_file_' does not exist"
+    shunit_message_="${shunit_message_}The file '${shunit_file_}' does not exist"
   fi
 
   shunit_return=${SHUNIT_TRUE}
-  if command [ -f "$shunit_file_" ]; then
+  if command [ -f "${shunit_file_}" ]; then
     _shunit_assertPass
   else
     fail "${shunit_message_}"
     shunit_return=${SHUNIT_FALSE}
   fi
 
-  unset shunit_message_ shunit_file_
+  unset shunit_message_ shunit_file_ shunit_custom_message_
   return ${shunit_return}
 }
 # shellcheck disable=SC2016,SC2034
@@ -670,21 +670,21 @@ assertFileDoesNotExist() {
   if command [ $# -eq 2 ]; then
     shunit_custom_message_=$1
     shunit_file_=$2
-    shunit_message_="${shunit_message_}$shunit_custom_message_"
+    shunit_message_="${shunit_message_}${shunit_custom_message_}"
   else
     shunit_file_=$1
-    shunit_message_="${shunit_message_}The file '$shunit_file_' does exist"
+    shunit_message_="${shunit_message_}The file '${shunit_file_}' does exist"
   fi
 
   shunit_return=${SHUNIT_TRUE}
-  if command [ -f "$shunit_file_" ]; then
+  if command [ -f "${shunit_file_}" ]; then
     fail "${shunit_message_}"
     shunit_return=${SHUNIT_FALSE}
   else
     _shunit_assertPass
   fi
 
-  unset shunit_message_ shunit_file_
+  unset shunit_message_ shunit_file_ shunit_custom_message_
   return ${shunit_return}
 }
 # shellcheck disable=SC2016,SC2034
@@ -711,21 +711,21 @@ assertDirectoryExists() {
   if command [ $# -eq 2 ]; then
     shunit_custom_message_=$1
     shunit_directory_=$2
-    shunit_message_="${shunit_message_}$shunit_custom_message_"
+    shunit_message_="${shunit_message_}${shunit_custom_message_}"
   else
     shunit_directory_=$1
-    shunit_message_="${shunit_message_}The directory '$shunit_directory_' does not exist"
+    shunit_message_="${shunit_message_}The directory '${shunit_directory_}' does not exist"
   fi
 
   shunit_return=${SHUNIT_TRUE}
-  if command [ -d "$shunit_directory_" ]; then
+  if command [ -d "${shunit_directory_}" ]; then
     _shunit_assertPass
   else
     fail "${shunit_message_}"
     shunit_return=${SHUNIT_FALSE}
   fi
 
-  unset shunit_message_ shunit_directory_
+  unset shunit_message_ shunit_directory_ shunit_custom_message_
   return ${shunit_return}
 }
 # shellcheck disable=SC2016,SC2034
@@ -752,21 +752,21 @@ assertDirectoryDoesNotExist() {
   if command [ $# -eq 2 ]; then
     shunit_custom_message_=$1
     shunit_directory_=$2
-    shunit_message_="${shunit_message_}$shunit_custom_message_"
+    shunit_message_="${shunit_message_}${shunit_custom_message_}"
   else
     shunit_directory_=$1
-    shunit_message_="${shunit_message_}The directory '$shunit_directory_' does exist"
+    shunit_message_="${shunit_message_}The directory '${shunit_directory_}' does exist"
   fi
 
   shunit_return=${SHUNIT_TRUE}
-  if command [ -d "$shunit_directory_" ]; then
+  if command [ -d "${shunit_directory_}" ]; then
     fail "${shunit_message_}"
     shunit_return=${SHUNIT_FALSE}
   else
     _shunit_assertPass
   fi
 
-  unset shunit_message_ shunit_directory_
+  unset shunit_message_ shunit_directory_ shunit_custom_message_
   return ${shunit_return}
 }
 # shellcheck disable=SC2016,SC2034

shunit2_asserts_test.sh

@@ -481,6 +481,19 @@ testAssertDirectoryDoesNotExist() {
 
 oneTimeSetUp() {
   th_oneTimeSetUp
+
+  _shunit_tmpDir_="${TMPDIR:-/tmp}/shunit.$(date +%s)"
+  rm -rf "${_shunit_tmpDir_}"
+  mkdir "${_shunit_tmpDir_}"
+  TH_EXISTING_DIRECTORY="${_shunit_tmpDir_}/this_directory_exists"
+  TH_EXISTING_FILE="${_shunit_tmpDir_}/this_file_exists"
+  TH_NON_EXISTING_FILE="${_shunit_tmpDir_}/this_directory_does_not_exist"
+  TH_NON_EXISTING_DIRECTORY="${_shunit_tmpDir_}/this_file_does_not_exist"
+  mkdir "${TH_EXISTING_DIRECTORY}"
+  touch "${TH_EXISTING_FILE}"
+
+  MSG='This is a test message'
+
 }
 
 # showTestOutput for the most recently run test.

shunit2_test_helpers

@@ -245,13 +245,6 @@ th_isLinenoWorking() {
   return "${SHUNIT_FALSE}"
 }
 
-# Constants used to test file and directory assertions
-TH_EXISTING_DIRECTORY=$(exec 2>/dev/null;cd -- "$(dirname "$0")" || exit; unset PWD; /usr/bin/pwd || /bin/pwd || pwd)
-TH_EXISTING_FILE="${TH_EXISTING_DIRECTORY}/$0"
-TH_NON_EXISTING_FILE="$TH_EXISTING_DIRECTORY/non-existing-file"
-TH_NON_EXISTING_DIRECTORY="$TH_EXISTING_DIRECTORY/non-existing-directory"
-export TH_EXISTING_DIRECTORY TH_EXISTING_FILE TH_NON_EXISTING_FILE TH_NON_EXISTING_DIRECTORY
-
 #
 # Main.
 #