diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-01-01 21:34:37 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-01-01 21:34:37 +0100 |
| commit | edc10b541b468f5f5aa2e2d5ef58a3e17e043bff (patch) | |
| tree | 70e2701fac06174ec9eb873867e713654f45ccf7 | |
| parent | 3862ea3f620f02569c2d816ca9ceeeac3a0ad901 (diff) | |
| download | vim-git-edc10b541b468f5f5aa2e2d5ef58a3e17e043bff.tar.gz | |
patch 8.2.2269: not all :hardcopy code covered by testsv8.2.2269
Problem: Not all :hardcopy code covered by tests.
Solution: Test more combinations. (Dominique Pellé, closes #7595)
| -rw-r--r-- | src/testdir/test_hardcopy.vim | 23 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/testdir/test_hardcopy.vim b/src/testdir/test_hardcopy.vim index 63b4d888d..e390bd5cc 100644 --- a/src/testdir/test_hardcopy.vim +++ b/src/testdir/test_hardcopy.vim @@ -10,8 +10,10 @@ func Test_printoptions() \ 'left:2in,top:30pt,right:16mm,bottom:3pc', \ 'header:3,syntax:y,number:y,wrap:n', \ '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:long,collate:y,jobsplit:n,portrait:y', + \ 'duplex:off,collate:y,jobsplit:y,portrait:y', \ 'paper:10x14', \ 'paper:A3', \ 'paper:A4', @@ -46,8 +48,8 @@ func Test_printoptions() endfunc func Test_printmbfont() - " Print a small help page which contains tabs to cover code that expands tabs to spaces. - help help + " Print a help page which contains tabs, underlines (etc) to recover more code. + help syntax.txt syn on 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. help digraph.txt - set printmbcharset=ISO10646 printencoding=utf-8 printmbfont=r:WadaMin-Regular - - hardcopy > Xhardcopy_printmbcharset - let lines = readfile('Xhardcopy_printmbcharset') - call assert_true(len(lines) > 20) - call assert_true(lines[0] =~ 'PS-Adobe') + 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 + let lines = readfile('Xhardcopy_printmbcharset') + call assert_true(len(lines) > 20) + call assert_true(lines[0] =~ 'PS-Adobe') + endfor + endfor set printmbcharset=does-not-exist printencoding=utf-8 printmbfont=r:WadaMin-Regular call assert_fails('hardcopy > Xhardcopy_printmbcharset', 'E456:') diff --git a/src/version.c b/src/version.c index 76a9b4ea9..25d464ba4 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2269, +/**/ 2268, /**/ 2267, |