Merge pull request previm#36 from kannokanno/35-switch-vimtest-to-themis

previm#35 switch vimtest to themis

Author: kannokanno

.travis.yml

@@ -0,0 +1,11 @@
+language: generic
+
+before_script:
+  - git clone https://github.com/thinca/vim-themis --quiet --branch v1.4.1 --single-branch --depth 1 /tmp/vim-themis
+
+script:
+  - vim --version
+  - /tmp/vim-themis/bin/themis test/ -r --reporter dot
+
+notifications:
+  email: false

test/autoload/previm_test.vim

@@ -1,110 +1,111 @@
 let s:newline = "\\n"
+let s:assert = themis#helper('assert')
 
-let s:t = vimtest#new('convert_to_content') "{{{
+let s:t = themis#suite('convert_to_content') "{{{
 
 function! s:t.empty_lines()
   let arg = []
   let expected = ''
-  call self.assert.equals(expected, previm#convert_to_content(arg))
+  call s:assert.equals(expected, previm#convert_to_content(arg))
 endfunction
 
 function! s:t.not_exists_escaped()
   let arg = ['aaabbb', 'あいうえお漢字']
   let expected = 
         \   'aaabbb' . s:newline
         \ . 'あいうえお漢字'
-  call self.assert.equals(expected, previm#convert_to_content(arg))
+  call s:assert.equals(expected, previm#convert_to_content(arg))
 endfunction
 
 function! s:t.exists_backslash()
   let arg = ['\(x -> x + 2)', 'あいうえお漢字']
   let expected =
         \   '\\(x -> x + 2)' . s:newline
         \ . 'あいうえお漢字'
-  call self.assert.equals(expected, previm#convert_to_content(arg))
+  call s:assert.equals(expected, previm#convert_to_content(arg))
 endfunction
 
 function! s:t.exists_double_quotes()
   let arg = ['he said. "Hello, john"', 'あいうえお漢字']
   let expected =
         \   'he said. \"Hello, john\"' . s:newline
         \ . 'あいうえお漢字'
-  call self.assert.equals(expected, previm#convert_to_content(arg))
+  call s:assert.equals(expected, previm#convert_to_content(arg))
 endfunction
 "}}}
-let s:t = vimtest#new('relative_to_absolute') "{{{
+let s:t = themis#suite('relative_to_absolute') "{{{
 
 function! s:t.nothing_when_empty()
   let arg_line = ''
   let expected = ''
-  call self.assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
+  call s:assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
 endfunction
 
 function! s:t.nothing_when_not_href()
   let arg_line = 'previm.dummy.com/some/path/img.png'
   let expected = 'previm.dummy.com/some/path/img.png'
-  call self.assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
+  call s:assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
 endfunction
 
 function! s:t.nothing_when_absolute_by_http()
   let arg_line = 'http://previm.dummy.com/some/path/img.png'
   let expected = 'http://previm.dummy.com/some/path/img.png'
-  call self.assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
+  call s:assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
 endfunction
 
 function! s:t.nothing_when_absolute_by_https()
   let arg_line = 'https://previm.dummy.com/some/path/img.png'
   let expected = 'https://previm.dummy.com/some/path/img.png'
-  call self.assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
+  call s:assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
 endfunction
 
 function! s:t.nothing_when_absolute_by_file()
   let arg_line = 'file://previm/some/path/img.png'
   let expected = 'file://previm/some/path/img.png'
-  call self.assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
+  call s:assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, ''))
 endfunction
 
 function! s:t.replace_path_when_relative()
   let rel_path = 'previm/some/path/img.png'
   let arg_line = printf('![img](%s)', rel_path)
   let arg_dir = '/Users/foo/tmp'
   let expected = printf('![img](file://localhost%s/%s)', arg_dir, rel_path)
-  call self.assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, arg_dir))
+  call s:assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, arg_dir))
 endfunction
 
 function! s:t.urlencoded_path()
   let rel_path = 'previm\some\path\img.png'
   let arg_line = printf('![img](%s)', rel_path)
   let arg_dir = 'C:\Documents and Settings\folder'
   let expected = '![img](file://localhost/C:\Documents%20and%20Settings\folder/previm\some\path\img.png)'
-  call self.assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, arg_dir))
+  call s:assert.equals(expected, previm#relative_to_absolute_imgpath(arg_line, arg_dir))
 endfunction
 "}}}
-let s:t = vimtest#new('fetch_imgpath_elements') "{{{
+let s:t = themis#suite('fetch_imgpath_elements') "{{{
 
 function! s:t.nothing_when_empty()
   let arg = ''
   let expected = s:empty_img_elements()
-  call self.assert.equals(expected, previm#fetch_imgpath_elements(arg))
+  call s:assert.equals(expected, previm#fetch_imgpath_elements(arg))
 endfunction
 
 function! s:t.nothing_when_not_img_statement()
   let arg = '## hogeほげ'
   let expected = s:empty_img_elements()
-  call self.assert.equals(expected, previm#fetch_imgpath_elements(arg))
+  call s:assert.equals(expected, previm#fetch_imgpath_elements(arg))
 endfunction
 
 function! s:t.get_title_and_path()
   let arg = '![IMG](path/img.png)'
   let expected = {'title': 'IMG', 'path': 'path/img.png'}
-  call self.assert.equals(expected, previm#fetch_imgpath_elements(arg))
+  call s:assert.equals(expected, previm#fetch_imgpath_elements(arg))
 endfunction
 
 function! s:empty_img_elements()
   return {'title': '', 'path': ''}
 endfunction
 "}}}
-let s:t = vimtest#new('refresh_css') "{{{
+let s:t = themis#suite('refresh_css') "{{{
 function! s:t.setup()
   let self.exist_previm_disable_default_css = 0
   if exists('g:previm_disable_default_css')
@@ -136,7 +137,7 @@ endfunction
 function! s:t.default_content_if_not_exists_setting()
   call previm#refresh_css()
   let actual = readfile(previm#make_preview_file_path('css/previm.css'))
-  call self.assert.equals([
+  call s:assert.equals([
         \ "@import url('origin.css');",
         \ "@import url('lib/github.css');",
         \ ], actual)
@@ -146,7 +147,7 @@ function! s:t.default_content_if_invalid_setting()
   let g:previm_disable_default_css = 2
   call previm#refresh_css()
   let actual = readfile(previm#make_preview_file_path('css/previm.css'))
-  call self.assert.equals([
+  call s:assert.equals([
         \ "@import url('origin.css');",
         \ "@import url('lib/github.css');",
         \ ], actual)
@@ -159,7 +160,7 @@ function! s:t.custom_content_if_exists_file()
   call previm#refresh_css()
 
   let actual = readfile(previm#make_preview_file_path('css/previm.css'))
-  call self.assert.equals(["@import url('user_custom.css');"], actual)
+  call s:assert.equals(["@import url('user_custom.css');"], actual)
 endfunction
 
 function! s:t.empty_if_not_exists_file()
@@ -168,6 +169,6 @@ function! s:t.empty_if_not_exists_file()
   call previm#refresh_css()
 
   let actual = readfile(previm#make_preview_file_path('css/previm.css'))
-  call self.assert.equals([], actual)
+  call s:assert.equals([], actual)
 endfunction
 "}}}

test/plugin/previm_test.vim

@@ -1,45 +1,46 @@
-let s:t = vimtest#new('valid filetype for using :PrevimOpen')
+let s:t = themis#suite('valid filetype for using :PrevimOpen')
+let s:assert = themis#helper('assert')
 
-function! s:t.setup()
+function! s:t.before()
   let self._ft = &filetype
 endfunction
 
-function! s:t.teardown()
+function! s:t.after()
   let &filetype = self._ft
-  call self._clean_command()
+  call s:_clean_command()
 endfunction
 
-function! s:t._clean_command()
+function! s:_clean_command()
   if exists(':PrevimOpen') == 2
     delcommand PrevimOpen
   endif
 endfunction
 
 " helper
-function! s:t._assert_filetype(ft, expected)
+function! s:_assert_filetype(ft, expected)
   let &filetype = a:ft
   let actual = exists(':PrevimOpen')
-  if actual ==# a:expected
-    call self.assert.success()
-  else
-    call self.assert.fail(printf("'%s': expected %d but actual %d", a:ft, a:expected, actual))
+  if actual !=# a:expected
+    call s:assert.fail(printf("'%s': expected %d but actual %d", a:ft, a:expected, actual))
   endif
 endfunction
 """
 
 function! s:t.invalid_filetype()
-  call self._assert_filetype('', 0)
-  call self._assert_filetype('rb', 0)
-  call self._assert_filetype('php', 0)
+  let not_exist_command = 0
+  for type in ['', 'rb', 'php']
+    call s:_assert_filetype(type, not_exist_command)
+  endfor
 endfunction
 
 function! s:t.valid_filetype()
+  let exist_command = 2
   for type in [
         \ 'markdown', 'mkd', 'rst', 'textile',
         \ 'aaa.markdown', 'mkd.foo', 'bb.rst.cc', 'a.b.c.textile',
         \]
-    call self._assert_filetype(type, 2)
-    call self._clean_command()
+    call s:_assert_filetype(type, exist_command)
+    call s:_clean_command()
   endfor
 endfunction