Add more tests for better code coverage:

What happens if begin and end are reversed?  What if they are equal?

While there, add a few comments on the purpose of the tests.

diff --git a/regress/usr.bin/jot/regress.dbbd.out b/regress/usr.bin/jot/regress.dbbd.out
new file mode 100644 (file)
index 0000000..f599e28
--- /dev/null
+++ b/regress/usr.bin/jot/regress.dbbd.out
@@ -0,0 +1 @@
+10

diff --git a/regress/usr.bin/jot/regress.dbbh.out b/regress/usr.bin/jot/regress.dbbh.out
new file mode 100644 (file)
index 0000000..f599e28
--- /dev/null
+++ b/regress/usr.bin/jot/regress.dbbh.out
@@ -0,0 +1 @@
+10

diff --git a/regress/usr.bin/jot/regress.ddhd3.out b/regress/usr.bin/jot/regress.ddhd3.out
new file mode 100644 (file)
index 0000000..621a466
--- /dev/null
+++ b/regress/usr.bin/jot/regress.ddhd3.out
@@ -0,0 +1,100 @@
+-79
+-78
+-77
+-76
+-75
+-74
+-73
+-72
+-71
+-70
+-69
+-68
+-67
+-66
+-65
+-64
+-63
+-62
+-61
+-60
+-59
+-58
+-57
+-56
+-55
+-54
+-53
+-52
+-51
+-50
+-49
+-48
+-47
+-46
+-45
+-44
+-43
+-42
+-41
+-40
+-39
+-38
+-37
+-36
+-35
+-34
+-33
+-32
+-31
+-30
+-29
+-28
+-27
+-26
+-25
+-24
+-23
+-22
+-21
+-20
+-19
+-18
+-17
+-16
+-15
+-14
+-13
+-12
+-11
+-10
+-9
+-8
+-7
+-6
+-5
+-4
+-3
+-2
+-1
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20

diff --git a/regress/usr.bin/jot/regress.ddhh3.out b/regress/usr.bin/jot/regress.ddhh3.out
new file mode 100644 (file)
index 0000000..29a47f2
--- /dev/null
+++ b/regress/usr.bin/jot/regress.ddhh3.out
@@ -0,0 +1,100 @@
+218
+216
+214
+212
+210
+208
+206
+204
+202
+200
+198
+196
+194
+192
+190
+188
+186
+184
+182
+180
+178
+176
+174
+172
+170
+168
+166
+164
+162
+160
+158
+156
+154
+152
+150
+148
+146
+144
+142
+140
+138
+136
+134
+132
+130
+128
+126
+124
+122
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102
+100
+98
+96
+94
+92
+90
+88
+86
+84
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20

diff --git a/regress/usr.bin/jot/regress.dhdd3.out b/regress/usr.bin/jot/regress.dhdd3.out
new file mode 100644 (file)
index 0000000..4abc81b
--- /dev/null
+++ b/regress/usr.bin/jot/regress.dhdd3.out
@@ -0,0 +1,100 @@
+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
+200
+201
+202
+203
+204
+205
+206
+207
+208
+209
+210
+211
+212
+213
+214
+215
+216
+217
+218
+219

diff --git a/regress/usr.bin/jot/regress.dhdh3.out b/regress/usr.bin/jot/regress.dhdh3.out
new file mode 100644 (file)
index 0000000..bb60245
--- /dev/null
+++ b/regress/usr.bin/jot/regress.dhdh3.out
@@ -0,0 +1,100 @@
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102
+100
+98
+96
+94
+92
+90
+88
+86
+84
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20
+18
+16
+14
+12
+10
+8
+6
+4
+2
+0
+-2
+-4
+-6
+-8
+-10
+-12
+-14
+-16
+-18
+-20
+-22
+-24
+-26
+-28
+-30
+-32
+-34
+-36
+-38
+-40
+-42
+-44
+-46
+-48
+-50
+-52
+-54
+-56
+-58
+-60
+-62
+-64
+-66
+-68
+-70
+-72
+-74
+-76
+-78

