diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-10-03 17:07:34 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-10-03 17:07:34 +0100 |
commit | 0466d398a550623126fba3a2a08208a798b28bda (patch) | |
tree | a9fe026432aea30f34a59cbf823641d6e07da7fc /src/testdir | |
parent | 406b5d89e18742ac6e6256ffc72fb70a27f0148b (diff) |
patch 9.0.0650: some tests are failingv9.0.0650
Problem: Some tests are failing.
Solution: Adjust for "<<<" showing up.
Diffstat (limited to 'src/testdir')
-rw-r--r-- | src/testdir/test_breakindent.vim | 20 | ||||
-rw-r--r-- | src/testdir/test_display.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_listlbr.vim | 2 | ||||
-rw-r--r-- | src/testdir/test_listlbr_utf8.vim | 4 | ||||
-rw-r--r-- | src/testdir/test_number.vim | 2 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/testdir/test_breakindent.vim b/src/testdir/test_breakindent.vim index f052fb7be9..5ac88a0550 100644 --- a/src/testdir/test_breakindent.vim +++ b/src/testdir/test_breakindent.vim @@ -83,7 +83,7 @@ func Test_breakindent02_vartabs() CheckFeature vartabs " simple breakindent test with showbreak set call s:test_windows('setl briopt=min:0 sbr=>> vts=4') - let lines = s:screen_lines(line('.'),8) + let lines = s:screen_lines(line('.'), 8) let expect = [ \ " abcd", \ " >>qr", @@ -96,7 +96,7 @@ endfunc func Test_breakindent03() " simple breakindent test with showbreak set and briopt including sbr call s:test_windows('setl briopt=sbr,min:0 sbr=++') - let lines = s:screen_lines(line('.'),8) + let lines = s:screen_lines(line('.'), 8) let expect = [ \ " abcd", \ "++ qrst", @@ -111,7 +111,7 @@ func Test_breakindent03_vartabs() " simple breakindent test with showbreak set and briopt including sbr CheckFeature vartabs call s:test_windows('setl briopt=sbr,min:0 sbr=++ vts=4') - let lines = s:screen_lines(line('.'),8) + let lines = s:screen_lines(line('.'), 8) let expect = [ \ " abcd", \ "++ qrst", @@ -126,7 +126,7 @@ func Test_breakindent04() " breakindent set with min width 18 set sbr=<<< call s:test_windows('setl sbr=NONE briopt=min:18') - let lines = s:screen_lines(line('.'),8) + let lines = s:screen_lines(line('.'), 8) let expect = [ \ " abcd", \ " qrstuv", @@ -142,7 +142,7 @@ func Test_breakindent04_vartabs() " breakindent set with min width 18 CheckFeature vartabs call s:test_windows('setl sbr= briopt=min:18 vts=4') - let lines = s:screen_lines(line('.'),8) + let lines = s:screen_lines(line('.'), 8) let expect = [ \ " abcd", \ " qrstuv", @@ -549,7 +549,7 @@ func Test_breakindent16() redraw! let lines = s:screen_lines(1,10) let expect = [ - \ " 789012", + \ "<<< 789012", \ " 345678", \ " 901234", \ ] @@ -575,7 +575,7 @@ func Test_breakindent16_vartabs() redraw! let lines = s:screen_lines(1,10) let expect = [ - \ " 789012", + \ "<<< 789012", \ " 345678", \ " 901234", \ ] @@ -660,7 +660,7 @@ func Test_breakindent19_sbr_nextpage() norm! 5gj let lines = s:screen_lines(1, 20) let expect = [ - \ ">aaaaaaaaaaaaaaaaaaa", + \ "<<<aaaaaaaaaaaaaaaaa", \ ">aaaaaaaaaaaaaaaaaaa", \ ">aaaaaaaaaaaaaaaaaaa", \ ] @@ -687,7 +687,7 @@ func Test_breakindent20_cpo_n_nextpage() redraw! let lines = s:screen_lines(1, 20) let expect = [ - \ "--1 aaaaaaaaaaaaaaaa", + \ "<<< aaaaaaaaaaaaaaaa", \ " aaaaaaaaaaaaaaaa", \ " aaaaaaaaaaaaaaaa", \ ] @@ -706,7 +706,7 @@ func Test_breakindent20_cpo_n_nextpage() norm! 5gj let lines = s:screen_lines(1, 20) let expect = [ - \ "--1 aaaaaaaaaaaaaa", + \ "<<< aaaaaaaaaaaaaa", \ " aaaaaaaaaaaaaa", \ " aaaaaaaaaaaaaa", \ ] diff --git a/src/testdir/test_display.vim b/src/testdir/test_display.vim index af18b7ee92..7237ed8a2f 100644 --- a/src/testdir/test_display.vim +++ b/src/testdir/test_display.vim @@ -143,7 +143,7 @@ func Test_display_listchars_precedes() let lines = ScreenLines([1,10], winwidth(0)+1) let expect = [ - \ "<aaa aaa a|", + \ "<<<a aaa a|", \ "a aaa aaa |", \ "aa aaa aaa|", \ " aa aaa aa|", diff --git a/src/testdir/test_listlbr.vim b/src/testdir/test_listlbr.vim index 24bd25679a..97d6ccdb95 100644 --- a/src/testdir/test_listlbr.vim +++ b/src/testdir/test_listlbr.vim @@ -159,7 +159,7 @@ func Test_virtual_block_and_vbA() exe "norm! $3B\<C-v>eAx\<Esc>" let lines = s:screen_lines([1, 10], winwidth(0)) let expect = [ -\ "foobar foobar ", +\ "<<<bar foobar ", \ "foobar foobar ", \ "foobar foobar ", \ "foobar foobar ", diff --git a/src/testdir/test_listlbr_utf8.vim b/src/testdir/test_listlbr_utf8.vim index 0d77dbfd33..83d6ed0c7f 100644 --- a/src/testdir/test_listlbr_utf8.vim +++ b/src/testdir/test_listlbr_utf8.vim @@ -167,7 +167,7 @@ func Test_visual_block_and_selection_exclusive() exe "norm! $3B\<C-v>eAx\<Esc>" let lines = s:screen_lines([1, 10], winwidth(0)) let expect = [ -\ "+foobar foobar ", +\ "<<<obar foobar ", \ "+foobar foobar ", \ "+foobar foobar ", \ "+foobar foobar ", @@ -266,7 +266,7 @@ func Test_chinese_char_on_wrap_column() norm! $ redraw! let expect=[ -\ '中aaaaaaaaaaaaaaaaa>', +\ '<<<aaaaaaaaaaaaaaaa>', \ '中aaaaaaaaaaaaaaaaa>', \ '中aaaaaaaaaaaaaaaaa>', \ '中aaaaaaaaaaaaaaaaa>', diff --git a/src/testdir/test_number.vim b/src/testdir/test_number.vim index e854576855..81f8f73013 100644 --- a/src/testdir/test_number.vim +++ b/src/testdir/test_number.vim @@ -138,7 +138,7 @@ func Test_number_with_linewrap1() call s:validate_cursor() let lines = s:screen_lines(1, 3) let expect = [ -\ "--1 aaaa", +\ "<<< aaaa", \ " aaaa", \ " aaaa", \ ] |