patch 9.1.1442: tests: Test_diff_fold_redraw() is insufficient
Commit:
https://github.com/vim/vim/commit/69565e3618209001eeeb6a35f14a19d47aaaa8f8
Author: Gary Johnson <garyj...@spocom.com>
Date: Mon Jun 9 20:19:35 2025 +0200
patch 9.1.1442: tests: Test_diff_fold_redraw() is insufficient
Problem: tests: Test_diff_fold_redraw() is insufficient
(after v9.1.1439, Christ van Willegen)
Solution: improve the test (Gary Johnson)
The original Test_diff_fold_redraw() function, added 2025-06-08 at patch
9.1.1439, had a bug and didn't do a very good job of testing the fold
behavior. This new version is simpler and more thorough.
The bug was that it checked the fold state of one window twice instead
of checking both windows.
closes: #17492
Signed-off-by: Gary Johnson <garyj...@spocom.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/testdir/test_diffmode.vim b/src/testdir/test_diffmode.vim
index 5cd987170..1ab194568 100644
--- a/src/testdir/test_diffmode.vim
+++ b/src/testdir/test_diffmode.vim
@@ -52,32 +52,26 @@ endfunc
" Test for diff folding redraw after last diff is resolved
func Test_diff_fold_redraw()
- " Set up two files with the minimal case
+ " Set up two files with a minimal case.
call writefile(['Paragraph 1', '', 'Paragraph 2', '', 'Paragraph 3'],
'Xfile1')
call writefile(['Paragraph 1', '', 'Paragraph 3'], 'Xfile2')
- " Open in diff mode
- exe 'edit Xfile1'
- exe 'vert diffsplit Xfile2'
+ " Open in diff mode.
+ edit Xfile1
+ vert diffsplit Xfile2
- " Ensure both windows are in diff mode and folds are enabled
- set foldmethod=diff
- set foldenable
-
- " Go to the diff and apply dp to copy Paragraph 2 to Xfile2
- normal! ]c
- normal! dp
-
- " Redraw and check folds
- redraw!
- let win1_fold = foldclosed(1)
- let win2_fold = foldclosed(1)
+ " Go to the diff and apply :diffput to copy Paragraph 2 to Xfile2.
+ wincmd l
+ 3
+ diffput
- " Both windows should be fully folded (foldclosed returns 1 for top fold)
- call assert_equal(1, win1_fold)
- call assert_equal(1, win2_fold)
+ " Check that the folds in both windows are closed and extend from the first
+ " line of the buffer to the last line of the buffer.
+ call assert_equal(1, foldclosed(line("$")))
+ wincmd h
+ call assert_equal(1, foldclosed(line("$")))
- " Clean up
+ " Clean up.
bwipe!
bwipe!
call delete('Xfile1')
diff --git a/src/version.c b/src/version.c
index 7964c14ad..6e0081e9b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 1442,
/**/
1441,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion visit
https://groups.google.com/d/msgid/vim_dev/E1uOhFz-009pPm-8a%40256bit.org.
