Merge branch 'release-2.140.124'

[feisty_meow.git] / scripts / shunit / shunit2

diff --git a/scripts/shunit/shunit2 b/scripts/shunit/shunit2
index a56ed4a5cb18460fccd6b9fdee0a226affcbd4b5..aa0a4e7d0da0c2d9f571e00d9405ae2fd1b7d984 100644 (file)
--- a/scripts/shunit/shunit2
+++ b/scripts/shunit/shunit2
@@ -123,7 +123,7 @@ assertEquals()
   shunit_return=${SHUNIT_TRUE}
   if [ "${shunit_expected_}" = "${shunit_actual_}" ]; then
     if [ ! -z "$DEBUGGING" -a ! -z "$assertion_name" ]; then
-      echo "    OK: $assertion_name"
+      echo "    OKAY: $assertion_name"
     fi
     _shunit_assertPass
   else
@@ -166,7 +166,7 @@ assertNotEquals()
   shunit_return=${SHUNIT_TRUE}
   if [ "${shunit_expected_}" != "${shunit_actual_}" ]; then
     if [ ! -z "$DEBUGGING" -a ! -z "$assertion_name" ]; then
-      echo "    OK: $assertion_name"
+      echo "    OKAY: $assertion_name"
     fi
     _shunit_assertPass
   else
@@ -357,7 +357,7 @@ assertTrue()
   # record the test
   if [ ${shunit_return} -eq ${SHUNIT_TRUE} ]; then
     if [ ! -z "$DEBUGGING" -a ! -z "$assertion_name" ]; then
-      echo "    OK: $assertion_name"
+      echo "    OKAY: $assertion_name"
     fi
     _shunit_assertPass
   else
@@ -427,7 +427,7 @@ assertFalse()
   # record the test
   if [ ${shunit_return} -eq ${SHUNIT_TRUE} ]; then
     if [ ! -z "$DEBUGGING" -a ! -z "$assertion_name" ]; then
-      echo "    OK: $assertion_name"
+      echo "    OKAY: $assertion_name"
     fi
     _shunit_assertPass
   else
@@ -822,7 +822,7 @@ _shunit_execSuite()
   unset _shunit_test_
 }
 
-# Generates the user friendly report with appropriate OK/FAILED message.
+# Generates the user friendly report with appropriate OKAY/FAILED message.
 #
 # Args:
 #   None
@@ -852,16 +852,31 @@ _shunit_generateReport()
       && _shunit_skipped_="skipped=${__shunit_assertsSkipped}"
 
   if [ ${_shunit_ok_} -eq ${SHUNIT_TRUE} ]; then
-    _shunit_msg_='OK'
+    _shunit_msg_="$(basename $0) PASSED 100% OKAY"
     [ -n "${_shunit_skipped_}" ] \
         && _shunit_msg_="${_shunit_msg_} (${_shunit_skipped_})"
   else
-    _shunit_msg_="FAILED (${_shunit_failures_}"
+    _shunit_msg_="$(basename $0) FAILED (${_shunit_failures_}"
     [ -n "${_shunit_skipped_}" ] \
         && _shunit_msg_="${_shunit_msg_},${_shunit_skipped_}"
     _shunit_msg_="${_shunit_msg_})"
   fi
 
+  if [ -z "$suite_end" ]; then
+    # make sure we don't get confused, since suite aborted early.
+    suite_end=$(date +%s)
+  fi
+  # we keep duration_s for later printing.
+  duration_s=$(($suite_end - $suite_start))
+  # calculate full minutes count based on seconds.
+  duration_m=$(($duration_s / 60))
+  # calculate how many hours that is.
+  duration_h=$(($duration_m / 60))
+  # fix the minutes since we chopped those hours out.
+  duration_m=$(($duration_m - $duration_h * 60))
+  if [ $duration_m -lt 10 ]; then duration_m="0$duration_m"; fi
+  if [ $duration_h -lt 10 ]; then duration_h="0$duration_h"; fi
+  echo "Test suite ran for $duration_s total seconds [$duration_h:$duration_m hh:mm]"
   echo
   echo "$(date): ${_shunit_msg_}"
   __shunit_reportGenerated=${SHUNIT_TRUE}
@@ -1041,6 +1056,9 @@ if [ "${__shunit_mode}" = "${__SHUNIT_MODE_STANDALONE}" ]; then
   . "`_shunit_prepForSourcing \"${__shunit_script}\"`"
 fi
 
+# record when the tests started running.
+suite_start=$(date +%s)
+
 # execute the oneTimeSetUp function (if it exists)
 oneTimeSetUp
 
@@ -1063,6 +1081,8 @@ _shunit_execSuite
 # execute the oneTimeTearDown function (if it exists)
 oneTimeTearDown
 
+suite_end=$(date +%s)
+
 # generate the report
 _shunit_generateReport