Fixes tests

This commit is contained in:
mattn
2013-08-22 20:32:01 +09:00
parent 9d7a3d4a44
commit e8e9877cfc

View File

@@ -91,11 +91,19 @@ function! s:test(...)
for n in range(len(tests)) for n in range(len(tests))
if len(index) > 0 && n != index | continue | endif if len(index) > 0 && n != index | continue | endif
let query = tests[n].query let query = tests[n].query
let options = has_key(tests[n], 'options') ? tests[n].options : {}
let result = tests[n].result let result = tests[n].result
if has_key(tests[n], 'skip') && tests[n].skip != 0 if has_key(tests[n], 'skip') && tests[n].skip != 0
call s:show_skip(n+1, query) call s:show_skip(n+1, query)
continue continue
endif endif
let oldoptions = {}
for opt in keys(options)
if has_key(g:, opt)
let oldoptions[opt] = get(g:, opt)
endif
let g:[opt] = options[opt]
endfor
if stridx(query, '$$$$') != -1 if stridx(query, '$$$$') != -1
silent! 1new silent! 1new
silent! exe "setlocal ft=".testgroup.type silent! exe "setlocal ft=".testgroup.type
@@ -119,6 +127,13 @@ function! s:test(...)
call s:show_title(n+1, query) call s:show_title(n+1, query)
unlet! res | let res = emmet#ExpandWord(query, testgroup.type, 0) unlet! res | let res = emmet#ExpandWord(query, testgroup.type, 0)
endif endif
for opt in keys(options)
if has_key(oldoptions, opt)
let g:[opt] = oldoptions[opt]
else
call remove(g:, opt)
endif
endfor
if stridx(result, '$$$$') != -1 if stridx(result, '$$$$') != -1
if res ==# result if res ==# result
call s:show_ok() call s:show_ok()
@@ -404,7 +419,7 @@ finish
}, },
{ {
'query': "link:css", 'query': "link:css",
'result': "<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\" media=\"all\" />\n", 'result': "<link rel=\"stylesheet\" type=\"text/css\" href=\"style.css\" media=\"all\">\n",
}, },
{ {
'query': "a[title=\"Hello', world\" rel]", 'query': "a[title=\"Hello', world\" rel]",
@@ -460,7 +475,7 @@ finish
}, },
{ {
'query': "(div>(label+input))+div", 'query': "(div>(label+input))+div",
'result': "<div>\n\t<label for=\"\"></label>\n\t<input type=\"\" />\n</div>\n<div></div>\n", 'result': "<div>\n\t<label for=\"\"></label>\n\t<input type=\"\">\n</div>\n<div></div>\n",
}, },
{ {
'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,ul>li>span*>a\\<cr>$$$$", 'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,ul>li>span*>a\\<cr>$$$$",
@@ -468,7 +483,7 @@ finish
}, },
{ {
'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,input[type=input value=$#]*\\<cr>$$$$", 'query': "test1\ntest2\ntest3$$$$\\<esc>ggVG\\<c-y>,input[type=input value=$#]*\\<cr>$$$$",
'result': "<input type=\"input\" value=\"test1\" />\n<input type=\"input\" value=\"test2\" />\n<input type=\"input\" value=\"test3\" />", 'result': "<input type=\"input\" value=\"test1\">\n<input type=\"input\" value=\"test2\">\n<input type=\"input\" value=\"test3\">",
}, },
{ {
'query': "div#id-$*5>div#id2-$", 'query': "div#id-$*5>div#id2-$",
@@ -535,15 +550,15 @@ finish
'tests': [ 'tests': [
{ {
'query': "img[src=http://mattn.kaoriya.net/images/logo.png]$$$$\\<c-y>,\\<c-y>i$$$$", 'query': "img[src=http://mattn.kaoriya.net/images/logo.png]$$$$\\<c-y>,\\<c-y>i$$$$",
'result': "<img src=\"http://mattn.kaoriya.net/images/logo.png\" alt=\"\" width=\"96\" height=\"96\" />", 'result': "<img src=\"http://mattn.kaoriya.net/images/logo.png\" alt=\"\" width=\"96\" height=\"96\">",
}, },
{ {
'query': "img[src=/logo.png]$$$$\\<c-y>,\\<c-y>i$$$$", 'query': "img[src=/logo.png]$$$$\\<c-y>,\\<c-y>i$$$$",
'result': "<img src=\"/logo.png\" alt=\"\" />", 'result': "<img src=\"/logo.png\" alt=\"\">",
}, },
{ {
'query': "img[src=http://mattn.kaoriya.net/images/logo.png width=foo height=bar]$$$$\\<c-y>,\\<c-y>i$$$$", 'query': "img[src=http://mattn.kaoriya.net/images/logo.png width=foo height=bar]$$$$\\<c-y>,\\<c-y>i$$$$",
'result': "<img src=\"http://mattn.kaoriya.net/images/logo.png\" alt=\"\" width=\"96\" height=\"96\" />", 'result': "<img src=\"http://mattn.kaoriya.net/images/logo.png\" alt=\"\" width=\"96\" height=\"96\">",
}, },
], ],
}, },