@@ -2222,6 +2222,7 @@ function! s:Tests.breakpoint.before() call g:RubyDebugger.queue.empty() call s:Server._stop_server(s:rdebug_port) call s:Server._stop_server(s:debugger_port) + silent exe "only" endfunction @@ -2376,22 +2377,6 @@ function! s:Tests.breakpoint.test_should_open_window_and_show_breakpoints(test) endfunction -function! s:Tests.breakpoint.test_should_delete_breakpoint_from_breakpoints_window(test) - let filename = s:Mock.mock_file() - call g:RubyDebugger.toggle_breakpoint() - call s:Mock.unmock_file(filename) - call g:TU.ok(!empty(g:RubyDebugger.breakpoints), "Breakpoint should be set", a:test) - - call g:RubyDebugger.open_breakpoints() - exe 'normal 2G' - call s:window_breakpoints_delete_node() - call g:TU.equal('', getline(2), "Breakpoint should not be shown", a:test) - call g:TU.ok(empty(g:RubyDebugger.breakpoints), "Breakpoint should be destroyed", a:test) - - exe 'close' -endfunction - - function! s:Tests.breakpoint.test_should_open_selected_breakpoint_from_breakpoints_window(test) let filename = s:Mock.mock_file() let file_pattern = substitute(filename, '[\/\\]', '[\\\/\\\\]', "g") @@ -2401,6 +2386,7 @@ function! s:Tests.breakpoint.test_should_open_selected_breakpoint_from_breakpoin exe "normal gg" exe "write" exe "wincmd w" + exe "new" call g:TU.ok(expand("%") != filename, "It should not be within the file with breakpoint", a:test) call g:RubyDebugger.open_breakpoints() @@ -2414,6 +2400,23 @@ function! s:Tests.breakpoint.test_should_open_selected_breakpoint_from_breakpoin endfunction +function! s:Tests.breakpoint.test_should_delete_breakpoint_from_breakpoints_window(test) + let filename = s:Mock.mock_file() + call g:RubyDebugger.toggle_breakpoint() + call s:Mock.unmock_file(filename) + call g:TU.ok(!empty(g:RubyDebugger.breakpoints), "Breakpoint should be set", a:test) + + call g:RubyDebugger.open_breakpoints() + exe 'normal 2G' + call s:window_breakpoints_delete_node() + call g:TU.equal('', getline(2), "Breakpoint should not be shown", a:test) + call g:TU.ok(empty(g:RubyDebugger.breakpoints), "Breakpoint should be destroyed", a:test) + + exe 'close' +endfunction + + + let s:Tests.exceptions = {} function! s:Tests.exceptions.before_all() @@ -2457,7 +2460,7 @@ function! s:Tests.exceptions.test_should_display_exceptions_in_window_breakpoint call g:RubyDebugger.catch_exception("NameError") call g:RubyDebugger.catch_exception("ArgumentError") call g:RubyDebugger.open_breakpoints() - call g:TU.match(getline(3), 'Exception breakpoints: NameError, ArgumentError', "Should show exception breakpoints", a:test) + call g:TU.match('Exception breakpoints: NameError, ArgumentError', getline(3), "Should show exception breakpoints", a:test) exe 'close' endfunction additionals/plugin/ruby_debugger_test.vim @@ -19,6 +19,7 @@ function! s:Tests.breakpoint.before() call g:RubyDebugger.queue.empty() call s:Server._stop_server(s:rdebug_port) call s:Server._stop_server(s:debugger_port) + silent exe "only" endfunction @@ -173,22 +174,6 @@ function! s:Tests.breakpoint.test_should_open_window_and_show_breakpoints(test) endfunction -function! s:Tests.breakpoint.test_should_delete_breakpoint_from_breakpoints_window(test) - let filename = s:Mock.mock_file() - call g:RubyDebugger.toggle_breakpoint() - call s:Mock.unmock_file(filename) - call g:TU.ok(!empty(g:RubyDebugger.breakpoints), "Breakpoint should be set", a:test) - - call g:RubyDebugger.open_breakpoints() - exe 'normal 2G' - call s:window_breakpoints_delete_node() - call g:TU.equal('', getline(2), "Breakpoint should not be shown", a:test) - call g:TU.ok(empty(g:RubyDebugger.breakpoints), "Breakpoint should be destroyed", a:test) - - exe 'close' -endfunction - - function! s:Tests.breakpoint.test_should_open_selected_breakpoint_from_breakpoints_window(test) let filename = s:Mock.mock_file() let file_pattern = substitute(filename, '[\/\\]', '[\\\/\\\\]', "g") @@ -198,6 +183,7 @@ function! s:Tests.breakpoint.test_should_open_selected_breakpoint_from_breakpoin exe "normal gg" exe "write" exe "wincmd w" + exe "new" call g:TU.ok(expand("%") != filename, "It should not be within the file with breakpoint", a:test) call g:RubyDebugger.open_breakpoints() @@ -210,3 +196,20 @@ function! s:Tests.breakpoint.test_should_open_selected_breakpoint_from_breakpoin call s:Mock.unmock_file(filename) endfunction + +function! s:Tests.breakpoint.test_should_delete_breakpoint_from_breakpoints_window(test) + let filename = s:Mock.mock_file() + call g:RubyDebugger.toggle_breakpoint() + call s:Mock.unmock_file(filename) + call g:TU.ok(!empty(g:RubyDebugger.breakpoints), "Breakpoint should be set", a:test) + + call g:RubyDebugger.open_breakpoints() + exe 'normal 2G' + call s:window_breakpoints_delete_node() + call g:TU.equal('', getline(2), "Breakpoint should not be shown", a:test) + call g:TU.ok(empty(g:RubyDebugger.breakpoints), "Breakpoint should be destroyed", a:test) + + exe 'close' +endfunction + + tests/breakpoint.vim @@ -41,7 +41,7 @@ function! s:Tests.exceptions.test_should_display_exceptions_in_window_breakpoint call g:RubyDebugger.catch_exception("NameError") call g:RubyDebugger.catch_exception("ArgumentError") call g:RubyDebugger.open_breakpoints() - call g:TU.match(getline(3), 'Exception breakpoints: NameError, ArgumentError', "Should show exception breakpoints", a:test) + call g:TU.match('Exception breakpoints: NameError, ArgumentError', getline(3), "Should show exception breakpoints", a:test) exe 'close' endfunction tests/exceptions.vim 1ddb595aa1b7bc6f3b5ae1469a28880ff4ec60e9 Anton Astashov anton@astashov.net http://github.com/astashov/vim-ruby-debugger/commit/4d4a56df81b2b40deabdf01360e4801df35c3eab 4d4a56df81b2b40deabdf01360e4801df35c3eab 2009-11-05T19:51:02-08:00 2009-11-05T19:51:02-08:00 Fixed tests 7189124d84000264ce5d183a3c0404f7bd44329c Anton Astashov anton@astashov.net