From 7ca8174d4d804c3cc6fc38c8f60dd8e97c11562b Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Thu, 13 Apr 2017 23:34:12 +0800 Subject: [PATCH 01/10] Add log api --- autoload/SpaceVim/api/logger.vim | 60 ++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 autoload/SpaceVim/api/logger.vim diff --git a/autoload/SpaceVim/api/logger.vim b/autoload/SpaceVim/api/logger.vim new file mode 100644 index 000000000..dfd3e9ba2 --- /dev/null +++ b/autoload/SpaceVim/api/logger.vim @@ -0,0 +1,60 @@ + +let s:self = { + \ 'name' : '', + \ 'silent' : 1, + \ 'file' : '', + \ } + +function! SpaceVim#api#logger#get() abort + return deepcopy(s:self) +endfunction + + +function! s:self.error(msg) abort + let time = strftime('%H:%M:%S') + let log = '[ ' . self.name . ' ] [' . time . '] [ Error ] ' . a:msg + if !self.silent + echoerr log + endif + call self.write(log) +endfunction + +function! s:self.write(msg) abort + if !isdirectory(fnamemodify(self.file, ':p:h')) + call mkdir(expand(fnamemodify(self.file, ':p:h')), 'p') + endif + let flags = filewritable(self.file) ? 'a' : '' + call writefile([a:msg], self.file, flags) +endfunction + +function! s:self.warn(msg) abort + let time = strftime('%H:%M:%S') + let log = '[ ' . self.name . ' ] [' . time . '] [ Warn ] ' . a:msg + if !self.silent + echohl WarningMsg + echom log + echohl None + endif + call self.write(log) +endfunction + +function! s:self.info(msg) abort + let time = strftime('%H:%M:%S') + let log = '[ ' . self.name . ' ] [' . time . '] [ Info ] ' . a:msg + if !self.silent + echom log + endif + call self.write(log) +endfunction + +function! s:self.set_name(name) abort + let self.name = a:name +endfunction + +function! s:self.get_name() abort + return self.name +endfunction + +function! s:self.set_file(file) abort + let self.file = a:file +endfunction From cfcb8e5d2ef354dfa2d2282dae988e4a6de7e665 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 20:09:06 +0800 Subject: [PATCH 02/10] Add view log func --- autoload/SpaceVim/api/logger.vim | 74 +++++++++++++++++++++----------- 1 file changed, 49 insertions(+), 25 deletions(-) diff --git a/autoload/SpaceVim/api/logger.vim b/autoload/SpaceVim/api/logger.vim index dfd3e9ba2..ff4a212c7 100644 --- a/autoload/SpaceVim/api/logger.vim +++ b/autoload/SpaceVim/api/logger.vim @@ -3,48 +3,55 @@ let s:self = { \ 'name' : '', \ 'silent' : 1, \ 'file' : '', + \ 'temp' : [], \ } +let s:levels = ['Info', 'Warn', 'Error'] + function! SpaceVim#api#logger#get() abort return deepcopy(s:self) endfunction function! s:self.error(msg) abort - let time = strftime('%H:%M:%S') - let log = '[ ' . self.name . ' ] [' . time . '] [ Error ] ' . a:msg - if !self.silent - echoerr log - endif - call self.write(log) + let time = strftime('%H:%M:%S') + let log = '[ ' . self.name . ' ] [' . time . '] [ Error ] ' . a:msg + if !self.silent + echoerr log + endif + call self.write(log) endfunction function! s:self.write(msg) abort - if !isdirectory(fnamemodify(self.file, ':p:h')) - call mkdir(expand(fnamemodify(self.file, ':p:h')), 'p') - endif - let flags = filewritable(self.file) ? 'a' : '' - call writefile([a:msg], self.file, flags) + if empty(self.file) + call add(self.temp, a:msg) + return + endif + if !isdirectory(fnamemodify(self.file, ':p:h')) + call mkdir(expand(fnamemodify(self.file, ':p:h')), 'p') + endif + let flags = filewritable(self.file) ? 'a' : '' + call writefile([a:msg], self.file, flags) endfunction function! s:self.warn(msg) abort - let time = strftime('%H:%M:%S') - let log = '[ ' . self.name . ' ] [' . time . '] [ Warn ] ' . a:msg - if !self.silent - echohl WarningMsg - echom log - echohl None - endif - call self.write(log) + let time = strftime('%H:%M:%S') + let log = '[ ' . self.name . ' ] [' . time . '] [ Warn ] ' . a:msg + if !self.silent + echohl WarningMsg + echom log + echohl None + endif + call self.write(log) endfunction function! s:self.info(msg) abort - let time = strftime('%H:%M:%S') - let log = '[ ' . self.name . ' ] [' . time . '] [ Info ] ' . a:msg - if !self.silent - echom log - endif - call self.write(log) + let time = strftime('%H:%M:%S') + let log = '[ ' . self.name . ' ] [' . time . '] [ Info ] ' . a:msg + if !self.silent + echom log + endif + call self.write(log) endfunction function! s:self.set_name(name) abort @@ -58,3 +65,20 @@ endfunction function! s:self.set_file(file) abort let self.file = a:file endfunction + +function! s:self.view(l) abort + let info = '' + if filereadable(self.file) + let logs = readfile(self.file, '') + let info .= join(filter(logs, + \ "v:val =~# '\[ " . self.name . ' \] \[\d\d\:\d\d\:\d\d\] \[' + \ . s:levels[a:l] . "\]'"), "\n") + else + let info .= '[ ' . self.name . ' ] : logger file ' . self.file + \ . ' does not exists, only log for current process will be shown!' + let info .= join(filter(self.temp, + \ "v:val =~# '\[ SpaceVim \] \[\d\d\:\d\d\:\d\d\] \[" + \ . s:levels[a:l] . "\]'"), "\n") + endif + return info +endfunction From 7c1829481046924b44be385eaa726a51efd27804 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 20:32:24 +0800 Subject: [PATCH 03/10] Add vader --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2abc0c19b..af6dfd894 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,17 @@ env: - LINT=vimlint - LINT=vint-errors - LINT=vint + - LINT=vader matrix: allow_failures: - env: LINT=vimlint - env: LINT=vint +before_install: + - sudo apt-get -qq update + - sudo apt-get install -y vim-gtk + install: - | if [ "${LINT#vimlint}" != "$LINT" ]; then @@ -22,6 +27,8 @@ install: git clone --depth=1 https://github.com/ynkdir/vim-vimlparser /tmp/vimlparser elif [ "${LINT#vint}" != "$LINT" ]; then virtualenv /tmp/vint && source /tmp/vint/bin/activate && pip install vim-vint + elif [ "${LINT#vader}" != "$LINT" ]; then + git clone https://github.com/junegunn/vader.vim.git /tmp/vader fi script: - | @@ -33,4 +40,13 @@ script: vint . elif [ "$LINT" = "vint-errors" ]; then vint --error . + elif [ "$LINT" = "vader" ]; then + vim -Nu <(cat << VIMRC + filetype off + set rtp+=/tmp/vader + set rtp+=. + set rtp+=after + filetype plugin indent on + syntax enable + VIMRC) -c 'Vader! test/*' > /dev/null fi From 8863e7bd48d2efae0682d1f9045b1d7d5414e938 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 20:46:00 +0800 Subject: [PATCH 04/10] Update yaml --- .travis.yml | 68 ++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index af6dfd894..56c832058 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,52 +1,52 @@ language: python cache: - pip: true + pip: true env: - matrix: - - LINT=vimlint-errors + matrix: + - LINT=vimlint-errors - LINT=vimlint - LINT=vint-errors - LINT=vint - LINT=vader matrix: - allow_failures: - - env: LINT=vimlint + allow_failures: + - env: LINT=vimlint - env: LINT=vint before_install: - - sudo apt-get -qq update + - sudo apt-get -qq update - sudo apt-get install -y vim-gtk install: - - | - if [ "${LINT#vimlint}" != "$LINT" ]; then - git clone --depth=1 https://github.com/syngan/vim-vimlint /tmp/vimlint - git clone --depth=1 https://github.com/ynkdir/vim-vimlparser /tmp/vimlparser - elif [ "${LINT#vint}" != "$LINT" ]; then - virtualenv /tmp/vint && source /tmp/vint/bin/activate && pip install vim-vint - elif [ "${LINT#vader}" != "$LINT" ]; then - git clone https://github.com/junegunn/vader.vim.git /tmp/vader - fi + - | + if [ "${LINT#vimlint}" != "$LINT" ]; then + git clone --depth=1 https://github.com/syngan/vim-vimlint /tmp/vimlint + git clone --depth=1 https://github.com/ynkdir/vim-vimlparser /tmp/vimlparser + elif [ "${LINT#vint}" != "$LINT" ]; then + virtualenv /tmp/vint && source /tmp/vint/bin/activate && pip install vim-vint + elif [ "${LINT#vader}" != "$LINT" ]; then + git clone https://github.com/junegunn/vader.vim.git /tmp/vader + fi script: - - | - if [ "$LINT" = "vimlint" ]; then - sh /tmp/vimlint/bin/vimlint.sh -l /tmp/vimlint -p /tmp/vimlparser . - elif [ "$LINT" = "vimlint-errors" ]; then - sh /tmp/vimlint/bin/vimlint.sh -E -l /tmp/vimlint -p /tmp/vimlparser . - elif [ "$LINT" = "vint" ]; then - vint . - elif [ "$LINT" = "vint-errors" ]; then - vint --error . - elif [ "$LINT" = "vader" ]; then - vim -Nu <(cat << VIMRC - filetype off - set rtp+=/tmp/vader - set rtp+=. - set rtp+=after - filetype plugin indent on - syntax enable - VIMRC) -c 'Vader! test/*' > /dev/null - fi + - | + if [ "$LINT" = "vimlint" ]; then + sh /tmp/vimlint/bin/vimlint.sh -l /tmp/vimlint -p /tmp/vimlparser . + elif [ "$LINT" = "vimlint-errors" ]; then + sh /tmp/vimlint/bin/vimlint.sh -E -l /tmp/vimlint -p /tmp/vimlparser . + elif [ "$LINT" = "vint" ]; then + vint . + elif [ "$LINT" = "vint-errors" ]; then + vint --error . + elif [ "$LINT" = "vader" ]; then + vim -Nu <(cat << VIMRC + filetype off + set rtp+=vader.vim + set rtp+=. + set rtp+=after + filetype plugin indent on + syntax enable + VIMRC) -c 'Vader! test/*' > /dev/null + fi From fecd8b489a8c3bde7142d8ab1dbcf41d18dea871 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 20:48:35 +0800 Subject: [PATCH 05/10] Fix lint --- .travis.yml | 68 ++++++++++++++++++++++++++--------------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/.travis.yml b/.travis.yml index 56c832058..ba4cff2b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,52 +1,52 @@ language: python cache: - pip: true + pip: true env: - matrix: - - LINT=vimlint-errors + matrix: + - LINT=vimlint-errors - LINT=vimlint - LINT=vint-errors - LINT=vint - LINT=vader matrix: - allow_failures: - - env: LINT=vimlint + allow_failures: + - env: LINT=vimlint - env: LINT=vint before_install: - - sudo apt-get -qq update + - sudo apt-get -qq update - sudo apt-get install -y vim-gtk install: - - | - if [ "${LINT#vimlint}" != "$LINT" ]; then - git clone --depth=1 https://github.com/syngan/vim-vimlint /tmp/vimlint - git clone --depth=1 https://github.com/ynkdir/vim-vimlparser /tmp/vimlparser - elif [ "${LINT#vint}" != "$LINT" ]; then - virtualenv /tmp/vint && source /tmp/vint/bin/activate && pip install vim-vint - elif [ "${LINT#vader}" != "$LINT" ]; then - git clone https://github.com/junegunn/vader.vim.git /tmp/vader - fi + - | + if [ "${LINT#vimlint}" != "$LINT" ]; then + git clone --depth=1 https://github.com/syngan/vim-vimlint /tmp/vimlint + git clone --depth=1 https://github.com/ynkdir/vim-vimlparser /tmp/vimlparser + elif [ "${LINT#vint}" != "$LINT" ]; then + virtualenv /tmp/vint && source /tmp/vint/bin/activate && pip install vim-vint + elif [ "${LINT#vader}" != "$LINT" ]; then + git clone https://github.com/junegunn/vader.vim.git /tmp/vader + fi script: - - | - if [ "$LINT" = "vimlint" ]; then - sh /tmp/vimlint/bin/vimlint.sh -l /tmp/vimlint -p /tmp/vimlparser . - elif [ "$LINT" = "vimlint-errors" ]; then - sh /tmp/vimlint/bin/vimlint.sh -E -l /tmp/vimlint -p /tmp/vimlparser . - elif [ "$LINT" = "vint" ]; then - vint . - elif [ "$LINT" = "vint-errors" ]; then - vint --error . - elif [ "$LINT" = "vader" ]; then - vim -Nu <(cat << VIMRC - filetype off - set rtp+=vader.vim - set rtp+=. - set rtp+=after - filetype plugin indent on - syntax enable - VIMRC) -c 'Vader! test/*' > /dev/null - fi + - | + if [ "$LINT" = "vimlint" ]; then + sh /tmp/vimlint/bin/vimlint.sh -l /tmp/vimlint -p /tmp/vimlparser . + elif [ "$LINT" = "vimlint-errors" ]; then + sh /tmp/vimlint/bin/vimlint.sh -E -l /tmp/vimlint -p /tmp/vimlparser . + elif [ "$LINT" = "vint" ]; then + vint . + elif [ "$LINT" = "vint-errors" ]; then + vint --error . + elif [ "$LINT" = "vader" ]; then + vim -Nu <(cat << VIMRC + filetype off + set rtp+=vader.vim + set rtp+=. + set rtp+=after + filetype plugin indent on + syntax enable + VIMRC) -c 'Vader! test/*' > /dev/null + fi From 364c73c0fb4bd10c3f4fa42b4283a92896198759 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 21:14:18 +0800 Subject: [PATCH 06/10] Fix lint --- .travis.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba4cff2b0..0e8a7831c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,12 +41,13 @@ script: elif [ "$LINT" = "vint-errors" ]; then vint --error . elif [ "$LINT" = "vader" ]; then - vim -Nu <(cat << VIMRC - filetype off - set rtp+=vader.vim - set rtp+=. - set rtp+=after - filetype plugin indent on - syntax enable - VIMRC) -c 'Vader! test/*' > /dev/null + vim -Nu <(cat <<-EOF + filetype off | + set rtp+=vader.vim | + set rtp+=. | + set rtp+=after | + filetype plugin indent on | + syntax enable | + EOF + ) -c 'Vader! test/*' > /dev/null fi From fbf89590a9e97edbe0e8f54ebf3bb3394932c54b Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 21:46:34 +0800 Subject: [PATCH 07/10] Add test --- .travis.yml | 10 +--------- test/test.vader | 21 +++++++++++++++++++++ test/test.vim | 6 ++++++ 3 files changed, 28 insertions(+), 9 deletions(-) create mode 100644 test/test.vader create mode 100644 test/test.vim diff --git a/.travis.yml b/.travis.yml index 0e8a7831c..6ff98f085 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,13 +41,5 @@ script: elif [ "$LINT" = "vint-errors" ]; then vint --error . elif [ "$LINT" = "vader" ]; then - vim -Nu <(cat <<-EOF - filetype off | - set rtp+=vader.vim | - set rtp+=. | - set rtp+=after | - filetype plugin indent on | - syntax enable | - EOF - ) -c 'Vader! test/*' > /dev/null + vim -Nu test/test.vim -c 'Vader! test/*' fi diff --git a/test/test.vader b/test/test.vader new file mode 100644 index 000000000..740bcfa67 --- /dev/null +++ b/test/test.vader @@ -0,0 +1,21 @@ +Execute (Clear search history): + for _ in range(&history) + call histdel('/', -1) + endfor + +Given (Search and destroy): + I'm a street walking cheetah with a heart full of napalm + I'm a runaway son of the nuclear A-bomb + I'm a world's forgotten boy + The one who searches and destroys + +Do (Searches): + /street\ + /walking\ + /cheetah\ + /runaway\ + /search\ + +Execute (Assertions): + Log string(map(range(1, &history), 'histget("/", - v:val)')) + AssertEqual 'search', histget('/', -1) diff --git a/test/test.vim b/test/test.vim new file mode 100644 index 000000000..4922aee54 --- /dev/null +++ b/test/test.vim @@ -0,0 +1,6 @@ +filetype off +set rtp+=/tmp/vader +set rtp+=. +set rtp+=after +filetype plugin indent on +syntax enable From e73c24513893b4d308acc2a9d14fe8d5c9dadca4 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 22:30:45 +0800 Subject: [PATCH 08/10] Add test for logger api --- autoload/SpaceVim/api/logger.vim | 19 ++++++++++++++++--- test/api/logger.vader | 22 ++++++++++++++++++++++ test/api/logger.vim | 21 +++++++++++++++++++++ 3 files changed, 59 insertions(+), 3 deletions(-) create mode 100644 test/api/logger.vader create mode 100644 test/api/logger.vim diff --git a/autoload/SpaceVim/api/logger.vim b/autoload/SpaceVim/api/logger.vim index ff4a212c7..4fa43c3b8 100644 --- a/autoload/SpaceVim/api/logger.vim +++ b/autoload/SpaceVim/api/logger.vim @@ -2,20 +2,27 @@ let s:self = { \ 'name' : '', \ 'silent' : 1, + \ 'level' : 1, \ 'file' : '', \ 'temp' : [], \ } +"1 : log all messages +"2 : log warning and error messages +"3 : log error messages only let s:levels = ['Info', 'Warn', 'Error'] function! SpaceVim#api#logger#get() abort return deepcopy(s:self) endfunction +function! s:self.set_level(l) abort + let self.level = a:l +endfunction function! s:self.error(msg) abort let time = strftime('%H:%M:%S') - let log = '[ ' . self.name . ' ] [' . time . '] [ Error ] ' . a:msg + let log = '[ ' . self.name . ' ] [' . time . '] [ ' . s:levels[2] . ' ] ' . a:msg if !self.silent echoerr log endif @@ -35,8 +42,11 @@ function! s:self.write(msg) abort endfunction function! s:self.warn(msg) abort + if self.level > 2 + return + endif let time = strftime('%H:%M:%S') - let log = '[ ' . self.name . ' ] [' . time . '] [ Warn ] ' . a:msg + let log = '[ ' . self.name . ' ] [' . time . '] [ ' . s:levels[1] . ' ] ' . a:msg if !self.silent echohl WarningMsg echom log @@ -46,8 +56,11 @@ function! s:self.warn(msg) abort endfunction function! s:self.info(msg) abort + if self.level > 1 + return + endif let time = strftime('%H:%M:%S') - let log = '[ ' . self.name . ' ] [' . time . '] [ Info ] ' . a:msg + let log = '[ ' . self.name . ' ] [' . time . '] [ ' . s:levels[0] . ' ] ' . a:msg if !self.silent echom log endif diff --git a/test/api/logger.vader b/test/api/logger.vader new file mode 100644 index 000000000..05fd3bfda --- /dev/null +++ b/test/api/logger.vader @@ -0,0 +1,22 @@ +Execute ( SpaceVim api: logger ): + new + let log = SpaceVim#api#import('logger') + call log.set_name('TestLog') + AssertEqual log.name, 'TestLog' + call log.info('info test') + call log.warn('info test') + call log.error('info test') + AssertEqual len(log.temp), 3 + call log.set_level(2) + call log.info('info test') + call log.warn('info test') + call log.error('info test') + AssertEqual len(log.temp), 5 + call log.set_level(3) + call log.info('info test') + call log.warn('info test') + call log.error('info test') + AssertEqual len(log.temp), 6 + AssertEqual len(log.view(1)), 6 + AssertEqual len(log.view(2)), 5 + AssertEqual len(log.view(3)), 3 diff --git a/test/api/logger.vim b/test/api/logger.vim new file mode 100644 index 000000000..735ff70a3 --- /dev/null +++ b/test/api/logger.vim @@ -0,0 +1,21 @@ +let log = SpaceVim#api#import('logger') +call log.set_name('TestLog') +" log.name == 'TestLog' +call log.info('info test') +call log.warn('info test') +call log.error('info test') +" len(log.temp) == 3 +call log.set_level(2) +call log.info('info test') +call log.warn('info test') +call log.error('info test') +" len(log.temp) == 5 +call log.set_level(3) +call log.info('info test') +call log.warn('info test') +call log.error('info test') +" len(log.temp) == 6 +" len(log.view(1)) == 6 +" len(log.view(2)) == 5 +" len(log.view(3)) == 3 + From 837f89c446eff199f5a34c3589a014fa8bb63c32 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 22:58:36 +0800 Subject: [PATCH 09/10] Fix lint --- autoload/SpaceVim/api/logger.vim | 29 +++++++++++++++++++++++------ test/api/logger.vader | 6 +++--- test/api/logger.vim | 6 +++--- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/autoload/SpaceVim/api/logger.vim b/autoload/SpaceVim/api/logger.vim index 4fa43c3b8..e39a487c2 100644 --- a/autoload/SpaceVim/api/logger.vim +++ b/autoload/SpaceVim/api/logger.vim @@ -83,15 +83,32 @@ function! s:self.view(l) abort let info = '' if filereadable(self.file) let logs = readfile(self.file, '') - let info .= join(filter(logs, - \ "v:val =~# '\[ " . self.name . ' \] \[\d\d\:\d\d\:\d\d\] \[' - \ . s:levels[a:l] . "\]'"), "\n") + let info .= join(filter(logs, 'self._comp(v:val, a:l)'), "\n") else let info .= '[ ' . self.name . ' ] : logger file ' . self.file \ . ' does not exists, only log for current process will be shown!' - let info .= join(filter(self.temp, - \ "v:val =~# '\[ SpaceVim \] \[\d\d\:\d\d\:\d\d\] \[" - \ . s:levels[a:l] . "\]'"), "\n") + let info .= "\n" + let info .= join(filter(deepcopy(self.temp), 'self._comp(v:val, a:l)'), "\n") endif return info endfunction + +function! s:self._comp(msg, l) abort + if a:msg =~# '\[ ' . self.name . ' \] \[\d\d\:\d\d\:\d\d\] \[ ' + \ . s:levels[2] . ' \]' + return 1 + elseif a:msg =~# '\[ ' . self.name . ' \] \[\d\d\:\d\d\:\d\d\] \[ ' + \ . s:levels[1] . ' \]' + if a:l > 2 + return 0 + else + return 1 + endif + else + if a:l > 1 + return 0 + else + return 1 + endif + endif +endfunction diff --git a/test/api/logger.vader b/test/api/logger.vader index 05fd3bfda..5adff5da9 100644 --- a/test/api/logger.vader +++ b/test/api/logger.vader @@ -17,6 +17,6 @@ Execute ( SpaceVim api: logger ): call log.warn('info test') call log.error('info test') AssertEqual len(log.temp), 6 - AssertEqual len(log.view(1)), 6 - AssertEqual len(log.view(2)), 5 - AssertEqual len(log.view(3)), 3 + AssertEqual len(split(log.view(1), "\n")), 7 + AssertEqual len(split(log.view(2), "\n")), 6 + AssertEqual len(split(log.view(3), "\n")), 4 diff --git a/test/api/logger.vim b/test/api/logger.vim index 735ff70a3..623ac7a5c 100644 --- a/test/api/logger.vim +++ b/test/api/logger.vim @@ -15,7 +15,7 @@ call log.info('info test') call log.warn('info test') call log.error('info test') " len(log.temp) == 6 -" len(log.view(1)) == 6 -" len(log.view(2)) == 5 -" len(log.view(3)) == 3 +" len(split(log.view(1), "\n")) == 7 +" len(split(log.view(2), "\n")) == 6 +" len(split(log.view(3), "\n")) == 4 From 42b7d3bcf3b2f3c687afd0bf98bb2b34ff8f4adb Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Fri, 14 Apr 2017 23:05:32 +0800 Subject: [PATCH 10/10] Remove vim file in test --- test/api/logger.vim | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 test/api/logger.vim diff --git a/test/api/logger.vim b/test/api/logger.vim deleted file mode 100644 index 623ac7a5c..000000000 --- a/test/api/logger.vim +++ /dev/null @@ -1,21 +0,0 @@ -let log = SpaceVim#api#import('logger') -call log.set_name('TestLog') -" log.name == 'TestLog' -call log.info('info test') -call log.warn('info test') -call log.error('info test') -" len(log.temp) == 3 -call log.set_level(2) -call log.info('info test') -call log.warn('info test') -call log.error('info test') -" len(log.temp) == 5 -call log.set_level(3) -call log.info('info test') -call log.warn('info test') -call log.error('info test') -" len(log.temp) == 6 -" len(split(log.view(1), "\n")) == 7 -" len(split(log.view(2), "\n")) == 6 -" len(split(log.view(3), "\n")) == 4 -