From 298a9eaf659bdddff7145e9f800b3a0b712fc0a2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Vojt=C4=9Bch=20Eichler?= <vojta.eich@gmail.com>
Date: Mon, 4 Oct 2021 16:46:22 +0200
Subject: [PATCH] tests: split test into subtest

---
 tests/expected/col/io                 | 238 --------------------------
 tests/expected/col/io-allocate-here   |   2 +
 tests/expected/col/io-cr              |   1 +
 tests/expected/col/io-cs-alternate    |   1 +
 tests/expected/col/io-cs-normal       |   2 +
 tests/expected/col/io-esc-backspace   |   1 +
 tests/expected/col/io-esc-tab         |   2 +
 tests/expected/col/io-flushing        | 199 +++++++++++++++++++++
 tests/expected/col/io-half-line       |   2 +
 tests/expected/col/io-reverse-lf      |   2 +
 tests/expected/col/io-so-si           |   0
 tests/expected/col/io-tab-backspace   |   1 +
 tests/expected/col/io-trailing-spaces |   2 +
 tests/expected/col/io-various-spaces  |   1 +
 tests/expected/col/io-vt1             |   3 +
 tests/expected/col/io-vt2             |   5 +
 tests/ts/col/io                       |  45 +++--
 17 files changed, 254 insertions(+), 253 deletions(-)
 create mode 100644 tests/expected/col/io-allocate-here
 create mode 100644 tests/expected/col/io-cr
 create mode 100644 tests/expected/col/io-cs-alternate
 create mode 100644 tests/expected/col/io-cs-normal
 create mode 100644 tests/expected/col/io-esc-backspace
 create mode 100644 tests/expected/col/io-esc-tab
 create mode 100644 tests/expected/col/io-flushing
 create mode 100644 tests/expected/col/io-half-line
 create mode 100644 tests/expected/col/io-reverse-lf
 create mode 100644 tests/expected/col/io-so-si
 create mode 100644 tests/expected/col/io-tab-backspace
 create mode 100644 tests/expected/col/io-trailing-spaces
 create mode 100644 tests/expected/col/io-various-spaces
 create mode 100644 tests/expected/col/io-vt1
 create mode 100644 tests/expected/col/io-vt2

