patch 8.0.0019

Problem:    Test_command_count is old style.
Solution:   Turn it into a new style test. (Naruhiko Nishino)
            Use more assert functions.

src/Makefile

@@ -2028,7 +2028,6 @@ test1 \
 	test_breakindent \
 	test_changelist \
 	test_close_count \
-	test_command_count \
 	test_comparators \
 	test_erasebackword \
 	test_eval \
@@ -2066,6 +2065,7 @@ test_arglist \
 	test_channel \
 	test_charsearch \
 	test_cmdline \
+	test_command_count \
 	test_crypt \
 	test_cscope \
 	test_cursor_func \

src/testdir/Make_all.mak

@@ -79,7 +79,6 @@ SCRIPTS_ALL = \
 	test_breakindent.out \
 	test_changelist.out \
 	test_close_count.out \
-	test_command_count.out \
 	test_comparators.out \
 	test_erasebackword.out \
 	test_eval.out \

src/testdir/test_alot.vim

@@ -3,6 +3,7 @@
 
 source test_assign.vim
 source test_autocmd.vim
+source test_command_count.vim
 source test_cursor_func.vim
 source test_delete.vim
 source test_execute_func.vim

src/testdir/test_autocmd.vim

@@ -1,5 +1,13 @@
 " Tests for autocommands
 
+function! s:cleanup_buffers() abort
+  for bnr in range(1, bufnr('$'))
+    if bufloaded(bnr) && bufnr('%') != bnr
+      execute 'bd! ' . bnr
+    endif
+  endfor
+endfunction
+
 func Test_vim_did_enter()
   call assert_false(v:vim_did_enter)
 
@@ -254,6 +262,9 @@ endfunc
 " Tests for autocommands on :close command.
 " This used to be in test13.
 func Test_three_windows()
+  " Clean up buffers, because in some cases this function fails.
+  call s:cleanup_buffers()
+
   " Write three files and open them, each in a window.
   " Then go to next window, with autocommand that deletes the previous one.
   " Do this twice, writing the file.