fix: conform with existing pattern of handling oniguruma in tests

Author: yertto

Makefile.am

@@ -202,7 +202,7 @@ endif
 AM_CFLAGS += $(onig_CFLAGS)
 
 if WITH_ONIGURUMA
-TESTS += tests/onigtest tests/manonigtest
+TESTS += tests/jqonigtest tests/onigtest tests/manonigtest
 endif
 
 ### Packaging
@@ -232,7 +232,8 @@ EXTRA_DIST = $(DOC_FILES) $(man_MANS) $(TESTS) $(TEST_LOG_COMPILER)     \
         tests/onig.supp tests/local.supp                                \
         tests/setup tests/torture/input0.json                           \
         tests/optional.test tests/man.test tests/manonig.test           \
-        tests/jq.test tests/onig.test tests/base64.test tests/uri.test  \
+        tests/jq.test tests/jqonig.test tests/onig.test                 \
+        tests/base64.test tests/uri.test                                \
         tests/utf8-truncate.jq tests/jq-f-test.sh                       \
         tests/no-main-program.jq tests/yes-main-program.jq
 

docs/content/manual/v1.8/manual.yml

@@ -2188,6 +2188,11 @@ sections:
             backslash (ascii `0x5c`) will be output as escape sequences
             `\n`, `\r`, `\t`, `\\` respectively.
 
+          * `@table`:
+
+            The input must be an array of objects or values, and it is
+            rendered as an ASCII table.
+
           * `@sh`:
 
             The input is escaped suitable for use in a command-line
@@ -2236,6 +2241,10 @@ sections:
             input: '"VGhpcyBpcyBhIG1lc3NhZ2U="'
             output: ['"This is a message"']
 
+          - program: '@table'
+            input: '[{"a": 1, "b": 2}, {"a": "one", "b": "two"}]'
+            output: ['"TESTING FAILURE CASE: NOT THE TABLE YOU WERE LOOKING FOR"']
+
       - title: "Dates"
         body: |
 

tests/jq.test

@@ -82,18 +82,15 @@ null
 "ISgpPD4mJyIJ"
 "!()<>&'\"\t"
 
-# table with headings, rows & color_words
+# table from array of values
 @table
-{"headings":["false","bartrue","baz"],"rows":[["true","false","TRUE"],[1,null,0],["true false","FALSE TRUE","falsetrue"]],"color_words":["(no|NO|false|FALSE)","(yes|YES|true|TRUE)","null"]}
-# jqtest oniguruma:enabled
-"┌──────────┬──────────┬─────────┐\n│\u001b[1mfalse\u001b[0m     │\u001b[1mbartrue\u001b[0m   │\u001b[1mbaz\u001b[0m      │\n├──────────┼──────────┼─────────┤\n│\u001b[1;32mtrue\u001b[0m      │\u001b[1;31mfalse\u001b[0m     │\u001b[1;32mTRUE\u001b[0m     │\n│1         │\u001b[1;33mnull\u001b[0m      │0        │\n│\u001b[1;32mtrue\u001b[0m \u001b[1;31mfalse\u001b[0m│\u001b[1;31mFALSE\u001b[0m \u001b[1;32mTRUE\u001b[0m│falsetrue│\n└──────────┴──────────┴─────────┘"
-# jqtest oniguruma:disabled
-"┌──────────┬──────────┬─────────┐\n│\u001b[1mfalse\u001b[0m     │\u001b[1mbartrue\u001b[0m   │\u001b[1mbaz\u001b[0m      │\n├──────────┼──────────┼─────────┤\n│true      │false     │TRUE     │\n│1         │null      │0        │\n│true false│FALSE TRUE│falsetrue│\n└──────────┴──────────┴─────────┘"
+[["one","two", "three"],[1, null, "Three"],["", 2,false]]
+"┌───┬────┬─────┐\n│\u001b[1mone\u001b[0m│\u001b[1mtwo\u001b[0m │\u001b[1mthree\u001b[0m│\n│1  │null│Three│\n│   │2   │false│\n└───┴────┴─────┘"
 
 # table from array of objects
 @table