diff --git a/regress/usr.bin/jot/regress.dhhd3.out b/regress/usr.bin/jot/regress.dhhd3.out
new file mode 100644 (file)
index 0000000..bfa5fb8
--- /dev/null
+++ b/regress/usr.bin/jot/regress.dhhd3.out
@@ -0,0 +1,101 @@
+120
+119
+118
+117
+116
+115
+114
+113
+112
+111
+110
+109
+108
+107
+106
+105
+104
+103
+102
+101
+100
+99
+98
+97
+96
+95
+94
+93
+92
+91
+90
+89
+88
+87
+86
+85
+84
+83
+82
+81
+80
+79
+78
+77
+76
+75
+74
+73
+72
+71
+70
+69
+68
+67
+66
+65
+64
+63
+62
+61
+60
+59
+58
+57
+56
+55
+54
+53
+52
+51
+50
+49
+48
+47
+46
+45
+44
+43
+42
+41
+40
+39
+38
+37
+36
+35
+34
+33
+32
+31
+30
+29
+28
+27
+26
+25
+24
+23
+22
+21
+20

diff --git a/regress/usr.bin/jot/regress.dhhd4.out b/regress/usr.bin/jot/regress.dhhd4.out
new file mode 100644 (file)
index 0000000..1f2debe
--- /dev/null
+++ b/regress/usr.bin/jot/regress.dhhd4.out
@@ -0,0 +1,141 @@
+160
+159
+158
+157
+156
+155
+154
+153
+152
+151
+150
+149
+148
+147
+146
+145
+144
+143
+142
+141
+140
+139
+138
+137
+136
+135
+134
+133
+132
+131
+130
+129
+128
+127
+126
+125
+124
+123
+122
+121
+120
+119
+118
+117
+116
+115
+114
+113
+112
+111
+110
+109
+108
+107
+106
+105
+104
+103
+102
+101
+100
+99
+98
+97
+96
+95
+94
+93
+92
+91
+90
+89
+88
+87
+86
+85
+84
+83
+82
+81
+80
+79
+78
+77
+76
+75
+74
+73
+72
+71
+70
+69
+68
+67
+66
+65
+64
+63
+62
+61
+60
+59
+58
+57
+56
+55
+54
+53
+52
+51
+50
+49
+48
+47
+46
+45
+44
+43
+42
+41
+40
+39
+38
+37
+36
+35
+34
+33
+32
+31
+30
+29
+28
+27
+26
+25
+24
+23
+22
+21
+20

diff --git a/regress/usr.bin/jot/regress.dhhh3.out b/regress/usr.bin/jot/regress.dhhh3.out
new file mode 100644 (file)
index 0000000..87b0310
--- /dev/null
+++ b/regress/usr.bin/jot/regress.dhhh3.out
@@ -0,0 +1,51 @@
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102
+100
+98
+96
+94
+92
+90
+88
+86
+84
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20

diff --git a/regress/usr.bin/jot/regress.dhhh4.out b/regress/usr.bin/jot/regress.dhhh4.out
new file mode 100644 (file)
index 0000000..6983fc7
--- /dev/null
+++ b/regress/usr.bin/jot/regress.dhhh4.out
@@ -0,0 +1,71 @@
+160
+158
+156
+154
+152
+150
+148
+146
+144
+142
+140
+138
+136
+134
+132
+130
+128
+126
+124
+122
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102
+100
+98
+96
+94
+92
+90
+88
+86
+84
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20

diff --git a/regress/usr.bin/jot/regress.hbbd.out b/regress/usr.bin/jot/regress.hbbd.out
new file mode 100644 (file)
index 0000000..3d385dc
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hbbd.out
@@ -0,0 +1,15 @@
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10
+10

diff --git a/regress/usr.bin/jot/regress.hbbh.out b/regress/usr.bin/jot/regress.hbbh.out
new file mode 100644 (file)
index 0000000..f599e28
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hbbh.out
@@ -0,0 +1 @@
+10

