tests: improve libsmartcols test

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

diff --git a/libsmartcols/samples/fromfile.c b/libsmartcols/samples/fromfile.c
index 361de01c7567bf279230f817bb33226570cecd95..ec12267a686f4d20481bb4dfb6b54bef49b8d422 100644 (file)
--- a/libsmartcols/samples/fromfile.c
+++ b/libsmartcols/samples/fromfile.c
@@ -156,6 +156,7 @@ int main(int argc, char *argv[])
                { "maxout", 0, 0, 'm' },
                { "column", 1, 0, 'c' },
                { "nlines", 1, 0, 'n' },
+               { "width",  1, 0, 'w' },
                { NULL, 0, 0, 0 },
        };
 
@@ -167,7 +168,7 @@ int main(int argc, char *argv[])
        if (!tb)
                err(EXIT_FAILURE, "failed to create output table");
 
-       while((c = getopt_long(argc, argv, "c:mn:", longopts, NULL)) != -1) {
+       while((c = getopt_long(argc, argv, "c:mn:w:", longopts, NULL)) != -1) {
                switch(c) {
                case 'c': /* add column from file */
                {
@@ -189,6 +190,10 @@ int main(int argc, char *argv[])
                case 'n':
                        nlines = strtou32_or_err(optarg, "failed to parse number of lines");
                        break;
+               case 'w':
+                       scols_table_set_termforce(tb, SCOLS_TERMFORCE_ALWAYS);
+                       scols_table_set_termwidth(tb, strtou32_or_err(optarg, "failed to parse terminal width"));
+                       break;
                default:
                        err(EXIT_FAILURE, "%s [-r|--random]\n", program_invocation_short_name);
                }

diff --git a/tests/expected/libsmartcols/fromfile-right-maxout b/tests/expected/libsmartcols/fromfile-right-maxout
new file mode 100644 (file)
index 0000000..3bcb65a
--- /dev/null
+++ b/tests/expected/libsmartcols/fromfile-right-maxout
@@ -0,0 +1,11 @@
+NAME                                                                         NUM
+aaaa                                                                           0
+bbb                                                                          100
+ccccc                                                                         21
+dddddd                                                                         3
+ee                                                                           411
+ffff                                                                        5111
+gggggg                                                                 678993321
+hhh                                                                      7666666
+iiiiii                                                                      8765
+jj                                                                        987456

diff --git a/tests/ts/libsmartcols/fromfile b/tests/ts/libsmartcols/fromfile
index 456ca436790a48893ae527a12466f72a2aa7ce62..b8297ae7deaa95006a8bf845ea7673e38ae1b0c4 100755 (executable)
--- a/tests/ts/libsmartcols/fromfile
+++ b/tests/ts/libsmartcols/fromfile
@@ -35,6 +35,15 @@ $TESTPROG --nlines 10 \
        >> $TS_OUTPUT 2>&1
 ts_finalize_subtest
 
+ts_init_subtest "right-maxout"
+$TESTPROG --nlines 10 --maxout --width 80\
+               --column $TS_SELF/files/col-name \
+       --column $TS_SELF/files/col-number \
+       $TS_SELF/files/data-string \
+       $TS_SELF/files/data-number \
+       >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
+
 ts_init_subtest "wrapnl"
 $TESTPROG --nlines 10 \
                --column $TS_SELF/files/col-name \