-[{"false":"true","bartrue":"false","baz":"TRUE"},{"false":1,"bartrue":null,"baz":0},{"false":"true false","bartrue":"FALSE TRUE","baz":"falsetrue"}]
-"┌──────────┬──────────┬─────────┐\n│\u001b[1mfalse\u001b[0m     │\u001b[1mbartrue\u001b[0m   │\u001b[1mbaz\u001b[0m      │\n├──────────┼──────────┼─────────┤\n│true      │false     │TRUE     │\n│1         │null      │0        │\n│true false│FALSE TRUE│falsetrue│\n└──────────┴──────────┴─────────┘"
+[{"one":1,"two":null,"three":"Three"},{"two":2,"three":false}]
+"┌────┬────┬─────┐\n│\u001b[1mone\u001b[0m │\u001b[1mtwo\u001b[0m │\u001b[1mthree\u001b[0m│\n├────┼────┼─────┤\n│1   │null│Three│\n│null│2   │false│\n└────┴────┴─────┘"
 
 # regression test for #436
 @base64

tests/jqonig.test

@@ -0,0 +1,4 @@
+# table with headings, rows & color_words
+@table
+{"headings":["false","bartrue","baz"],"rows":[["true","false","TRUE"],[1,null,0],["true false","FALSE TRUE","falsetrue"]],"color_words":["(no|NO|false|FALSE)","(yes|YES|true|TRUE)","null"]}
+"┌──────────┬──────────┬─────────┐\n│\u001b[1mfalse\u001b[0m     │\u001b[1mbartrue\u001b[0m   │\u001b[1mbaz\u001b[0m      │\n├──────────┼──────────┼─────────┤\n│\u001b[1;32mtrue\u001b[0m      │\u001b[1;31mfalse\u001b[0m     │\u001b[1;32mTRUE\u001b[0m     │\n│1         │\u001b[1;33mnull\u001b[0m      │0        │\n│\u001b[1;32mtrue\u001b[0m \u001b[1;31mfalse\u001b[0m│\u001b[1;31mFALSE\u001b[0m \u001b[1;32mTRUE\u001b[0m│falsetrue│\n└──────────┴──────────┴─────────┘"

tests/jqonigtest

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+. "${0%/*}/setup" "$@"
+
+$VALGRIND $Q $JQ -L "$mods" --run-tests $JQTESTDIR/jqonig.test

tests/jqtest

@@ -2,4 +2,4 @@
 
 . "${0%/*}/setup" "$@"
 
-test_file | $VALGRIND $Q $JQ -L "$mods" --run-tests
+$VALGRIND $Q $JQ -L "$mods" --run-tests $JQTESTDIR/jq.test

tests/setup

@@ -45,43 +45,3 @@ if [ -z "$d" ]; then
     echo "Your OS does not support mktemp(1) -d" 1>&2
     exit 1
 fi
-
-jq_oniguruma_installed() {
-    $JQ --exit-status --null-input '"" | test("")' > /dev/null 2>&1
-}
-
-if ! command -v awk > /dev/null; then
-  echo "awk is required but not found in PATH."
-  exit 1
-else
-  echo "XXXXXXXXXXXX awk was found"
-fi
-
-if [ ! -f "$JQTESTDIR/${TESTFILE:-jq.test}" ]; then
-  echo "Test file '$JQTESTDIR/${TESTFILE:-jq.test}' not found."
-  exit 1
-else
-  echo "XXXXXXXXXXXX jq.test was found"
-fi
-test_file() {
-    status="$(jq_oniguruma_installed && echo enabled || echo disabled)"
-    skip=0
-    while IFS= read -r line; do
-        if [ "$skip" -eq 1 ]; then skip=0; continue; fi
-        case "$line" in
-            "# jqtest oniguruma:"*)
-                marker_status="${line#\# jqtest oniguruma:}"
-                # Remove leading and trailing whitespace (POSIX shell way)
-                marker_status="${marker_status#"${marker_status%%[![:space:]]*}"}"
-                marker_status="${marker_status%"${marker_status##*[![:space:]]}"}"
-                if [ "$marker_status" = "$status" ]; then
-                    continue
-                else
-                    skip=1
-                    continue
-                fi
-                ;;
-        esac
-        printf "%s\n" "$line"
-    done < "$JQTESTDIR/${TESTFILE:-jq.test}"
-}