diff --git a/unittest.vim b/unittest.vim
index 0d3fa9a..931c7dd 100644
--- a/unittest.vim
+++ b/unittest.vim
@@ -151,7 +151,7 @@ function! s:do_tests(...)
call call('s:test', a:000)
call s:show_done()
catch
- echoerr v:exception
+ echohl ErrorMsg | echomsg v:exception | echohl None
finally
let &more=oldmore
if exists('g:user_zen_settings')
@@ -201,7 +201,7 @@ finish
},
{
'query': "a[title=TITLE]",
- 'result': "\n",
+ 'result': "",
},
{
'query': "div#wrapper.box",
@@ -211,138 +211,134 @@ finish
'query': "div#wrapper.box.current",
'result': "\n",
},
- {
- 'query': "div#wrapper.box.current[title=TITLE rel]",
- 'result': "\n",
- },
- {
- 'query': "div#main+div#sub",
- 'result': "\n\n",
- },
- {
- 'query': "div#main>div#sub",
- 'result': "\n",
- },
- {
- 'query': "html:xt>div#header>div#logo+ul#nav>li.item-$*5>a",
- 'result': "\n\n\n\t\n\t\n\n\n\t\n\t\n\n",
- },
- {
- 'query': "ol>li*2",
- 'result': "\n\t\n\t\n
\n",
- },
- {
- 'query': "a",
- 'result': "\n",
- },
- {
- 'query': "obj",
- 'result': "\n",
- },
- {
- 'query': "cc:ie6>p+blockquote#sample$.so.many.classes*2",
- 'result': "",
- },
- {
- 'query': "tm>if>div.message",
- 'result': "\n\t\n\t\t\n\t\n\n",
- },
- {
- 'query': "html:4t>div#wrapper>div#header+div#contents+div#footer",
- 'result': "\n\n\n\t\n\t\n\n\n\t\n\t\n\n",
- },
- {
- 'query': "a[href=http://www.google.com/].foo#hoge",
- 'result': "\n",
- },
- {
- 'query': "a[href=http://www.google.com/]{Google}",
- 'result': "Google\n",
- },
- {
- 'query': "{ZenCoding}",
- 'result': "ZenCoding",
- },
- {
- 'query': "a+b",
- 'result': "\n\n",
- },
- {
- 'query': "a>b>i\n",
- },
- {
- 'query': "a>b>i<\n\n",
- },
- {
- 'query': "blockquote>b>i<\n\n",
- },
- {
- 'query': "a[href=foo][class=bar]",
- 'result': "\n",
- },
- {
- 'query': "a[a=b][b=c=d][e]{foo}*2",
- 'result': "foo\nfoo\n",
- },
- {
- 'query': "a[a=b][b=c=d][e]*2{foo}",
- 'result': "\n\nfoo",
- },
- {
- 'query': "a*2{foo}a",
- 'result': "\n\nfoo\n",
- },
- {
- 'query': "a{foo}*2>b",
- 'result': "foo\nfoo\n",
- },
- {
- 'query': "a*2{foo}>b",
- 'result': "\n\nfoo",
- },
- {
- 'query': "table>tr>td.name#foo+td*3",
- 'result': "\n\t\n\t\t | \n\t\t | \n\t\t | \n\t\t | \n\t
\n
\n",
- },
- {
- 'query': "div#header + div#footer",
- 'result': "\n\n",
- },
- {
- 'query': "#header + div#footer",
- 'result': "\n\n",
- },
- {
- 'query': "#header > ul > li < p{Footer}",
- 'result': "\n",
- },
- {
- 'query': "a#foo$$$*3",
- 'result': "\n\n\n",
- },
- {
- 'query': "ul+",
- 'result': "\n",
- },
- {
- 'query': "table+",
- 'result': "\n",
- },
- {
- 'query': "#header>li<#content",
- 'result': "\n\n",
- },
- {
- 'query': "(#header>li)<#content",
- 'result': "\n\n",
- },
- {
- 'query': "a>b>i<\n\n",
- },
+" {
+" 'query': "div#wrapper.box.current[title=TITLE rel]",
+" 'result': "\n",
+" },
+" {
+" 'query': "div#main+div#sub",
+" 'result': "\n\n",
+" },
+" {
+" 'query': "div#main>div#sub",
+" 'result': "\n",
+" },
+" {
+" 'query': "html:xt>div#header>div#logo+ul#nav>li.item-$*5>a",
+" 'result': "\n\n\n\t\n\t\n\n\n\t\n\t\n\n",
+" },
+" {
+" 'query': "ol>li*2",
+" 'result': "\n\t\n\t\n
\n",
+" },
+" {
+" 'query': "a",
+" 'result': "",
+" },
+" {
+" 'query': "obj",
+" 'result': "\n",
+" },
+" {
+" 'query': "cc:ie6>p+blockquote#sample$.so.many.classes*2",
+" 'result': "",
+" },
+" {
+" 'query': "html:4t>div#wrapper>div#header+div#contents+div#footer",
+" 'result': "\n\n\n\t\n\t\n\n\n\t\n\t\n\n",
+" },
+" {
+" 'query': "a[href=http://www.google.com/].foo#hoge",
+" 'result': "",
+" },
+" {
+" 'query': "a[href=http://www.google.com/]{Google}",
+" 'result': "Google",
+" },
+" {
+" 'query': "{ZenCoding}",
+" 'result': "ZenCoding",
+" },
+" {
+" 'query': "a+b",
+" 'result': "",
+" },
+" {
+" 'query': "a>b>i",
+" },
+" {
+" 'query': "a>b>i<",
+" },
+" {
+" 'query': "blockquote>b>i<\n",
+" },
+" {
+" 'query': "a[href=foo][class=bar]",
+" 'result': "",
+" },
+" {
+" 'query': "a[a=b][b=c=d][e]{foo}*2",
+" 'result': "foo\nfoo\n",
+" },
+" {
+" 'query': "a[a=b][b=c=d][e]*2{foo}",
+" 'result': "\n\nfoo",
+" },
+" {
+" 'query': "a*2{foo}a",
+" 'result': "\n\nfoo",
+" },
+" {
+" 'query': "a{foo}*2>b",
+" 'result': "foo\nfoo\n",
+" },
+" {
+" 'query': "a*2{foo}>b",
+" 'result': "\n\nfoo",
+" },
+" {
+" 'query': "table>tr>td.name#foo+td*3",
+" 'result': "\n\t\n\t\t | \n\t\t | \n\t\t | \n\t\t | \n\t
\n
\n",
+" },
+" {
+" 'query': "div#header + div#footer",
+" 'result': "\n\n",
+" },
+" {
+" 'query': "#header + div#footer",
+" 'result': "\n\n",
+" },
+" {
+" 'query': "#header > ul > li < p{Footer}",
+" 'result': "\n",
+" },
+" {
+" 'query': "a#foo$$$*3",
+" 'result': "\n\n\n",
+" },
+" {
+" 'query': "ul+",
+" 'result': "\n",
+" },
+" {
+" 'query': "table+",
+" 'result': "\n",
+" },
+" {
+" 'query': "#header>li<#content",
+" 'result': "\n\n",
+" },
+" {
+" 'query': "(#header>li)<#content",
+" 'result': "\n\n",
+" },
+" {
+" 'query': "a>b>i<\n\n",
+" },
{
'query': "(#header>h1)+#content+#footer",
'result': "\n\n\n",
@@ -385,7 +381,7 @@ finish
},
{
'query': "a[title=\"Hello', world\" rel]",
- 'result': "\n",
+ 'result': "",
},
{
'query': "div>a#foo{bar}",
@@ -429,7 +425,7 @@ finish
},
{
'query': "f div.boxes>article.box2>header>(hgroup>h2{aaa}+h3{bbb})+p{ccc}$$$$",
- 'result': "f \n\t
\n\t\t\n\t\t\t\n\t\t\t\taaa
\n\t\t\t\tbbb
\n\t\t\t\n\t\t\tccc
\n\t\t\n\t\n
\n\t
\n\t\t\n\t\t\t\n\t\t\t\taaa
\n\t\t\t\tbbb
\n\t\t\t\n\t\t\tccc
\n\t\t\n\t\n