diff --git a/regress/usr.bin/jot/regress.hdhd3.out b/regress/usr.bin/jot/regress.hdhd3.out
new file mode 100644 (file)
index 0000000..334b90b
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hdhd3.out
@@ -0,0 +1,50 @@
+-29
+-28
+-27
+-26
+-25
+-24
+-23
+-22
+-21
+-20
+-19
+-18
+-17
+-16
+-15
+-14
+-13
+-12
+-11
+-10
+-9
+-8
+-7
+-6
+-5
+-4
+-3
+-2
+-1
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20

diff --git a/regress/usr.bin/jot/regress.hdhd4.out b/regress/usr.bin/jot/regress.hdhd4.out
new file mode 100644 (file)
index 0000000..3b1d323
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hdhd4.out
@@ -0,0 +1,30 @@
+-9
+-8
+-7
+-6
+-5
+-4
+-3
+-2
+-1
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20

diff --git a/regress/usr.bin/jot/regress.hdhh3.out b/regress/usr.bin/jot/regress.hdhh3.out
new file mode 100644 (file)
index 0000000..44cd506
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hdhh3.out
@@ -0,0 +1,50 @@
+118
+116
+114
+112
+110
+108
+106
+104
+102
+100
+98
+96
+94
+92
+90
+88
+86
+84
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20

diff --git a/regress/usr.bin/jot/regress.hdhh4.out b/regress/usr.bin/jot/regress.hdhh4.out
new file mode 100644 (file)
index 0000000..9af643e
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hdhh4.out
@@ -0,0 +1,30 @@
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20

diff --git a/regress/usr.bin/jot/regress.hhdd3.out b/regress/usr.bin/jot/regress.hhdd3.out
new file mode 100644 (file)
index 0000000..c129b6d
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hhdd3.out
@@ -0,0 +1,50 @@
+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

diff --git a/regress/usr.bin/jot/regress.hhdd4.out b/regress/usr.bin/jot/regress.hhdd4.out
new file mode 100644 (file)
index 0000000..9b0b684
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hhdd4.out
@@ -0,0 +1,30 @@
+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

diff --git a/regress/usr.bin/jot/regress.hhdh3.out b/regress/usr.bin/jot/regress.hhdh3.out
new file mode 100644 (file)
index 0000000..df8109d
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hhdh3.out
@@ -0,0 +1,50 @@
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102
+100
+98
+96
+94
+92
+90
+88
+86
+84
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22

diff --git a/regress/usr.bin/jot/regress.hhdh4.out b/regress/usr.bin/jot/regress.hhdh4.out
new file mode 100644 (file)
index 0000000..f992d2c
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hhdh4.out
@@ -0,0 +1,30 @@
+160
+158
+156
+154
+152
+150
+148
+146
+144
+142
+140
+138
+136
+134
+132
+130
+128
+126
+124
+122
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102

diff --git a/regress/usr.bin/jot/regress.hhhd3.out b/regress/usr.bin/jot/regress.hhhd3.out
new file mode 100644 (file)
index 0000000..7116258
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hhhd3.out
@@ -0,0 +1,50 @@
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102
+100
+98
+96
+93
+91
+89
+87
+85
+83
+81
+79
+77
+75
+73
+71
+69
+67
+65
+63
+61
+59
+57
+55
+53
+51
+49
+47
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22
+20

diff --git a/regress/usr.bin/jot/regress.hhhd4.out b/regress/usr.bin/jot/regress.hhhd4.out
new file mode 100644 (file)
index 0000000..61c7a5c
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hhhd4.out
@@ -0,0 +1,30 @@
+160
+155
+150
+146
+141
+136
+131
+126
+121
+117
+112
+107
+102
+97
+92
+88
+83
+78
+73
+68
+63
+59
+54
+49
+44
+39
+34
+30
+25
+20

diff --git a/regress/usr.bin/jot/regress.hhhh3.out b/regress/usr.bin/jot/regress.hhhh3.out
new file mode 100644 (file)
index 0000000..df8109d
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hhhh3.out
@@ -0,0 +1,50 @@
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102
+100
+98
+96
+94
+92
+90
+88
+86
+84
+82
+80
+78
+76
+74
+72
+70
+68
+66
+64
+62
+60
+58
+56
+54
+52
+50
+48
+46
+44
+42
+40
+38
+36
+34
+32
+30
+28
+26
+24
+22

