From 7ac6a8acb8f840e442f4608900a18a15f53984e2 Mon Sep 17 00:00:00 2001
From: mattn <mattn.jp@gmail.com>
Date: Fri, 6 Jun 2014 13:46:59 +0900
Subject: [PATCH] Fix tests

---
 unittest.vim | 76 ++++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/unittest.vim b/unittest.vim
index d9cf5d4..0ae6500 100644
--- a/unittest.vim
+++ b/unittest.vim
@@ -175,7 +175,7 @@ function! s:do_tests(...)
   endtry
 endfunction
 
-function! g:emmet_unittest_complete(arglead, cmdline, cmdpos)
+function! s:emmet_unittest_complete(arglead, cmdline, cmdpos)
   let args = split(a:cmdline, '\s\+', 1)
   let testgroups = eval(join(filter(split(substitute(join(readfile(s:sfile), "\n"), '.*\nfinish\n', '', ''), '\n', 1), "v:val !~ '^\"'")))
   try
@@ -189,7 +189,7 @@ function! g:emmet_unittest_complete(arglead, cmdline, cmdpos)
   return []
 endfunction
 
-command! -nargs=* -complete=customlist,g:emmet_unittest_complete EmmetUnitTest call s:do_tests(<f-args>)
+command! -nargs=* -complete=customlist,<SID>emmet_unittest_complete EmmetUnitTest call s:do_tests(<f-args>)
 if s:sfile == expand('%:p')
   EmmetUnitTest
 endif
@@ -899,76 +899,76 @@ finish
           'result': "@import url()",
         },
         {
-          'query': "fs:n",
-          'result': "font-style: normal",
+          'query': "{fs:n$$$$}",
+          'result': "{font-style: normal}",
         },
         {
-          'query': "fl:l|fc",
-          'result': "float: left",
+          'query': "{fl:l|fc$$$$}",
+          'result': "{float: left}",
         },
         {
-          'query': "bg+$$$$",
-          'result': "background: #FFF url($$$$) 0 0 no-repeat",
+          'query': "{bg+$$$$}",
+          'result': "{background: #FFF url($$$$) 0 0 no-repeat}",
         },
         {
-          'query': "bg+!$$$$",
-          'result': "background: #FFF url($$$$) 0 0 no-repeat !important",
+          'query': "{bg+!$$$$}",
+          'result': "{background: #FFF url($$$$) 0 0 no-repeat !important}",
         },
         {
-          'query': "m$$$$",
-          'result': "margin: $$$$",
+          'query': "{m$$$$}",
+          'result': "{margin: $$$$}",
         },
         {
-          'query': "m0.1p$$$$",
-          'result': "margin: 0.1%",
+          'query': "{m0.1p$$$$}",
+          'result': "{margin: 0.1%}",
         },
         {
-          'query': "m1.0$$$$",
-          'result': "margin: 1.0em",
+          'query': "{m1.0$$$$}",
+          'result': "{margin: 1.0em}",
         },
         {
-          'query': "m2$$$$",
-          'result': "margin: 2px",
+          'query': "{m2$$$$}",
+          'result': "{margin: 2px}",
         },
         {
-          'query': "bdrs10$$$$",
-          'result': "border-radius: 10px",
+          'query': "{bdrs10$$$$}",
+          'result': "{border-radius: 10px}",
         },
         {
-          'query': "-bdrs20$$$$",
-          'result': "-webkit-border-radius: 20px\n-moz-border-radius: 20px\nborder-radius: 20px",
+          'query': "{-bdrs20$$$$}",
+          'result': "{-webkit-border-radius: 20px\n-moz-border-radius: 20px\nborder-radius: 20px}",
         },
         {
-          'query': "lg(top,#fff,#000)$$$$",
-          'result': "background-image: -webkit-gradient(top, 0 0, 0 100, from(#fff), to(#000))\nbackground-image: -webkit-linear-gradient(#fff, #000)\nbackground-image: -moz-linear-gradient(#fff, #000)\nbackground-image: -o-linear-gradient(#fff, #000)\nbackground-image: linear-gradient(#fff, #000)\n",
+          'query': "{lg(top,#fff,#000)$$$$}",
+          'result': "{background-image: -webkit-gradient(top, 0 0, 0 100, from(#fff), to(#000))\nbackground-image: -webkit-linear-gradient(#fff, #000)\nbackground-image: -moz-linear-gradient(#fff, #000)\nbackground-image: -o-linear-gradient(#fff, #000)\nbackground-image: linear-gradient(#fff, #000)\n}",
         },
         {
-          'query': "m10-5-0$$$$",
-          'result': "margin: 10px 5px 0",
+          'query': "{m10-5-0$$$$}",
+          'result': "{margin: 10px 5px 0}",
         },
         {
-          'query': "m-10--5$$$$",
-          'result': "margin: -10px -5px",
+          'query': "{m-10--5$$$$}",
+          'result': "{margin: -10px -5px}",
         },
         {
-          'query': "m10-auto$$$$",
-          'result': "margin: 10px auto",
+          'query': "{m10-auto$$$$}",
+          'result': "{margin: 10px auto}",
         },
         {
-          'query': "w100p$$$$",
-          'result': "width: 100%",
+          'query': "{w100p$$$$}",
+          'result': "{width: 100%}",
         },
         {
-          'query': "h50e$$$$",
-          'result': "height: 50em",
+          'query': "{h50e$$$$}",
+          'result': "{height: 50em}",
         },
         {
-          'query': "(bg+)+c$$$$",
-          'result': "background: #FFF url($$$$) 0 0 no-repeat\ncolor: #000",
+          'query': "{(bg+)+c$$$$}",
+          'result': "{background: #FFF url($$$$) 0 0 no-repeat\ncolor: #000}",
         },
         {
-          'query': ".first>.second>.third$$$$",
-          'result': "div.first\n\tdiv.second\n\t\tdiv.third$$$$",
+          'query': "{.first>.second>.third$$$$}",
+          'result': "{div.first\n\tdiv.second\n\t\tdiv.third$$$$}",
         },
       ],
     },