thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2269: not all :hardcopy code covered by tests

Browse Source 
Problem:    Not all :hardcopy code covered by tests.
Solution:   Test more combinations. (Dominique Pellé, closes #7595)
This commit is contained in:
Bram Moolenaar
2021-01-01 21:34:37 +01:00
parent 3862ea3f62
commit edc10b541b
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/testdir/test_hardcopy.vim
View File

@@ -10,8 +10,10 @@ func Test_printoptions()
\ 'left:2in,top:30pt,right:16mm,bottom:3pc', \ 'left:2in,top:30pt,right:16mm,bottom:3pc',
\ 'header:3,syntax:y,number:y,wrap:n', \ 'header:3,syntax:y,number:y,wrap:n',
\ 'header:3,syntax:n,number:y,wrap:y', \ 'header:3,syntax:n,number:y,wrap:y',
\ 'header:0,syntax:a,number:y,wrap:y',
\ 'duplex:short,collate:n,jobsplit:y,portrait:n', \ 'duplex:short,collate:n,jobsplit:y,portrait:n',
\ 'duplex:long,collate:y,jobsplit:n,portrait:y', \ 'duplex:long,collate:y,jobsplit:n,portrait:y',
\ 'duplex:off,collate:y,jobsplit:y,portrait:y',
\ 'paper:10x14', \ 'paper:10x14',
\ 'paper:A3', \ 'paper:A3',
\ 'paper:A4', \ 'paper:A4',
@@ -46,8 +48,8 @@ func Test_printoptions()
endfunc endfunc
func Test_printmbfont() func Test_printmbfont()
" Print a small help page which contains tabs to cover code that expands tabs to spaces. " Print a help page which contains tabs, underlines (etc) to recover more code.
help help help syntax.txt
syn on syn on
for opt in [':WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-Bold-Italic,c:yes,a:no', for opt in [':WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-Bold-Italic,c:yes,a:no',
@@ -70,12 +72,17 @@ func Test_printmbcharset()
" digraph.txt has plenty of non-latin1 characters. " digraph.txt has plenty of non-latin1 characters.
help digraph.txt help digraph.txt
set printmbcharset=ISO10646 printencoding=utf-8 printmbfont=r:WadaMin-Regular set printmbcharset=ISO10646 printencoding=utf-8
for courier in ['yes', 'no']
for ascii in ['yes', 'no']
exe 'set printmbfont=r:WadaMin-Regular,b:WadaMin-Bold,i:WadaMin-Italic,o:WadaMin-BoldItalic'
\ .. ',c:' .. courier .. ',a:' .. ascii
hardcopy > Xhardcopy_printmbcharset hardcopy > Xhardcopy_printmbcharset
let lines = readfile('Xhardcopy_printmbcharset') let lines = readfile('Xhardcopy_printmbcharset')
call assert_true(len(lines) > 20) call assert_true(len(lines) > 20)
call assert_true(lines[0] =~ 'PS-Adobe') call assert_true(lines[0] =~ 'PS-Adobe')
endfor
endfor
set printmbcharset=does-not-exist printencoding=utf-8 printmbfont=r:WadaMin-Regular set printmbcharset=does-not-exist printencoding=utf-8 printmbfont=r:WadaMin-Regular
call assert_fails('hardcopy > Xhardcopy_printmbcharset', 'E456:') call assert_fails('hardcopy > Xhardcopy_printmbcharset', 'E456:')

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2269,
/**/ /**/
2268, 2268,
/**/ /**/