From fdf1e53da5cd09f5dd003708dad1933a62db82c4 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Wed, 7 Jan 2015 20:14:48 +0900 Subject: [PATCH] Change test code to use local repositories --- test/regressions.vader | 74 ++++++++++++++++++ test/run | 35 ++++++--- test/test.vader | 68 ++++++++++++++++ test/workflow.vader | 173 +++++------------------------------------ 4 files changed, 185 insertions(+), 165 deletions(-) create mode 100644 test/regressions.vader create mode 100644 test/test.vader diff --git a/test/regressions.vader b/test/regressions.vader new file mode 100644 index 0000000..5ea4d5e --- /dev/null +++ b/test/regressions.vader @@ -0,0 +1,74 @@ +********************************************************************** +Execute (#112 On-demand loading should not suppress messages from ftplugin): + call plug#begin('$PLUG_FIXTURES') + Plug '$PLUG_FIXTURES/ftplugin-msg', { 'for': 'c' } + call plug#end() + + redir => out + tabnew a.c + redir END + Assert stridx(out, 'ftplugin') >= 0 + +* The same applies to plug#load()) + redir => out + call plug#load('ftplugin-msg') + redir END + Assert stridx(out, 'ftplugin') >= 0 + q + + +********************************************************************** +Execute (#114 Should not contain empty path in &rtp): + call plug#begin('$TMPDIR/plugged') + call plug#end() + + Log &rtp + Assert &rtp !~ ',,', 'Commas' + Assert &rtp !~ '^,', 'Comma prefix' + Assert &rtp !~ ',$', 'Comma suffix' + +********************************************************************** +Execute (#130 Proper cleanup of on-demand loading triggers): + augroup PlugLOD + autocmd! + augroup END + + " Cleared on command + call plug#begin('$TMPDIR/plugged') + Plug 'junegunn/vim-emoji', { 'on': ['EmojiCommand', 'EmojiCommand2', '(EmojiMapping)'] } + call plug#end() + PlugInstall | q + + Assert exists(':EmojiCommand'), 'EmojiCommand not defined' + Assert exists(':EmojiCommand2'), 'EmojiCommand2 not defined' + Assert !empty(mapcheck('(EmojiMapping)')), '(EmojiMapping) not defined' + + silent! EmojiCommand + + Assert !exists(':EmojiCommand'), 'EmojiCommand defined' + Assert !exists(':EmojiCommand2'), 'EmojiCommand2 defined' + Assert empty(mapcheck('(EmojiMapping)')), '(EmojiMapping) defined' + + " Cleared on FileType + call plug#begin('$TMPDIR/plugged') + Plug 'junegunn/vim-emoji', { 'on': ['EmojiCommandExtra', '(EmojiMappingExtra)'], 'for': ['emoji'] } + call plug#end() + + Assert exists(':EmojiCommandExtra'), 'EmojiCommandExtra not defined' + Assert !empty(mapcheck('(EmojiMappingExtra)')), '(EmojiMappingExtra) not defined' + + setf emoji + + Assert !exists(':EmojiCommandExtra'), 'EmojiCommandExtra defined' + Assert empty(mapcheck('(EmojiMappingExtra)')), '(EmojiMappingExtra) defined' + +********************************************************************** +Execute (#131 Syntax error): + call plug#begin('/no-permission') + Plug 'junegunn/vim-emoji' + call plug#end() + + redir => out + silent PlugInstall + redir END + Assert out =~ 'Invalid plug directory: /no-permission' diff --git a/test/run b/test/run index 23a6355..f9115f0 100755 --- a/test/run +++ b/test/run @@ -7,14 +7,29 @@ cd - > /dev/null export PLUG_FIXTURES=$(pwd)/fixtures -if [ ! -d vader.vim ]; then - git clone https://github.com/junegunn/vader.vim.git -fi +clone() { + if [ ! -d $2 ]; then + git clone $1 $2 + fi +} + +# Clone +cd /tmp +mkdir -p junegunn vim-scripts jg +for repo in vader.vim goyo.vim rust.vim seoul256.vim vim-easy-align vim-fnr \ + vim-oblique vim-pseudocl vim-redis vim-emoji; do + clone https://github.com/junegunn/${repo}.git junegunn/$repo & +done +clone https://github.com/vim-scripts/beauty256.git vim-scripts/beauty256 & rm -rf $PLUG_FIXTURES/fzf -if [ ! -d fzf-staged ]; then - git clone https://github.com/junegunn/fzf.git $PLUG_FIXTURES/fzf-staged -fi +clone https://github.com/junegunn/fzf.git $PLUG_FIXTURES/fzf-staged & +wait + +(cd junegunn/seoul256.vim && + git checkout no-t_co && git checkout master) > /dev/null 2>&1 +clone junegunn/vim-emoji jg/vim-emoji +cd - > /dev/null make_dirs() { mkdir -p "$PLUG_FIXTURES/$1" @@ -52,7 +67,7 @@ DOC } cat > /tmp/mini-vimrc << VIMRC -set rtp+=vader.vim +set rtp+=/tmp/junegunn/vader.vim set shell=/bin/bash source $PLUG_SRC VIMRC @@ -60,10 +75,10 @@ VIMRC [ -z "$TMPDIR" ] && export TMPDIR=/tmp/ init if [ "$1" = '!' ]; then - /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader! workflow.vader' > /dev/null && + /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader! test.vader' > /dev/null && init && - /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! workflow.vader' > /dev/null + /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'let g:plug_threads = 1 | Vader! test.vader' > /dev/null else - /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader workflow.vader' + /usr/local/bin/vim -Nu /tmp/mini-vimrc -c 'Vader test.vader' fi diff --git a/test/test.vader b/test/test.vader new file mode 100644 index 0000000..3afac67 --- /dev/null +++ b/test/test.vader @@ -0,0 +1,68 @@ +Execute (Initialize test environment): + Save &rtp, g:plugs, g:plug_home, g:plug_window + + let first_rtp = split(&rtp, ',')[0] + let last_rtp = split(&rtp, ',')[-1] + + let vader = fnamemodify(globpath(&rtp, 'autoload/vader.vim'), ':h:h') + let plug = fnamemodify(globpath(&rtp, 'autoload/plug.vim'), ':h:h') + set rtp=$HOME/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/.vim/after + execute 'set rtp^='.vader + execute 'set rtp^='.plug + let basertp = &rtp + + unlet! g:plugs g:plug_home g:plug_window + let g:plug_url_format = 'file:///tmp/%s' + + set t_Co=256 + colo default + pclose + + function! PlugStatusSorted() + PlugStatus + %y + q + normal! P + %sort + g/^$/d + endfunction + + function! AssertExpect(bang, pat, cnt) + let op = a:bang ? '==#' : '=~#' + AssertEqual a:cnt, len(filter(getline(1, '$'), "v:val ".op." '".a:pat."'")) + endfunction + command! -nargs=+ -bang AssertExpect call AssertExpect('' == '!', ) + + function! EnsureLoaded() + if has('vim_starting') + runtime! plugin/**/*.vim + endif + endfunction + +Execute (Print Ruby version): + redir => out + silent ruby puts RUBY_VERSION + redir END + Log substitute(out, '\n', '', 'g') + +Include: workflow.vader +Include: regressions.vader + +Execute (Cleanup): + silent! call system('rm -rf '.temp_plugged) + silent! call system('rm -rf '.temp_plugged) + silent! call rename(fzf, expand('$PLUG_FIXTURES/fzf-staged')) + silent! unlet g:plugs + silent! unlet g:plug_home + silent! unlet g:plug_url_format + silent! unlet temp_plugged vader plug basertp save_rtp repo lnum fzf out tabnr found len + silent! delf PlugStatusSorted + silent! delf AssertExpect + silent! delf PlugUpdated + silent! delf EnsureLoaded + silent! delc AssertExpect + silent! unmap / + silent! unmap ? + + Restore + diff --git a/test/workflow.vader b/test/workflow.vader index 6bc06a5..7ecf517 100644 --- a/test/workflow.vader +++ b/test/workflow.vader @@ -1,52 +1,6 @@ -Execute (Initialize test environment): - Save &rtp, g:plugs, g:plug_home, g:plug_window - - let first_rtp = split(&rtp, ',')[0] - let last_rtp = split(&rtp, ',')[-1] - - let vader = fnamemodify(globpath(&rtp, 'autoload/vader.vim'), ':h:h') - let plug = fnamemodify(globpath(&rtp, 'autoload/plug.vim'), ':h:h') - set rtp=$HOME/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/.vim/after - execute 'set rtp^='.vader - execute 'set rtp^='.plug - let basertp = &rtp - - unlet! g:plugs g:plug_home g:plug_window - - set t_Co=256 - colo default - pclose - - function! PlugStatusSorted() - PlugStatus - %y - q - normal! P - %sort - g/^$/d - endfunction - - function! AssertExpect(bang, pat, cnt) - let op = a:bang ? '==#' : '=~#' - AssertEqual a:cnt, len(filter(getline(1, '$'), "v:val ".op." '".a:pat."'")) - endfunction - command! -nargs=+ -bang AssertExpect call AssertExpect('' == '!', ) - - function! EnsureLoaded() - if has('vim_starting') - runtime! plugin/**/*.vim - endif - endfunction - -Execute (Print Ruby version): - redir => out - silent ruby puts RUBY_VERSION - redir END - Log substitute(out, '\n', '', 'g') - Execute (plug#end() before plug#begin() should fail): redir => out - AssertEqual 0, plug#end() + silent! AssertEqual 0, plug#end() redir END Assert stridx(out, 'Call plug#begin() first') >= 0 @@ -80,7 +34,7 @@ Execute (Subsequent plug#begin() calls will reuse g:plug_home): Execute (Test Plug command): " Git repo with branch Plug 'junegunn/seoul256.vim', 'yes-t_co' - AssertEqual 'https://git::@github.com/junegunn/seoul256.vim.git', g:plugs['seoul256.vim'].uri + AssertEqual 'file:///tmp/junegunn/seoul256.vim', g:plugs['seoul256.vim'].uri AssertEqual join([temp_plugged, 'seoul256.vim/'], '/'), g:plugs['seoul256.vim'].dir AssertEqual 'yes-t_co', g:plugs['seoul256.vim'].branch @@ -89,7 +43,7 @@ Execute (Test Plug command): " Git repo with tag Plug 'junegunn/goyo.vim', '1.5.2' - AssertEqual 'https://git::@github.com/junegunn/goyo.vim.git', g:plugs['goyo.vim'].uri + AssertEqual 'file:///tmp/junegunn/goyo.vim', g:plugs['goyo.vim'].uri AssertEqual join([temp_plugged, 'goyo.vim/'], '/'), g:plugs['goyo.vim'].dir AssertEqual '1.5.2', g:plugs['goyo.vim'].branch @@ -97,14 +51,14 @@ Execute (Test Plug command): AssertEqual '1.5.3', g:plugs['goyo.vim'].branch " Git URI - Plug 'https://bitbucket.org/junegunn/vim-emoji.git' - AssertEqual 'https://bitbucket.org/junegunn/vim-emoji.git', g:plugs['vim-emoji'].uri + Plug 'file:///tmp/jg/vim-emoji' + AssertEqual 'file:///tmp/jg/vim-emoji', g:plugs['vim-emoji'].uri AssertEqual 'master', g:plugs['vim-emoji'].branch AssertEqual join([temp_plugged, 'vim-emoji/'], '/'), g:plugs['vim-emoji'].dir " vim-scripts/ Plug 'beauty256' - AssertEqual 'https://git::@github.com/vim-scripts/beauty256.git', g:plugs.beauty256.uri + AssertEqual 'file:///tmp/vim-scripts/beauty256', g:plugs.beauty256.uri AssertEqual 'master', g:plugs.beauty256.branch AssertEqual 4, len(g:plugs) @@ -181,7 +135,7 @@ Expect: Execute (Change branch of seoul256.vim): call plug#begin() Plug 'junegunn/seoul256.vim' - Plug 'https://bitbucket.org/junegunn/vim-emoji.git' + Plug 'file:///tmp/jg/vim-emoji' call plug#end() Execute (PlugStatus): @@ -197,15 +151,15 @@ Expect: Execute (Change URI of seoul256.vim): call plug#begin() Plug 'junegunn.choi/seoul256.vim' - Plug 'https://bitbucket.org/junegunn/vim-emoji.git' + Plug 'file:///tmp/jg/vim-emoji' call plug#end() Execute (PlugStatus): call PlugStatusSorted() Expect: - Expected: https://git::@github.com/junegunn.choi/seoul256.vim.git - Invalid URI: https://git::@github.com/junegunn/seoul256.vim.git + Expected: file:///tmp/junegunn.choi/seoul256.vim + Invalid URI: file:///tmp/junegunn/seoul256.vim PlugClean required. - vim-emoji: OK Finished. 1 error(s). @@ -238,8 +192,8 @@ Execute (PlugStatus): call PlugStatusSorted() Expect: - Expected: https://git::@github.com/junegunn/vim-emoji.git - Invalid URI: https://bitbucket.org/junegunn/vim-emoji.git + Expected: file:///tmp/junegunn/vim-emoji + Invalid URI: file:///tmp/jg/vim-emoji Not found. Try PlugInstall. PlugClean required. Finished. 2 error(s). @@ -629,7 +583,7 @@ Execute (On install): Plug 'junegunn/vim-pseudocl' call plug#end() - PlugInstall + silent PlugInstall q Assert filereadable(g:plugs['vim-easy-align'].dir.'/installed'), @@ -646,7 +600,7 @@ Execute (On update): " Reset for updates call system('cd '.g:plugs['vim-pseudocl'].dir.' && git reset --hard HEAD^') - PlugUpdate + silent PlugUpdate Log getline(1, '$') q @@ -669,7 +623,7 @@ Execute (When already installed): \ 'vim-pseudocl/installed2 should not exist' Execute (PlugInstall!): - PlugInstall! + silent PlugInstall! q Assert filereadable(g:plugs['vim-easy-align'].dir.'/installed2'), \ 'vim-easy-align/installed2 should exist' @@ -690,7 +644,7 @@ Execute (When already updated): \ 'vim-pseudocl/updated2 should not exist' Execute (PlugUpdate!): - PlugUpdate! + silent PlugUpdate! q Assert filereadable(g:plugs['vim-easy-align'].dir.'/updated2'), \ 'vim-easy-align/updated2 should exist' @@ -911,6 +865,7 @@ Execute (Open plug window in a new tab): ~ g:plug_url_format ********************************************************************** Execute (Using g:plug_url_format): + let prev_plug_url_format = g:plug_url_format call plug#begin() let g:plug_url_format = 'git@bitbucket.org:%s.git' Plug 'junegunn/seoul256.vim' @@ -918,7 +873,7 @@ Execute (Using g:plug_url_format): Plug 'beauty256' AssertEqual 'git@bitbucket.org:junegunn/seoul256.vim.git', g:plugs['seoul256.vim'].uri AssertEqual 'git@bitsocket.org:vim-scripts/beauty256.git', g:plugs['beauty256'].uri - unlet g:plug_url_format + let g:plug_url_format = prev_plug_url_format ********************************************************************** ~ U @@ -1052,24 +1007,6 @@ Execute (PlugClean should not try to remove unmanaged plugins inside g:plug_home AssertExpect 'Already clean', 1 q -********************************************************************** -Execute (#112 On-demand loading should not suppress messages from ftplugin): - call plug#begin('$PLUG_FIXTURES') - Plug '$PLUG_FIXTURES/ftplugin-msg', { 'for': 'c' } - call plug#end() - - redir => out - tabnew a.c - redir END - Assert stridx(out, 'ftplugin') >= 0 - -* The same applies to plug#load()) - redir => out - call plug#load('ftplugin-msg') - redir END - Assert stridx(out, 'ftplugin') >= 0 - q - ********************************************************************** Execute (PlugSnapshot): call plug#begin('$TMPDIR/plugged') @@ -1093,77 +1030,3 @@ Execute (PlugSnapshot): AssertEqual 'snapshot.sh', fnamemodify(expand('%'), ':t') q -********************************************************************** -Execute (#114 Should not contain empty path in &rtp): - call plug#begin('$TMPDIR/plugged') - call plug#end() - - Log &rtp - Assert &rtp !~ ',,', 'Commas' - Assert &rtp !~ '^,', 'Comma prefix' - Assert &rtp !~ ',$', 'Comma suffix' - -********************************************************************** -Execute (#130 Proper cleanup of on-demand loading triggers): - augroup PlugLOD - autocmd! - augroup END - - " Cleared on command - call plug#begin('$TMPDIR/plugged') - Plug 'junegunn/vim-emoji', { 'on': ['EmojiCommand', 'EmojiCommand2', '(EmojiMapping)'] } - call plug#end() - PlugInstall | q - - Assert exists(':EmojiCommand'), 'EmojiCommand not defined' - Assert exists(':EmojiCommand2'), 'EmojiCommand2 not defined' - Assert !empty(mapcheck('(EmojiMapping)')), '(EmojiMapping) not defined' - - silent! EmojiCommand - - Assert !exists(':EmojiCommand'), 'EmojiCommand defined' - Assert !exists(':EmojiCommand2'), 'EmojiCommand2 defined' - Assert empty(mapcheck('(EmojiMapping)')), '(EmojiMapping) defined' - - " Cleared on FileType - call plug#begin('$TMPDIR/plugged') - Plug 'junegunn/vim-emoji', { 'on': ['EmojiCommandExtra', '(EmojiMappingExtra)'], 'for': ['emoji'] } - call plug#end() - - Assert exists(':EmojiCommandExtra'), 'EmojiCommandExtra not defined' - Assert !empty(mapcheck('(EmojiMappingExtra)')), '(EmojiMappingExtra) not defined' - - setf emoji - - Assert !exists(':EmojiCommandExtra'), 'EmojiCommandExtra defined' - Assert empty(mapcheck('(EmojiMappingExtra)')), '(EmojiMappingExtra) defined' - -********************************************************************** -Execute (#131 Syntax error): - call plug#begin('/no-permission') - Plug 'junegunn/vim-emoji' - call plug#end() - - redir => out - silent PlugInstall - redir END - Assert out =~ 'Invalid plug directory: /no-permission' - -Execute (Cleanup): - silent! call system('rm -rf '.temp_plugged) - silent! call system('rm -rf '.temp_plugged) - silent! call rename(fzf, expand('$PLUG_FIXTURES/fzf-staged')) - silent! unlet g:plugs - silent! unlet g:plug_home - silent! unlet g:plug_url_format - silent! unlet temp_plugged vader plug basertp save_rtp repo lnum fzf out tabnr found len - silent! delf PlugStatusSorted - silent! delf AssertExpect - silent! delf PlugUpdated - silent! delf EnsureLoaded - silent! delc AssertExpect - silent! unmap / - silent! unmap ? - - Restore -