commit 08e5bba0d12cef77bbe240098c85531371ab7116
author kate.ward <kate.ward@forestent.com> Tue Oct 21 19:19:10 2008 +0000
committer kate.ward <kate.ward@forestent.com> Tue Oct 21 19:19:10 2008 +0000
tree bbc4fa8c1edd6d142d507f507a91c4327a048439
parent 49111ee8d4b75c8e13f3760b980d7ab5fe939b47

line wrapping and extra code cleanup

source/1.0/src/shflags_test_public.sh

diff --git a/source/1.0/src/shflags_test_public.sh b/source/1.0/src/shflags_test_public.sh
index 3e45b5c..a2f6609 100755
--- a/source/1.0/src/shflags_test_public.sh
+++ b/source/1.0/src/shflags_test_public.sh
@@ -40,9 +40,7 @@
   rslt=`FLAGS_HELP='this is a test'; FLAGS -h 2>&1`
   echo "${rslt}" |grep -- 'this is a test' >/dev/null
   rtrn=$?
-  assertTrue \
-      'setting FLAGS_HELP did not produce expected result' \
-      ${rtrn}
+  assertTrue 'setting FLAGS_HELP did not produce expected result' ${rtrn}
   [ ${rtrn} -ne ${FLAGS_TRUE} ] && echo "${rslt}" >&2
 
   # test that "'" chars work in help string
@@ -50,9 +48,7 @@
   rslt=`FLAGS -h 2>&1`
   echo "${rslt}" |grep -- "help string containing a ' char" >/dev/null
   rtrn=$?
-  assertTrue \
-      "help strings containing apostrophes don't work" \
-      ${rtrn}
+  assertTrue "help strings containing apostrophes don't work" ${rtrn}
   [ ${rtrn} -ne ${FLAGS_TRUE} ] && echo "${rslt}" >&2
 
   #
@@ -62,14 +58,9 @@
   flags_getoptIsStd && startSkipping
 
   rslt=`FLAGS --help 2>&1`
-  rtrn=$?
-  assertFalse \
-      'long request for help should have returned non-zero exit code.' \
-      ${rtrn}
+  assertFalse 'long help request should have returned non-zero exit code' $?
   echo "${rslt}" |grep -- 'show this help' >/dev/null
-  assertTrue \
-      'long request for help should have produced some help output.' \
-      $?
+  assertTrue 'long help request should have produced some help output.' $?
 }
 
 testStandardHelpOutput()
@@ -95,10 +86,8 @@
 EOF
   ( FLAGS_HELP=${help}; FLAGS -h >"${stdoutF}" 2>"${stderrF}" )
   diff "${expectedF}" "${stderrF}" >/dev/null
-  rtrn=$?
-  assertTrue 'unexpected help output' ${rtrn}
-  [ ${__shunit_skip} -eq ${SHUNIT_FALSE} \
-    -a ${rtrn} -ne ${FLAGS_TRUE} ] \
+  assertTrue 'unexpected help output' $?
+  [ ${__shunit_skip} -eq ${SHUNIT_FALSE} -a ${rtrn} -ne ${FLAGS_TRUE} ] \
       && cat "${stderrF}"
 }
 
@@ -125,8 +114,7 @@
 EOF
   ( FLAGS_HELP=${help}; FLAGS -h >"${stdoutF}" 2>"${stderrF}" )
   diff "${expectedF}" "${stderrF}" >/dev/null
-  rtrn=$?
-  assertTrue 'unexpected help output' ${rtrn}
+  assertTrue 'unexpected help output' $?
   [ ${__shunit_skip} -eq ${SHUNIT_FALSE} -a ${rtrn} -ne ${FLAGS_TRUE} ] \
       && cat "${stderrF}"
 }