diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-09-04 16:32:36 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-09-04 16:32:36 +0200 |
commit | 0f63ed33fdd12d8220f7bc7ff91095e7ceed9985 (patch) | |
tree | 3ee01ecae9320b585f99fde16e87ad6ff350297d | |
parent | b005cd80cfda591be95146024d9b97eef383500f (diff) |
patch 8.1.1980: fix for search stat not testedv8.1.1980
Problem: Fix for search stat not tested.
Solution: Add a screenshot test. (Christian Brabandt)
-rw-r--r-- | src/testdir/dumps/Test_searchstat_1.dump | 10 | ||||
-rw-r--r-- | src/testdir/dumps/Test_searchstat_2.dump | 10 | ||||
-rw-r--r-- | src/testdir/test_search_stat.vim | 40 | ||||
-rw-r--r-- | src/version.c | 2 |
4 files changed, 56 insertions, 6 deletions
diff --git a/src/testdir/dumps/Test_searchstat_1.dump b/src/testdir/dumps/Test_searchstat_1.dump new file mode 100644 index 0000000000..52b13f2dc7 --- /dev/null +++ b/src/testdir/dumps/Test_searchstat_1.dump @@ -0,0 +1,10 @@ +|f+0&#ffffff0|o@1|b|a|r| @68 +>f|i|n|d| |t|h|i|s| @65 +|f|o@4|b|a|r| @65 +|f|o|b|a| @70 +|f|o@1|b|a|r| @68 +|f|o@1|b|a|r| @68 +|f|o@1| @71 +|f|o@4|b|a|r| @65 +|f|o|b|a| @70 +|/|f|i|n|d| |t|h|i|s| @29|[|1|/|2|]| @11|2|,|1| @10|T|o|p| diff --git a/src/testdir/dumps/Test_searchstat_2.dump b/src/testdir/dumps/Test_searchstat_2.dump new file mode 100644 index 0000000000..a6ced4fd08 --- /dev/null +++ b/src/testdir/dumps/Test_searchstat_2.dump @@ -0,0 +1,10 @@ +|f+0&#ffffff0|o@1|b|a|r| @68 +>f|i|n|d| |t|h|i|s| @65 +|f|o@4|b|a|r| @65 +|f|o|b|a| @70 +|f|o@1|b|a|r| @68 +|f|o@1|b|a|r| @68 +|f|o@1| @71 +|f|o@4|b|a|r| @65 +|f|o|b|a| @70 +@40|[|1|/|2|]| @11|2|,|1| @10|T|o|p| diff --git a/src/testdir/test_search_stat.vim b/src/testdir/test_search_stat.vim index d5d50ff1d7..57997289d7 100644 --- a/src/testdir/test_search_stat.vim +++ b/src/testdir/test_search_stat.vim @@ -1,11 +1,9 @@ " Tests for search_stats, when "S" is not in 'shortmess' -" -" This test is fragile, it might not work interactively, but it works when run -" as test! -source shared.vim +source check.vim +source screendump.vim -func! Test_search_stat() +func Test_search_stat() new set shortmess-=S " Append 50 lines with text to search for, "foobar" appears 20 times @@ -177,11 +175,41 @@ func! Test_search_stat() let stat = '\[1/2\]' call assert_notmatch(pat .. stat, g:b) call assert_match(stat, g:b) + " Test that the message is not truncated + " it would insert '...' into the output. + call assert_match('^\s\+' .. stat, g:b) unmap n " Clean up set shortmess+=S - " close the window bwipe! endfunc + +func! Test_search_stat_screendump() + CheckScreendump + + let lines =<< trim END + set shortmess-=S + " Append 50 lines with text to search for, "foobar" appears 20 times + call append(0, repeat(['foobar', 'foo', 'fooooobar', 'foba', 'foobar'], 20)) + call setline(2, 'find this') + call setline(70, 'find this') + nnoremap n n + let @/ = 'find this' + call cursor(1,1) + norm n + END + call writefile(lines, 'Xsearchstat') + let buf = RunVimInTerminal('-S Xsearchstat', #{rows: 10}) + call term_wait(buf) + call VerifyScreenDump(buf, 'Test_searchstat_1', {}) + + call term_sendkeys(buf, ":nnoremap <silent> n n\<cr>") + call term_sendkeys(buf, "gg0n") + call term_wait(buf) + call VerifyScreenDump(buf, 'Test_searchstat_2', {}) + + call StopVimInTerminal(buf) + call delete('Xsearchstat') +endfunc diff --git a/src/version.c b/src/version.c index a2b6ed2016..1a9b52376d 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1980, +/**/ 1979, /**/ 1978, |