From: Karel Zak <kzak@redhat.com>
Date: Fri, 16 Sep 2016 11:37:08 +0000 (+0200)
Subject: tests: add libsmartcols JSON test
X-Git-Tag: v2.29-rc1~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0c3e7a013149a056866817c6d17aa605253b42d2;p=thirdparty%2Futil-linux.git

tests: add libsmartcols JSON test

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/expected/libsmartcols/fromfile-tree-end b/tests/expected/libsmartcols/fromfile-tree-end
new file mode 100644
index 0000000000..41aebff569
--- /dev/null
+++ b/tests/expected/libsmartcols/fromfile-tree-end
@@ -0,0 +1,11 @@
+ID PARENT STRINGS                                            TREE
+ 1      0 qqqqqqqqqqqqqqqqqX                                 aaaa
+ 2      1 dddddddddddddX                                     |-bbb
+ 5      2 ddddddddddddddddddddddddddX                        | |-ee
+ 6      2 jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjX | `-ffff
+ 3      1 ffffffffffffffffffffffffffffffffffffffffX          |-ccccc
+ 7      3 mmmmmmmmmmmmmmmmmmmX                               | `-gggggg
+ 8      7 lllllllllllllllllllllllllllllllllllllX             |   |-hhh
+ 9      8 yyyyyyyyyyyyyyyyyyyyyyyyyyyyX                      |   | `-iiiiii
+10      7 pppppppppX                                         |   `-jj
+ 4      1 ssssssssssX                                        `-dddddd
diff --git a/tests/expected/libsmartcols/fromfile-tree-json b/tests/expected/libsmartcols/fromfile-tree-json
new file mode 100644
index 0000000000..02aa986109
--- /dev/null
+++ b/tests/expected/libsmartcols/fromfile-tree-json
@@ -0,0 +1,29 @@
+{
+   "testtable": [
+      {"tree": "aaaa", "id": "1", "parent": "0", "strings": "qqqqqqqqqqqqqqqqqX",
+         "children": [
+            {"tree": "bbb", "id": "2", "parent": "1", "strings": "dddddddddddddX",
+               "children": [
+                  {"tree": "ee", "id": "5", "parent": "2", "strings": "ddddddddddddddddddddddddddX"},
+                  {"tree": "ffff", "id": "6", "parent": "2", "strings": "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjX"}
+               ]
+            },
+            {"tree": "ccccc", "id": "3", "parent": "1", "strings": "ffffffffffffffffffffffffffffffffffffffffX",
+               "children": [
+                  {"tree": "gggggg", "id": "7", "parent": "3", "strings": "mmmmmmmmmmmmmmmmmmmX",
+                     "children": [
+                        {"tree": "hhh", "id": "8", "parent": "7", "strings": "lllllllllllllllllllllllllllllllllllllX",
+                           "children": [
+                              {"tree": "iiiiii", "id": "9", "parent": "8", "strings": "yyyyyyyyyyyyyyyyyyyyyyyyyyyyX"}
+                           ]
+                        },
+                        {"tree": "jj", "id": "10", "parent": "7", "strings": "pppppppppX"}
+                     ]
+                  }
+               ]
+            },
+            {"tree": "dddddd", "id": "4", "parent": "1", "strings": "ssssssssssX"}
+         ]
+      }
+   ]
+}
diff --git a/tests/expected/libsmartcols/fromfile-tree-middle b/tests/expected/libsmartcols/fromfile-tree-middle
new file mode 100644
index 0000000000..b2183313ce
--- /dev/null
+++ b/tests/expected/libsmartcols/fromfile-tree-middle
@@ -0,0 +1,11 @@
+ID PARENT TREE           STRINGS
+ 1      0 aaaa           qqqqqqqqqqqqqqqqqX
+ 2      1 |-bbb          dddddddddddddX
+ 5      2 | |-ee         ddddddddddddddddddddddddddX
+ 6      2 | `-ffff       jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjX
+ 3      1 |-ccccc        ffffffffffffffffffffffffffffffffffffffffX
+ 7      3 | `-gggggg     mmmmmmmmmmmmmmmmmmmX
+ 8      7 |   |-hhh      lllllllllllllllllllllllllllllllllllllX
+ 9      8 |   | `-iiiiii yyyyyyyyyyyyyyyyyyyyyyyyyyyyX
+10      7 |   `-jj       pppppppppX
+ 4      1 `-dddddd       ssssssssssX
diff --git a/tests/ts/libsmartcols/fromfile b/tests/ts/libsmartcols/fromfile
index e57e63bc09..f9c270a70e 100755
--- a/tests/ts/libsmartcols/fromfile
+++ b/tests/ts/libsmartcols/fromfile
@@ -38,6 +38,51 @@ $TESTPROG --nlines 10 \
 	>> $TS_OUTPUT 2>&1
 ts_finalize_subtest
 
+ts_init_subtest "tree-json"
+$TESTPROG --nlines 10 --json \
+	--tree-id-column 1 \
+	--tree-parent-column 2 \
+	--column $TS_SELF/files/col-tree \
+	--column $TS_SELF/files/col-id \
+	--column $TS_SELF/files/col-parent \
+	--column $TS_SELF/files/col-string \
+	$TS_SELF/files/data-string \
+	$TS_SELF/files/data-id \
+	$TS_SELF/files/data-parent \
+	$TS_SELF/files/data-string-long \
+	>> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "tree-middle"
+$TESTPROG --nlines 10 \
+	--tree-id-column 0 \
+	--tree-parent-column 1 \
+	--column $TS_SELF/files/col-id \
+	--column $TS_SELF/files/col-parent \
+	--column $TS_SELF/files/col-tree \
+	--column $TS_SELF/files/col-string \
+	$TS_SELF/files/data-id \
+	$TS_SELF/files/data-parent \
+	$TS_SELF/files/data-string \
+	$TS_SELF/files/data-string-long \
+	>> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
+ts_init_subtest "tree-end"
+$TESTPROG --nlines 10 \
+	--tree-id-column 0 \
+	--tree-parent-column 1 \
+	--column $TS_SELF/files/col-id \
+	--column $TS_SELF/files/col-parent \
+	--column $TS_SELF/files/col-string \
+	--column $TS_SELF/files/col-tree \
+	$TS_SELF/files/data-id \
+	$TS_SELF/files/data-parent \
+	$TS_SELF/files/data-string-long \
+	$TS_SELF/files/data-string \
+	>> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
 ts_init_subtest "trunc"
 $TESTPROG --nlines 10 --width 40 \
        	--column $TS_SELF/files/col-name \