diff --git a/regress/usr.bin/jot/regress.hhhh4.out b/regress/usr.bin/jot/regress.hhhh4.out
new file mode 100644 (file)
index 0000000..f992d2c
--- /dev/null
+++ b/regress/usr.bin/jot/regress.hhhh4.out
@@ -0,0 +1,30 @@
+160
+158
+156
+154
+152
+150
+148
+146
+144
+142
+140
+138
+136
+134
+132
+130
+128
+126
+124
+122
+120
+118
+116
+114
+112
+110
+108
+106
+104
+102

diff --git a/regress/usr.bin/jot/regress.sh b/regress/usr.bin/jot/regress.sh
index 9165b8f..38000f5 100644 (file)
--- a/regress/usr.bin/jot/regress.sh
+++ b/regress/usr.bin/jot/regress.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: regress.sh,v 1.3 2016/08/06 14:41:14 tb Exp $
+# $OpenBSD: regress.sh,v 1.4 2016/08/06 15:46:33 tb Exp $
 # $FreeBSD: head/usr.bin/jot/tests/regress.sh 208728 2010-06-02 07:47:29Z brian $
 
 JOT=${JOT-jot}
@@ -7,7 +7,7 @@ echo "# SRCDIR is ${SRCDIR}"
 
 REGRESSION_START(`pwd`)
 
-REGRESSION_TEST([[x]], [[${JOT} -w "%X" -s , 100 1 200]])
+# A: test all 16 possibilities for reps, begin, end, s with omissions
 REGRESSION_TEST([[hhhh]], [[${JOT} 50 20 120 2]])
 REGRESSION_TEST([[hhhd]], [[${JOT} 50 20 120 -]])
 REGRESSION_TEST([[hhdh]], [[${JOT} 50 20 - 2]])
@@ -24,6 +24,8 @@ REGRESSION_TEST([[ddhh]], [[${JOT} - - 120 2]])
 REGRESSION_TEST([[ddhd]], [[${JOT} - - 120 -]])
 REGRESSION_TEST([[dddh]], [[${JOT} - - - 2]])
 REGRESSION_TEST([[dddd]], [[${JOT} - - - -]])
+
+# B: same as A, but different numbers, only 12 because of 4 duplicates
 REGRESSION_TEST([[hhhh2]], [[${JOT} 30 20 160 2]])
 REGRESSION_TEST([[hhhd2]], [[${JOT} 30 20 160 -]])
 REGRESSION_TEST([[hhdh2]], [[${JOT} 30 20 - 2]])
@@ -35,11 +37,47 @@ REGRESSION_TEST([[hddd2]], [[${JOT} 30 - - -]])
 REGRESSION_TEST([[dhhh2]], [[${JOT} - 20 160 2]])
 REGRESSION_TEST([[dhhd2]], [[${JOT} - 20 160 -]])
 REGRESSION_TEST([[ddhh2]], [[${JOT} - - 160 2]])
