X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Ftable-test.t;h=4caf6485b7eb549a8acbfffcc4e1f4adb63a1ad5;hb=9689a6aa2bb0815ab95ea679d0d298acc4c5cd5b;hp=6a0f54a2ca72d026805c3288c2c0c62de436a69e;hpb=6df8b39888326f1e7d8b1ab780699ff72dcc68d9;p=libucw.git

diff --git a/ucw/table-test.t b/ucw/table-test.t
index 6a0f54a2..4caf6485 100644
--- a/ucw/table-test.t
+++ b/ucw/table-test.t
@@ -9,65 +9,84 @@ EOF
 Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str
 Out <<EOF
 col3_bool	            col0_str
-     true	         sdsdf,aaaaa
-    false	          test,bbbbb
+     true	               sdsdf
+    false	                test
 EOF
 
 
 Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str
 Out <<EOF
 col3_bool	            col0_str
-     true	         sdsdf,aaaaa
-    false	          test,bbbbb
+     true	               sdsdf
+    false	                test
 EOF
 
 
 Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double
 Out <<EOF
 col3_bool	            col0_str	col4_double
-     true	         sdsdf,aaaaa	       1.50
-    false	          test,bbbbb	       1.50
+     true	               sdsdf	       1.50
+    false	                test	       1.50
 EOF
 
 
 Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:;' -T fmt:machine
 Out <<EOF
 col3_bool;col0_str;col4_double
-true;sdsdf,aaaaa;1.50
-false;test,bbbbb;1.50
+true;sdsdf;1.50
+false;test;1.50
 EOF
 
 
 Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:;' -T fmt:machine -T header:1
 Out <<EOF
 col3_bool;col0_str;col4_double
-true;sdsdf,aaaaa;1.50
-false;test,bbbbb;1.50
+true;sdsdf;1.50
+false;test;1.50
 EOF
 
 
 Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:;' -T fmt:machine -T header:0
 Out <<EOF
-true;sdsdf,aaaaa;1.50
-false;test,bbbbb;1.50
+true;sdsdf;1.50
+false;test;1.50
 EOF
 
 Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:;' -T fmt:machine -T noheader
 Out <<EOF
-true;sdsdf,aaaaa;1.50
-false;test,bbbbb;1.50
+true;sdsdf;1.50
+false;test;1.50
 EOF
 
 Run: ../obj/ucw/table-test -T cols:col3_bool,col0_str,col4_double -T 'col-delim:AHOJ' -T fmt:machine -T noheader
 Out <<EOF
-trueAHOJsdsdf,aaaaaAHOJ1.50
-falseAHOJtest,bbbbbAHOJ1.50
+trueAHOJsdsdfAHOJ1.50
+falseAHOJtestAHOJ1.50
 EOF
 
+Run: ../obj/ucw/table-test -T 'cols:*' -T fmt:blockline
+Out <<EOF
+col0_str: sdsdf
+col1_int: 10000
+col2_uint: XXX-22222
+col3_bool: true
+col4_double: 1.50
+col5_size: 5368709120
+col6_timestamp: 1404305876
+
+col0_str: test
+col1_int: -100
+col2_uint: 100
+col3_bool: false
+col4_double: 1.50
+col5_size: 2147483648
+col6_timestamp: 1404305909
+
+EOF
 
 Run: ../obj/ucw/table-test -n
 Out <<EOF
-Tableprinter option parser returned: 'Unknown table column 'test_col0_str', possible column names are: col0_str, col1_int, col2_uint, col3_bool, col4_double.'.
+Tableprinter option parser returned: 'Unknown table column 'test_col0_str', possible column names are: col0_str, col1_int, col2_uint, col3_bool, col4_double, col5_size, col6_timestamp.'.
 EOF
 
 
@@ -81,8 +100,8 @@ EOF
 
 Run: ../obj/ucw/table-test -i
 Out <<EOF
-Tableprinter option parser returned error: "Tableprinter: invalid option: 'invalid:option'.".
-Tableprinter option parser returned error: "Tableprinter: invalid option: 'invalid'.".
+Tableprinter option parser returned error: "Invalid option: 'invalid:option'.".
+Tableprinter option parser returned error: "Invalid option: 'invalid'.".
 setting key: novaluekey; value: (null)
 setting key: valuekey; value: value
 EOF