From aede1cefbe86ea31088979775718f195332b4fe3 Mon Sep 17 00:00:00 2001
From: Andrew Kesterson <andrew@aklabs.net>
Date: Sat, 7 Jun 2014 22:39:58 -0700
Subject: [PATCH] Fixed some broken longopt and helpers related tests

---
 cmdarg.sh             | 8 +++++---
 tests/test_helpers.sh | 7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cmdarg.sh b/cmdarg.sh
index f1276cc..b1e0f3d 100644
--- a/cmdarg.sh
+++ b/cmdarg.sh
@@ -169,7 +169,7 @@ function cmdarg_usage
     echo "${CMDARG_INFO['header']}"
     echo
     local key
-    if [[ "${#CMDARG_REQUIRED[@]}" -eq 0 ]]; then
+    if [[ "${#CMDARG_REQUIRED[@]}" -ne 0 ]]; then
 	echo "Required Arguments:"
 	for key in "${CMDARG_REQUIRED[@]}"
 	do
@@ -177,7 +177,7 @@ function cmdarg_usage
 	done
 	echo
     fi
-    if [[ "${#CMDARG_OPTIONAL[@]}" -eq 0 ]]; then
+    if [[ "${#CMDARG_OPTIONAL[@]}" -ne 0 ]]; then
 	echo "Optional Arguments":
 	for key in "${CMDARG_OPTIONAL[@]}"
 	do
@@ -417,11 +417,13 @@ function cmdarg_purge
     local arr
     arrays="cmdarg_cfg CMDARG CMDARG_REV CMDARG_OPTIONAL CMDARG_REQUIRED"
     arrays="$arrays CMDARG_DESC CMDARG_DEFAULT CMDARG_VALIDATORS CMDARG_INFO"
-    arrays="$arrays CMDARG_FLAGS CMDARG_TYPES"
+    arrays="$arrays CMDARG_FLAGS CMDARG_TYPES cmdarg_argv cmdarg_helpers"
     for arr in $arrays
     do
 	eval "$arr=()"
     done
+    cmdarg_helpers['describe']=cmdarg_describe_default
+    cmdarg_helpers['usage']=cmdarg_usage
     CMDARG_GETOPTLIST="h"
 }
 
diff --git a/tests/test_helpers.sh b/tests/test_helpers.sh
index d9f6bb6..1c1fe0e 100644
--- a/tests/test_helpers.sh
+++ b/tests/test_helpers.sh
@@ -39,12 +39,12 @@ function shunittest_test_describe_helper
 
 	echo "${opt}:${longopt}:${argtype}:${description}:${default}:${flags}:${validator}"
     }
-    cmdarg_helpers['describe']=describe
     function parser
     {
 	declare -a array
 	declare -A hash
 	cmdarg_purge
+	cmdarg_helpers['describe']=describe
 	cmdarg 's:' 'string' 'some string' '12345' always_succeed
 	cmdarg 'b' 'boolean' 'some boolean'
 	cmdarg 'a?[]' 'array' 'some array'
@@ -101,14 +101,13 @@ function shunittest_test_describe_and_usage_helper
 	done
     }
 
-    cmdarg_helpers['describe']=describe
-    cmdarg_helpers['usage']=usage
-
     function parser
     {
 	declare -a array
 	declare -A hash
 	cmdarg_purge
+	cmdarg_helpers['describe']=describe
+	cmdarg_helpers['usage']=usage
 	cmdarg 's:' 'string' 'some string' '12345' always_succeed
 	cmdarg 'b' 'boolean' 'some boolean'
 	cmdarg 'a?[]' 'array' 'some array'