mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.1.0742: not all Blob operations are tested

Browse Source 
Problem:    Not all Blob operations are tested.
Solution:   Add more testing for Blob.
05500ece62

Test_readfile_binary is already ported.
This commit is contained in:
Sean Dewar
2020-11-24 21:37:52 +00:00
parent 7200454ee6
commit d346ac536f
2 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/nvim/eval/funcs.c
View File

@@ -325,8 +325,13 @@ static void f_add(typval_T *argvars, typval_T *rettv, FunPtr fptr)
blob_T *const b = argvars[0].vval.v_blob; blob_T *const b = argvars[0].vval.v_blob;
if (b != NULL if (b != NULL
&& !var_check_lock(b->bv_lock, N_("add() argument"), TV_TRANSLATE)) { && !var_check_lock(b->bv_lock, N_("add() argument"), TV_TRANSLATE)) {
ga_append(&b->bv_ga, (char_u)tv_get_number(&argvars[1])); bool error = false;
tv_copy(&argvars[0], rettv); const varnumber_T n = tv_get_number_chk(&argvars[1], &error);
if (!error) {
ga_append(&b->bv_ga, (int)n);
tv_copy(&argvars[0], rettv);
}
} }
} else { } else {
EMSG(_(e_listreq)); EMSG(_(e_listreq));
@@ -4827,6 +4832,12 @@ static void f_index(typval_T *argvars, typval_T *rettv, FunPtr fptr)
if (b == NULL) { if (b == NULL) {
return; return;
} }
if (start < 0) {
start = tv_blob_len(b) + start;
if (start < 0) {
start = 0;
}
}
for (idx = start; idx < tv_blob_len(b); idx++) { for (idx = start; idx < tv_blob_len(b); idx++) {
typval_T tv; typval_T tv;
tv.v_type = VAR_NUMBER; tv.v_type = VAR_NUMBER;

30
src/nvim/testdir/test_blob.vim
View File

@@ -96,6 +96,8 @@ func Test_blob_compare()
call assert_true(b1 != b2) call assert_true(b1 != b2)
call assert_true(b1 != b3) call assert_true(b1 != b3)
call assert_true(b1 == 0z0011) call assert_true(b1 == 0z0011)
call assert_fails('echo b1 == 9', 'E977:')
call assert_fails('echo b1 != 9', 'E977:')
call assert_false(b1 is b2) call assert_false(b1 is b2)
let b2 = b1 let b2 = b1
@@ -145,6 +147,22 @@ func Test_blob_concatenate()
call assert_equal(0zDEADBEEF, b) call assert_equal(0zDEADBEEF, b)
endfunc endfunc
func Test_blob_add()
let b = 0z0011
call add(b, 0x22)
call assert_equal(0z001122, b)
call add(b, '51')
call assert_equal(0z00112233, b)
call assert_fails('call add(b, [9])', 'E745:')
endfunc
func Test_blob_empty()
call assert_false(empty(0z001122))
call assert_true(empty(0z))
call assert_true(empty(v:_null_blob))
endfunc
" Test removing items in blob " Test removing items in blob
func Test_blob_func_remove() func Test_blob_func_remove()
" Test removing 1 element " Test removing 1 element
@@ -198,11 +216,19 @@ func Test_blob_map()
let b = 0zDEADBEEF let b = 0zDEADBEEF
call map(b, 'v:val + 1') call map(b, 'v:val + 1')
call assert_equal(0zDFAEBFF0, b) call assert_equal(0zDFAEBFF0, b)
call assert_fails("call map(b, '[9]')", 'E978:')
endfunc endfunc
func Test_blob_index() func Test_blob_index()
call assert_equal(2, index(0zDEADBEEF, 0xBE)) call assert_equal(2, index(0zDEADBEEF, 0xBE))
call assert_equal(-1, index(0zDEADBEEF, 0)) call assert_equal(-1, index(0zDEADBEEF, 0))
call assert_equal(2, index(0z11111111, 0x11, 2))
call assert_equal(3, index(0z11110111, 0x11, 2))
call assert_equal(2, index(0z11111111, 0x11, -2))
call assert_equal(3, index(0z11110111, 0x11, -2))
call assert_fails('call index("asdf", 0)', 'E714:')
endfunc endfunc
func Test_blob_insert() func Test_blob_insert()
@@ -213,6 +239,10 @@ func Test_blob_insert()
let b = 0zDEADBEEF let b = 0zDEADBEEF
call insert(b, 0x33, 2) call insert(b, 0x33, 2)
call assert_equal(0zDEAD33BEEF, b) call assert_equal(0zDEAD33BEEF, b)
call assert_fails('call insert(b, -1)', 'E475:')
call assert_fails('call insert(b, 257)', 'E475:')
call assert_fails('call insert(b, 0, [9])', 'E745:')
endfunc endfunc
func Test_blob_reverse() func Test_blob_reverse()