Simplify tests.

test/expand_cr.vim

@@ -1,55 +1,94 @@
-let g:delimitMate_expand_cr = 1
-"DelimitMateReload
-let lines = readfile(expand('<sfile>:t:r').'.txt')
-call vimtest#StartTap()
-let testsnumber = len(filter(copy(lines), 'v:val =~ ''^=\{80}$'''))
-call vimtap#Plan(testsnumber)
-let tcount = 1
-let expect = 0
-let evaluate = 0
-let commands = []
-let header = ''
-for item in lines
-  if item =~ '^=\{80}$'
-    let expect = 1
-    let expected = []
-    continue
-  endif
+" function! DMTest_single(setup, typed, expected[, skip_expr[, todo_expr]])
+" - Runs a single test.
+" - Add 1 to vimtap#Plan().
+"
+" function! DMTest_pairs(setup, typed, expected, [skip_expr[, todo_expr]])
+" - Runs one test for every pair.
+" - Add 7 to vimtap#Plan().
+"
+" function! DMTest_quotes(setup, typed, expected, [skip_expr[, todo_expr]])
+" - Runs one test for every quote.
+" - Add 5 to vimtap#Plan().
+
+call vimtest#StartTap()
+call vimtap#Plan(25)
+
+let g:delimitMate_expand_cr = 1
+DelimitMateReload
+"let g:delimitMate_eol_marker = ';'
+filetype indent on
+set bs=2 et sts=4 sw=4 ft=javascript
+call DMTest_single('$(document).ready(function() {})',
+      \ "\<Esc>31|i\<CR>x\<Esc>",
+      \ ["$(document).ready(function() {", "    x", "})"])
+
+" Issue #95
+new
+let b:delimitMate_jump_expansion = 1
+DelimitMateReload
+call DMTest_single('', "(\<CR>test)x",
+      \ ['(', 'test', ')x'])
+
+" Remove CR expansion on BS
+call DMTest_single('', "(\<CR>\<BS>x",
+      \ ['(x)'])
+
+" Consider indentation with BS inside an empty CR expansion.
+call DMTest_single('', "(  \<CR>\<BS>\<BS>x",  '(x)')
+
+" Conflict with indentation settings (cindent). Issue #95
+se cindent
+call DMTest_single(
+      \ ['sub foo {',
+      \  '    while (1) {',
+      \  '        ',
+      \  '    }',
+      \  '}'],
+      \ "\<Esc>3G8|a}x",
+      \ ['sub foo {',
+      \  '    while (1) {',
+      \  '        ',
+      \  '    }x',
+      \  '}'])
+
+call DMTest_single('"{bracketed}', "\<Esc>A\"x", '"{bracketed}"x')
+
+" Syntax folding enabled by autocmd breaks expansion. But ti can't be tested
+" with :normal
+new
+autocmd InsertEnter * let w:fdm=&foldmethod | setl foldmethod=manual
+autocmd InsertLeave * let &foldmethod = w:fdm
+set foldmethod=marker
+set foldmarker={,}
+set foldlevel=0
+set backspace=2
+call DMTest_single('', "abc {\<CR>x",
+      \['abc {',
+      \ '    x',
+      \ '}'])
+
+" expand_cr != 2
+call DMTest_single('abc(def)', "\<Esc>$i\<CR>x",
+      \ ['abc(def',
+      \  '        x)'])
+
+" expand_cr == 2
+let delimitMate_expand_cr = 2
+DelimitMateReload
+call DMTest_single('abc(def)', "\<Esc>$i\<CR>x", ['abc(def', '        x', '        )'])
+
+" Play nice with smartindent
+set all&
+set smartindent
+call DMTest_single('', "\<Esc>$i{\<CR>x", ['{', '	x', '}'])
+
+call DMTest_quotes('', "' x", "' x'")
+
+call DMTest_quotes('', "'\<CR>x", ["'", "x'"])
+
+let delimitMate_expand_inside_quotes = 1
+DelimitMateReload
+
+call DMTest_quotes('', "'\<CR>x", ["'", "x", "'"])
 
-  if item =~ '^#' && expect == 0
-    " A comment.
-    let header = empty(header) ? item[1:] : 'Lines should match.'
-    continue
-  endif
-  if item =~ '^\s*$' && expect == 0
-    " An empty line.
-    continue
-  endif
-  if ! expect
-    " A command.
-    call add(commands, item)
-    exec item
-    "call vimtap#Diag(item)
-    continue
-  endif
-  if item =~ '^-\{80}$'
-    let expect = 0
-  endif
-  if expect
-    call add(expected, item)
-    continue
-  endif
-  let lines = getline(1, line('$'))
-  let passed = lines == expected
-  echom string(lines)
-  echom string(expected)
-  call vimtap#Is(lines, expected, header)
-  echom string(commands)
-  for cmd in commands
-    call vimtap#Diag(cmd)
-  endfor
-  let commands = []
-  let header = ''
-  let tcount += 1
-endfor
 call vimtest#Quit()