Patch 8.2.2950

[Bram Moolenaar]

Patch 8.2.2950
Problem: Sound code not fully tested.
Solution: Add more sound tests. (Dominique Pellé, closes #8332)
Files: src/testdir/test_sound.vim


*** ../vim-8.2.2949/src/testdir/test_sound.vim 2020-12-06 21:43:40.541781585 +0100
--- src/testdir/test_sound.vim 2021-06-06 15:05:31.560635565 +0200
***************
*** 1,12 ****
" Tests for the sound feature

source shared.vim

! if !has('sound')
! throw 'Skipped: sound feature not available'
! endif

func PlayCallback(id, result)
let g:id = a:id
let g:result = a:result
endfunc
--- 1,12 ----
" Tests for the sound feature

+ source check.vim
source shared.vim

! CheckFeature sound

func PlayCallback(id, result)
+ let g:playcallback_count += 1
let g:id = a:id
let g:result = a:result
endfunc
***************
*** 15,34 ****
--- 15,38 ----
if has('win32')
throw 'Skipped: Playing event with callback is not supported on Windows'
endif
+ let g:playcallback_count = 0
let g:id = 0
let id = 'bell'->sound_playevent('PlayCallback')
if id == 0
throw 'Skipped: bell event not available'
endif
+
" Stop it quickly, avoid annoying the user.
sleep 20m
eval id->sound_stop()
call WaitForAssert({-> assert_equal(id, g:id)})
call assert_equal(1, g:result) " sound was aborted
+ call assert_equal(1, g:playcallback_count)
endfunc

func Test_play_silent()
let fname = fnamemodify('silent.wav', '%p')
+ let g:playcallback_count = 0

" play without callback
let id1 = sound_playfile(fname)
***************
*** 41,46 ****
--- 45,51 ----
call assert_true(id2 > 0)
call WaitForAssert({-> assert_equal(id2, g:id)})
call assert_equal(0, g:result)
+ call assert_equal(1, g:playcallback_count)

let id2 = sound_playfile(fname, 'PlayCallback')
call assert_true(id2 > 0)
***************
*** 48,53 ****
--- 53,65 ----
call sound_clear()
call WaitForAssert({-> assert_equal(id2, g:id)})
call assert_equal(1, g:result) " sound was aborted
+ call assert_equal(2, g:playcallback_count)
+
+ " Play 2 sounds almost at the same time to exercise
+ " code with multiple callbacks in the callback list.
+ call sound_playfile(fname, 'PlayCallback')
+ call sound_playfile(fname, 'PlayCallback')
+ call WaitForAssert({-> assert_equal(4, g:playcallback_count)})

" recursive use was causing a crash
func PlayAgain(id, fname)
***************
*** 62,65 ****
--- 74,98 ----
call WaitForAssert({-> assert_true(g:id > 0)})
endfunc

+ func Test_play_event_error()
+ " Do not run test on Windows as:
+ " - playing event with callback is not supported on Windows.
+ " - FIXME: even without callback, sound_playevent('') does not return 0 on Windows. Bug?
+ CheckNotMSWindows
+
+ call assert_equal(0, sound_playevent(''))
+ call assert_equal(0, sound_playevent(test_null_string()))
+ call assert_equal(0, sound_playevent('doesnotexist'))
+ call assert_equal(0, sound_playevent('doesnotexist', 'doesnotexist'))
+ call assert_equal(0, sound_playevent(test_null_string(), test_null_string()))
+ call assert_equal(0, sound_playevent(test_null_string(), test_null_function()))
+
+ call assert_equal(0, sound_playfile(''))
+ call assert_equal(0, sound_playfile(test_null_string()))
+ call assert_equal(0, sound_playfile('doesnotexist'))
+ call assert_equal(0, sound_playfile('doesnotexist', 'doesnotexist'))
+ call assert_equal(0, sound_playfile(test_null_string(), test_null_string()))
+ call assert_equal(0, sound_playfile(test_null_string(), test_null_function()))
+ endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.2949/src/version.c 2021-06-06 14:14:35.352774336 +0200
--- src/version.c 2021-06-06 15:06:35.788455822 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 2950,
/**/

--
Did Adam and Eve have navels?

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///