From 1eb154455735d2faad508170d707e8df1d718717 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 2 Feb 2017 02:25:01 -0500 Subject: [PATCH] shuffle-dee-doo more rearrangement. also some nicer shunit language in output. --- scripts/{math => generator}/inc_num.pl | 0 scripts/shunit/shunit2 | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) rename scripts/{math => generator}/inc_num.pl (100%) diff --git a/scripts/math/inc_num.pl b/scripts/generator/inc_num.pl similarity index 100% rename from scripts/math/inc_num.pl rename to scripts/generator/inc_num.pl diff --git a/scripts/shunit/shunit2 b/scripts/shunit/shunit2 index e9afb3d5..aa0a4e7d 100644 --- 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,11 +852,11 @@ _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_})" -- 2.34.1