Various fixes and refactoring.

19 files changed, 50 insertions, 45 deletions

diff --git a/test/files/appendix_a/0011.answer b/test/files/appendix_a/0011.answer
index ad9e42d..14e9d30 100644
--- a/test/files/appendix_a/0011.answer
+++ b/test/files/appendix_a/0011.answer
@@ -1,2 +1,2 @@
 [TAG] value 2
-  [BSTR] len 9  value '010000000000000000'
+  [BSTR] len 9 value '010000000000000000'
diff --git a/test/files/appendix_a/0013.answer b/test/files/appendix_a/0013.answer
index aeaf0e1..d587edd 100644
--- a/test/files/appendix_a/0013.answer
+++ b/test/files/appendix_a/0013.answer
@@ -1,2 +1,2 @@
 [TAG] value 3
-  [BSTR] len 9  value '010000000000000000'
+  [BSTR] len 9 value '010000000000000000'
diff --git a/test/files/appendix_a/0047.answer b/test/files/appendix_a/0047.answer
index cece9bc..a86ac74 100644
--- a/test/files/appendix_a/0047.answer
+++ b/test/files/appendix_a/0047.answer
@@ -1,2 +1,2 @@
 [TAG] value 0
-  [STR] len 20  value '2013-03-21T20:04:00Z'
+  [STR] len 20 value '2013-03-21T20:04:00Z'
diff --git a/test/files/appendix_a/0050.answer b/test/files/appendix_a/0050.answer
index 6ac580d..2d468b6 100644
--- a/test/files/appendix_a/0050.answer
+++ b/test/files/appendix_a/0050.answer
@@ -1,2 +1,2 @@
 [TAG] value 23
-  [BSTR] len 4  value '01020304'
+  [BSTR] len 4 value '01020304'
diff --git a/test/files/appendix_a/0051.answer b/test/files/appendix_a/0051.answer
index 5ca5cc2..d33d6de 100644
--- a/test/files/appendix_a/0051.answer
+++ b/test/files/appendix_a/0051.answer
@@ -1,2 +1,2 @@
 [TAG] value 24
-  [BSTR] len 5  value '6449455446'
+  [BSTR] len 5 value '6449455446'
diff --git a/test/files/appendix_a/0052.answer b/test/files/appendix_a/0052.answer
index 1d701cd..f6fe9e1 100644
--- a/test/files/appendix_a/0052.answer
+++ b/test/files/appendix_a/0052.answer
@@ -1,2 +1,2 @@
 [TAG] value 32
-  [STR] len 22  value 'http://www.example.com'
+  [STR] len 22 value 'http://www.example.com'
diff --git a/test/files/appendix_a/0053.answer b/test/files/appendix_a/0053.answer
index e7dd1ce..8108de4 100644
--- a/test/files/appendix_a/0053.answer
+++ b/test/files/appendix_a/0053.answer
@@ -1 +1 @@
-[BSTR] len 0  value ''
+[BSTR] len 0 value ''
diff --git a/test/files/appendix_a/0054.answer b/test/files/appendix_a/0054.answer
index 2e61645..03b483d 100644
--- a/test/files/appendix_a/0054.answer
+++ b/test/files/appendix_a/0054.answer
@@ -1 +1 @@
-[BSTR] len 4  value '01020304'
+[BSTR] len 4 value '01020304'
diff --git a/test/files/appendix_a/0055.answer b/test/files/appendix_a/0055.answer
index f0c90c5..706df0b 100644
--- a/test/files/appendix_a/0055.answer
+++ b/test/files/appendix_a/0055.answer
@@ -1 +1 @@
-[STR] len 0  value ''
+[STR] len 0 value ''
diff --git a/test/files/appendix_a/0056.answer b/test/files/appendix_a/0056.answer
index 369fb4e..ef45a4f 100644
--- a/test/files/appendix_a/0056.answer
+++ b/test/files/appendix_a/0056.answer
@@ -1 +1 @@
-[STR] len 1  value 'a'
+[STR] len 1 value 'a'
diff --git a/test/files/appendix_a/0057.answer b/test/files/appendix_a/0057.answer
index edaedad..4211b81 100644
--- a/test/files/appendix_a/0057.answer
+++ b/test/files/appendix_a/0057.answer
@@ -1 +1 @@
-[STR] len 4  value 'IETF'
+[STR] len 4 value 'IETF'
diff --git a/test/files/appendix_a/0058.answer b/test/files/appendix_a/0058.answer
index 6de9af7..81aeb73 100644
--- a/test/files/appendix_a/0058.answer
+++ b/test/files/appendix_a/0058.answer
@@ -1 +1 @@
-[STR] len 2  value '"\'
+[STR] len 2 value '"\'
diff --git a/test/files/appendix_a/0059.answer b/test/files/appendix_a/0059.answer
index 9cdc70a..1c01793 100644
--- a/test/files/appendix_a/0059.answer
+++ b/test/files/appendix_a/0059.answer
@@ -1 +1 @@
-[STR] len 2  value 'ü'
+[STR] len 2 value 'ü'
diff --git a/test/files/appendix_a/0060.answer b/test/files/appendix_a/0060.answer
index 0f1c3f1..d6774b3 100644
--- a/test/files/appendix_a/0060.answer
+++ b/test/files/appendix_a/0060.answer
@@ -1 +1 @@
-[STR] len 3  value '水'
+[STR] len 3 value '水'
diff --git a/test/files/appendix_a/0061.answer b/test/files/appendix_a/0061.answer
index dedc0a7..b866c52 100644
--- a/test/files/appendix_a/0061.answer
+++ b/test/files/appendix_a/0061.answer
@@ -1 +1 @@
-[STR] len 4  value '𐅑'
+[STR] len 4 value '𐅑'
diff --git a/test/files/appendix_a/0068.answer b/test/files/appendix_a/0068.answer
index e92f866..e21e37a 100644
--- a/test/files/appendix_a/0068.answer
+++ b/test/files/appendix_a/0068.answer
@@ -1,7 +1,7 @@
 [MAP] len 2 
