FIX tap plan should include skipped and pending tests

According to this example extracted from tap documentation, the
skipped and pending tests should be included in the plan:
```
TAP version 14
1..2

ok 1 - do it later # Skipped

ok 2 - works on windows # Skipped: only run on windows
```

Author: pgrange

bash_unit

@@ -236,25 +236,32 @@ maybe_shuffle() {
 run_tests() {
   local failure=0
 
-  for pending_test in $(set | "$GREP"  -E '^(pending|todo).* \(\)' | "$GREP" -E "$test_pattern" | "$SED" -e 's: .*::')
-  do
-    notify_test_starting "$pending_test"
-    notify_test_pending "$pending_test"
-  done
-
+  local pending_tests=$(set | "$GREP"  -E '^(pending|todo).* \(\)' | "$GREP" -E "$test_pattern" | "$SED" -e 's: .*::')
   if [[ -n "$skip_pattern" ]]
   then
-    for skipped_test in $(set | "$GREP"  -E '^test.* \(\)' | "$GREP" -E "$test_pattern" | "$GREP" -E "$skip_pattern" | "$SED" -e 's: .*::')
-    do
-      notify_test_starting "$skipped_test"
-      notify_test_skipped "$skipped_test"
-    done
+    local skipped_tests=$(set | "$GREP"  -E '^test.* \(\)' | "$GREP" -E "$test_pattern" | "$GREP" -E "$skip_pattern" | "$SED" -e 's: .*::')
     local tests_to_run="$(set | "$GREP"  -E '^test.* \(\)' | "$GREP" -E "$test_pattern" | "$GREP" -v -E "$skip_pattern" | "$SED" -e 's: .*::' | maybe_shuffle)"
   else
+    local skipped_tests=""
     local tests_to_run="$(set | "$GREP"  -E '^test.* \(\)' | "$GREP" -E "$test_pattern" |  "$SED" -e 's: .*::' | maybe_shuffle)"
   fi
 
-  test_count=$(cat "${TEMPFILE}")
+  local test_count=$(cat "${TEMPFILE}")
+  test_count=$((test_count + $(count "$pending_tests") + $(count "$tests_to_run") + $(count "$skipped_tests")))
+  echo "${test_count}" > "${TEMPFILE}"
+
+  for pending_test in $pending_tests
+  do
+    notify_test_starting "$pending_test"
+    notify_test_pending "$pending_test"
+  done
+
+  for skipped_test in $skipped_tests
+  do
+    notify_test_starting "$skipped_test"
+    notify_test_skipped "$skipped_test"
+  done
+
   for test in $tests_to_run
   do
     (
@@ -265,9 +272,7 @@ run_tests() {
       exit $status
     )
     failure=$(( $? || failure))
-    ((test_count++))
   done
-  echo "${test_count}" > "${TEMPFILE}"
 
   return $failure
 }
@@ -484,6 +489,15 @@ skip_if() {
   fi
 }
 
+count() {
+  local tests="$1"
+  if [[ -z "$tests" ]]; then
+    echo 0
+  else
+    echo "$tests" | wc -l
+  fi
+}
+
 output_format=text
 verbosity=normal
 test_pattern=""
@@ -570,13 +584,13 @@ do
   )
   failure=$(( $? || failure))
 done
-  
+
 if ((failure))
 then
-  notify_suites_failed $(cat "${TEMPFILE}")
+  notify_suites_failed "$(cat "${TEMPFILE}")"
 else
-  notify_suites_succeded $(cat "${TEMPFILE}")
+  notify_suites_succeded "$(cat "${TEMPFILE}")"
 fi
 
-unlink $TEMPFILE
+unlink "$TEMPFILE"
 exit $failure

tests/test_tap_format

@@ -42,7 +42,7 @@ test_tap_format_for_one_pending_test() {
 "\
 # Running tests in code
 ok - pending_not_yet_implemented # todo test to be written
-1..0" \
+1..1" \
 "$(bash_unit_out_for_code <<EOF
   pending_not_yet_implemented() {
     assert false
@@ -51,6 +51,22 @@ EOF
 )"
 }
 
+test_tap_format_with_skipped_tests() {
+  bash_unit_output="$(bash_unit_out_for_code <<EOF
+    test_one() { echo -n ; }
+    test_two() { fail ; }
+    skip_if true two
+EOF
+  )"
+
+  assert_equals "\
+# Running tests in code
+ok - test_two # skip test not run
+ok - test_one
+1..2" \
+  "$bash_unit_output"
+}
+
 test_tap_format_for_failing_test_with_stdout_stderr_outputs() {
    assert_equals \
 "\