# HG changeset patch # User Bram Moolenaar # Date 1621878304 -7200 # Node ID 18545ce744c4a2771487a684e065451aa6926ab9 # Parent 2930ccf12eb72c80b68652b6705a067c0590b514 patch 8.2.2884: not enough cscope code is covered by tests Commit: https://github.com/vim/vim/commit/1e469c72ee2914fcffbcd49258036acdabd6f500 Author: Dominique Pelle Date: Mon May 24 19:37:26 2021 +0200 patch 8.2.2884: not enough cscope code is covered by tests Problem: Not enough cscope code is covered by tests. Solution: Add a few test cases. (Dominique Pell?, closes https://github.com/vim/vim/issues/8246) diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim --- a/src/testdir/test_cscope.vim +++ b/src/testdir/test_cscope.vim @@ -119,6 +119,7 @@ func Test_cscopeWithCscopeConnections() endfor " Test: Invalid find command + call assert_fails('cs find', 'E560:') call assert_fails('cs find x', 'E560:') if has('float') @@ -180,12 +181,19 @@ func Test_cscopeWithCscopeConnections() let a = execute('cstag TEST_COUNT') call assert_match('(1 of 1): <> #define TEST_COUNT 50000', a) call assert_equal('#define TEST_COUNT 50000', getline('.')) + call assert_fails('cstag DOES_NOT_EXIST', 'E257:') set csto=1 let a = execute('cstag index_to_key') call assert_match('(1 of 1): <> #define index_to_key(i) ((i) ^ 15167)', a) call assert_equal('#define index_to_key(i) ((i) ^ 15167)', getline('.')) - call assert_fails('cstag xxx', 'E257:') + call assert_fails('cstag DOES_NOT_EXIST', 'E257:') call assert_fails('cstag', 'E562:') + let save_tags = &tags + set tags= + call assert_fails('cstag DOES_NOT_EXIST', 'E257:') + let a = execute('cstag index_to_key') + call assert_match('(1 of 1): <> #define index_to_key(i) ((i) ^ 15167)', a) + let &tags = save_tags " Test: 'cst' option set nocst @@ -209,12 +217,16 @@ func Test_cscopeWithCscopeConnections() cd .. call delete('Xcscoperelative', 'd') + " Test: E259: no match found + call assert_fails('cscope find g DOES_NOT_EXIST', 'E259:') + " Test: this should trigger call to cs_print_tags() " Unclear how to check result though, we just exercise the code. set cst cscopequickfix=s0 call feedkeys(":cs find s main\", 't') " Test: cscope kill + call assert_fails('cscope kill', 'E560:') call assert_fails('cscope kill 2', 'E261:') call assert_fails('cscope kill xxx', 'E261:') diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2884, +/**/ 2883, /**/ 2882,