+REGRESSION_TEST([[ddhd2]], [[${JOT} - - 160 -]])
+
+# C: reverse roles of begin and end in A.
+REGRESSION_TEST([[hhhh3]], [[${JOT} 50 120 20 -2]])
+REGRESSION_TEST([[hhhd3]], [[${JOT} 50 120 20 -]])
+REGRESSION_TEST([[hhdh3]], [[${JOT} 50 120 - -2]])
+REGRESSION_TEST([[hhdd3]], [[${JOT} 50 120 - -]])
+REGRESSION_TEST([[hdhh3]], [[${JOT} 50 - 20 -2]])
+REGRESSION_TEST([[hdhd3]], [[${JOT} 50 - 20 -]])
+REGRESSION_TEST([[dhhh3]], [[${JOT} - 120 20 -2]])
+REGRESSION_TEST([[dhhd3]], [[${JOT} - 120 20 -]])
+REGRESSION_TEST([[dhdh3]], [[${JOT} - 120 - -2]])
+REGRESSION_TEST([[dhdd3]], [[${JOT} - 120 - -]])
+REGRESSION_TEST([[ddhh3]], [[${JOT} - - 20 -2]])
+REGRESSION_TEST([[ddhd3]], [[${JOT} - - 20 -]])
+
+# D: reverse roles of begin and end in B.
+REGRESSION_TEST([[hhhh4]], [[${JOT} 30 160 20 -2]])
+REGRESSION_TEST([[hhhd4]], [[${JOT} 30 160 20 -]])
+REGRESSION_TEST([[hhdh4]], [[${JOT} 30 160 - -2]])
+REGRESSION_TEST([[hhdd4]], [[${JOT} 30 160 - -]])
+REGRESSION_TEST([[hdhh4]], [[${JOT} 30 - 20 -2]])
+REGRESSION_TEST([[hdhd4]], [[${JOT} 30 - 20 -]])
+REGRESSION_TEST([[dhhh4]], [[${JOT} - 160 20 -2]])
+REGRESSION_TEST([[dhhd4]], [[${JOT} - 160 20 -]])
+
+# E: what happens if begin and end are equal?
+REGRESSION_TEST([[dbbd]], [[${JOT} - 10 10 -]])
+REGRESSION_TEST([[hbbd]], [[${JOT} 15 10 10 -]])
+REGRESSION_TEST([[dbbh]], [[${JOT} - 10 10 2]])
+REGRESSION_TEST([[hbbh]], [[${JOT} 15 10 10 2]])
+
+# F: random output
+# rand1 and rand2 test coverage (10000 is way too big: 200 should be enough)
 REGRESSION_TEST([[rand1]], [[${JOT} -r 10000 0 9 | sort -u]])
 REGRESSION_TEST([[rand2]], [[${JOT} -r 10000 9 0 | sort -u]])
 # rdhhh and rhdhh test if begin and ender are set to the default with jot -r
 REGRESSION_TEST([[rdhhh]], [[${JOT} -r 100 - 10 2 2>/dev/null | sort -n | head -1]])
 REGRESSION_TEST([[rhdhh]], [[${JOT} -r 100 90 - 2 2>/dev/null | sort -n | tail -1]])
+
+# G: Examples from the FreeBSD manual
 REGRESSION_TEST([[n21]], [[${JOT} 21 -1 1.00]])
 REGRESSION_TEST([[ascii]], [[${JOT} -c 128 0]])
 REGRESSION_TEST([[xaa]], [[${JOT} -w xa%c 26 a]])
@@ -50,6 +88,8 @@ REGRESSION_TEST([[stutter2]], [[${JOT} -w %d - 9.5 0 -.5]])
 REGRESSION_TEST([[block]], [[${JOT} -b x 512]])
 REGRESSION_TEST([[tabs]], [[${JOT} -s, - 10 132 4]])
 REGRESSION_TEST([[grep]], [[${JOT} -s "" -b . 80]])
+
+# H: various format strings
 REGRESSION_TEST([[wf]], [[${JOT} -w "a%.1fb" 10]])
 REGRESSION_TEST([[we]], [[${JOT} -w "a%eb" 10]])
 REGRESSION_TEST([[wwe]], [[${JOT} -w "a%-15eb" 10]])
@@ -70,8 +110,9 @@ REGRESSION_TEST([[wp3]], [[${JOT} -w "a%%A%%%d%%B%%b" 10]])
 REGRESSION_TEST([[wp4]], [[${JOT} -w "%%d%d%%d%%" 10]])
 REGRESSION_TEST([[wp5]], [[${JOT} -w ftp://www.example.com/pub/uploaded%%20files/disk%03d.iso 10]])
 REGRESSION_TEST([[wp6]], [[${JOT} -w "%d%" 10]])
+REGRESSION_TEST([[x]], [[${JOT} -w "%X" -s , 100 1 200]])
 
-# test some of the examples in the jot(1) man page
+# I: Examples from the OpenBSD manual
 REGRESSION_TEST([[man1]], [[${JOT} 6 1 10 0.5]])
 REGRESSION_TEST([[man2]], [[${JOT} -p 1 6 1 10 0.5]])
 REGRESSION_TEST([[man3]], [[${JOT} -p 0 6 .9999999999 10 0.5]])