diff --git a/tests/expected/col/io b/tests/expected/col/io
index d74a8586dd..e69de29bb2 100644
--- a/tests/expected/col/io
+++ b/tests/expected/col/io
@@ -1,238 +0,0 @@
-trailing spaces
-1
-2
-tab backspace
-1      2
-various spaces
-1	2
-cr
-12
-vt1
-1
-243
-5
-vt2
-  c
-
- b
-
-a
-reverse lf
-13
-2
-so si
-esc-tab
-
-1
-esc-backspace
-12
-cs_normal
-	0
-<B
-cs_alternate
-1	2
-allocate here
-	2
-13
-half line
-9
1
-9flushing
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-52
-53
-54
-55
-56
-57
-58
-59
-60
-61
-62
-63
-64
-65
-66
-67
-68
-69
-70
-71
-72
-73
-74
-75
-76
-77
-78
-79
-80
-81
-82
-83
-84
-85
-86
-87
-88
-89
-90
-91
-92
-93
-94
-95
-96
-97
-98
-99
-100
-101
-102
-103
-104
-105
-106
-107
-108
-109
-110
-111
-112
-113
-114
-115
-116
-117
-118
-119
-120
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
-155
-156
-157
-158
-159
-160
-161
-162
-163
-164
-165
-166
-167
-168
-169
-170
-171
-172
-173
-174
-175
-176
-177
-178
-179
-180
-181
-182
-183
-184
-185
-186
-187
-188
-189
-190
-191
-192
-193
-194
-195
-196
-197
-198
-199
diff --git a/tests/expected/col/io-allocate-here b/tests/expected/col/io-allocate-here
new file mode 100644
index 0000000000..a8a72ea83a
--- /dev/null
+++ b/tests/expected/col/io-allocate-here
@@ -0,0 +1,2 @@
+	2
+13
diff --git a/tests/expected/col/io-cr b/tests/expected/col/io-cr
new file mode 100644
index 0000000000..68b1bf47e8
--- /dev/null
+++ b/tests/expected/col/io-cr
@@ -0,0 +1 @@
+12
diff --git a/tests/expected/col/io-cs-alternate b/tests/expected/col/io-cs-alternate
new file mode 100644
index 0000000000..ef71bac6e7
--- /dev/null
+++ b/tests/expected/col/io-cs-alternate
@@ -0,0 +1 @@
+1	2
diff --git a/tests/expected/col/io-cs-normal b/tests/expected/col/io-cs-normal
new file mode 100644
index 0000000000..8e508a0737
--- /dev/null
+++ b/tests/expected/col/io-cs-normal
@@ -0,0 +1,2 @@
+	0
+<B
diff --git a/tests/expected/col/io-esc-backspace b/tests/expected/col/io-esc-backspace
new file mode 100644
index 0000000000..48082f72f0
--- /dev/null
+++ b/tests/expected/col/io-esc-backspace
@@ -0,0 +1 @@
+12
diff --git a/tests/expected/col/io-esc-tab b/tests/expected/col/io-esc-tab
new file mode 100644
index 0000000000..a464d9da74
--- /dev/null
+++ b/tests/expected/col/io-esc-tab
@@ -0,0 +1,2 @@
+
+1
diff --git a/tests/expected/col/io-flushing b/tests/expected/col/io-flushing
new file mode 100644
index 0000000000..ed94203a6a
--- /dev/null
+++ b/tests/expected/col/io-flushing
@@ -0,0 +1,199 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123
+124
+125
+126
+127
+128
+129
+130
+131
+132
+133
+134
+135
+136
+137
+138
+139
+140
+141
+142
+143
+144
+145
+146
+147
+148
+149
+150
+151
+152
+153
+154
+155
+156
+157
+158
+159
+160
+161
+162
+163
+164
+165
+166
+167
+168
+169
+170
+171
+172
+173
+174
+175
+176
+177
+178
+179
+180
+181
+182
+183
+184
+185
+186
+187
+188
+189
+190
+191
+192
+193
+194
+195
+196
+197
+198
+199
diff --git a/tests/expected/col/io-half-line b/tests/expected/col/io-half-line
new file mode 100644
index 0000000000..5ae15e22f0
--- /dev/null
+++ b/tests/expected/col/io-half-line
@@ -0,0 +1,2 @@
+9
1
+9
\ No newline at end of file
diff --git a/tests/expected/col/io-reverse-lf b/tests/expected/col/io-reverse-lf
new file mode 100644
index 0000000000..abee444d94
--- /dev/null
+++ b/tests/expected/col/io-reverse-lf
@@ -0,0 +1,2 @@
+13
+2
diff --git a/tests/expected/col/io-so-si b/tests/expected/col/io-so-si
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/expected/col/io-tab-backspace b/tests/expected/col/io-tab-backspace
new file mode 100644
index 0000000000..2f80e61211
--- /dev/null
+++ b/tests/expected/col/io-tab-backspace
@@ -0,0 +1 @@
+1      2
diff --git a/tests/expected/col/io-trailing-spaces b/tests/expected/col/io-trailing-spaces
new file mode 100644
index 0000000000..1191247b6d
--- /dev/null
+++ b/tests/expected/col/io-trailing-spaces
@@ -0,0 +1,2 @@
+1
+2
diff --git a/tests/expected/col/io-various-spaces b/tests/expected/col/io-various-spaces
new file mode 100644
index 0000000000..9874d6464a
--- /dev/null
+++ b/tests/expected/col/io-various-spaces
@@ -0,0 +1 @@
+1	2
diff --git a/tests/expected/col/io-vt1 b/tests/expected/col/io-vt1
new file mode 100644
index 0000000000..ff8730b75d
--- /dev/null
+++ b/tests/expected/col/io-vt1
@@ -0,0 +1,3 @@
+1
+243
+5
diff --git a/tests/expected/col/io-vt2 b/tests/expected/col/io-vt2
new file mode 100644
index 0000000000..4a5062e056
--- /dev/null
+++ b/tests/expected/col/io-vt2
@@ -0,0 +1,5 @@
+  c
+
+ b
+
+a
diff --git a/tests/ts/col/io b/tests/ts/col/io
index 62f6a81579..c7e0d09d80 100755
--- a/tests/ts/col/io
+++ b/tests/ts/col/io
@@ -23,49 +23,64 @@ ts_init "$*"
 
 ts_check_test_command "$TS_CMD_COL"
 
-ts_log "trailing spaces"
+ts_init_subtest "trailing-spaces"
 printf "1 \t\n2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "tab backspace"
+ts_init_subtest "tab-backspace"
 printf "1\t\x082\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "various spaces"
+ts_init_subtest "various-spaces"
 printf "1 \t\f2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "cr"
+ts_init_subtest "cr"
 printf "1\r2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "vt1"
+ts_init_subtest "vt1"
 printf "1\n23\v\n4\n5\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "vt2"
+ts_init_subtest "vt2"
 printf "a\v\vb\v\vc" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "reverse lf"
+ts_init_subtest "reverse-lf"
 printf "1\n2\e\x073\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "so si"
+ts_init_subtest "so-si"
 printf "\x0e\x0f" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "esc-tab"
+ts_init_subtest "esc-tab"
 printf "\e\t\b1\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "esc-backspace"
+ts_init_subtest "esc-backspace"
 printf "1\e\b2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "cs_normal"
+ts_init_subtest "cs-normal"
 printf "<B\x10\x0E\t\v\x100" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "cs_alternate"
+ts_init_subtest "cs-alternate"
 printf "1\t\x0E2\n" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "allocate here"
+ts_init_subtest "allocate-here"
 printf "1\t\v2\t\n3" | ts_run $TS_CMD_COL >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "half line"
+ts_init_subtest "half-line"
 printf "\e\t\b1\n" | ts_run $TS_CMD_COL --fine >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
-ts_log "flushing"
+ts_init_subtest "flushing"
 seq 1 199 | ts_run $TS_CMD_COL --lines 8 >> $TS_OUTPUT 2>&1
+ts_finalize_subtest
 
 ts_finalize
-- 
2.47.3