-    key[0]: [STR] len 1  value 'a'
+    key[0]: [STR] len 1 value 'a'
     val[0]: [UINT] value 1
-    key[1]: [STR] len 1  value 'b'
+    key[1]: [STR] len 1 value 'b'
     val[1]: [ARRAY] len 2 
       [UINT] value 2
       [UINT] value 3
diff --git a/test/files/appendix_a/0069.answer b/test/files/appendix_a/0069.answer
index fe20a7b..bfa61f8 100644
--- a/test/files/appendix_a/0069.answer
+++ b/test/files/appendix_a/0069.answer
@@ -1,5 +1,5 @@
 [ARRAY] len 2 
-  [STR] len 1  value 'a'
+  [STR] len 1 value 'a'
   [MAP] len 1 
-      key[0]: [STR] len 1  value 'b'
-      val[0]: [STR] len 1  value 'c'
+      key[0]: [STR] len 1 value 'b'
+      val[0]: [STR] len 1 value 'c'
diff --git a/test/files/appendix_a/0070.answer b/test/files/appendix_a/0070.answer
index 52b3a8e..5d87bb8 100644
--- a/test/files/appendix_a/0070.answer
+++ b/test/files/appendix_a/0070.answer
@@ -1,11 +1,11 @@
 [MAP] len 5 
-    key[0]: [STR] len 1  value 'a'
-    val[0]: [STR] len 1  value 'A'
-    key[1]: [STR] len 1  value 'b'
-    val[1]: [STR] len 1  value 'B'
-    key[2]: [STR] len 1  value 'c'
-    val[2]: [STR] len 1  value 'C'
-    key[3]: [STR] len 1  value 'd'
-    val[3]: [STR] len 1  value 'D'
-    key[4]: [STR] len 1  value 'e'
-    val[4]: [STR] len 1  value 'E'
+    key[0]: [STR] len 1 value 'a'
+    val[0]: [STR] len 1 value 'A'
+    key[1]: [STR] len 1 value 'b'
+    val[1]: [STR] len 1 value 'B'
+    key[2]: [STR] len 1 value 'c'
+    val[2]: [STR] len 1 value 'C'
+    key[3]: [STR] len 1 value 'd'
+    val[3]: [STR] len 1 value 'D'
+    key[4]: [STR] len 1 value 'e'
+    val[4]: [STR] len 1 value 'E'
diff --git a/test/runtests.sh b/test/runtests.sh
index 96de614..29569d7 100755
--- a/test/runtests.sh
+++ b/test/runtests.sh
@@ -20,21 +20,26 @@ echo "============================== APPENDIX A =============================="
 for f in files/appendix_a/*.bin; do
   answer_file=${f%.bin}.answer
   result_file=${f%.bin}.result
-  
-  ../bin/ecbor-describe $f > $result_file 2>/dev/null
-  rc=$?
-
-  if [ ! -f $result_file ] || [ ! -f $answer_file ] || [ "$(diff $answer_file $result_file 2>/dev/null)" != "" ]; then
-    fail=$(($fail + 1))
-    status=$FAIL_MSG
-  else
-    pass=$(($pass + 1))
-    status=$PASS_MSG
-  fi
-  
-  machine_indented=$(printf '%-67s' "$f")
-  machine_indented=${machine_indented// /.}
-  printf "%s %s\n" "$machine_indented" "$status"
+
+  declare -a opts=("" "--tree")
+
+  for opt in "${opts[@]}"; do
+    ../bin/ecbor-describe $opt $f > $result_file 2>/dev/null
+    rc=$?
+
+    if [ ! -f $result_file ] || [ ! -f $answer_file ] || [ "$(diff $answer_file $result_file 2>/dev/null)" != "" ]; then
+      fail=$(($fail + 1))
+      status=$FAIL_MSG
+    else
+      pass=$(($pass + 1))
+      status=$PASS_MSG
+    fi
+    
+    test_name="$f($opt)"
+    machine_indented=$(printf '%-67s' "$test_name")
+    machine_indented=${machine_indented// /.}
+    printf "%s %s\n" "$machine_indented" "$status"
+  done
 done
 echo "========================================================================"
 echo "Passed / Failed: ${pass}/${fail}"