Add tests for toggling breakpoint and inserting line

docs/configuration.md

@@ -24,7 +24,6 @@ things like:
 
 Along with optional additional configuration for things like:
 
-- Function breakpoints
 - Exception breakpoints
 
 ### Debug adapter configuration
@@ -109,6 +108,12 @@ But for now, consider the following example snippet:
           "--test-identifier", "${TestIdentifier}",
           "--secret-token", "${SecretToken}"
         ]
+      },
+      "breakpoints": {
+        "exception": {
+          "caught": "",
+          "uncaught": "Y"
+        }
       }
     }
   }

python3/vimspector/breakpoints.py

@@ -305,7 +305,7 @@ class ProjectBreakpoints( object ):
             if isinstance( result, bool ):
               result = 'Y' if result else 'N'
 
-            if not isinstance( result, str) or result not in ( 'Y', 'N', '' ):
+            if not isinstance( result, str ) or result not in ( 'Y', 'N', '' ):
               raise ValueError(
                 f"Invalid value for exception breakpoint filter '{f}': "
                 f"'{result}'. Must be boolean, 'Y', 'N' or '' (default)" )

support/test/python/simple_python/.vimspector.json

@@ -9,6 +9,12 @@
         "program": "${file}",
         "stopOnEntry": true,
         "console": "integratedTerminal"
+      },
+      "breakpoints": {
+        "exception": {
+          "raised": "N",
+          "uncaught": ""
+        }
       }
     },
     "attach": {
@@ -18,6 +24,12 @@
         "type": "python",
         "host": "localhost",
         "port": "5678"
+      },
+      "breakpoints": {
+        "exception": {
+          "raised": "N",
+          "uncaught": ""
+        }
       }
     }
   }

tests/breakpoints.test.vim

@@ -246,3 +246,52 @@ function Test_DisableBreakpointWhileDebugging()
   lcd -
   %bwipeout!
 endfunction
+
+function! SetUp_Test_Insert_Code_Above_Breakpoint()
+  let g:vimspector_enable_mappings = 'HUMAN'
+endfunction
+
+function! Test_Insert_Code_Above_Breakpoint()
+  let fn='main.py'
+  lcd ../support/test/python/simple_python
+  exe 'edit ' . fn
+  call setpos( '.', [ 0, 25, 5 ] )
+
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 25, 5 )
+  call vimspector#test#signs#AssertSignGroupEmptyAtLine( 'VimspectorBP', 25 )
+
+  " Add the breakpoint
+  call feedkeys( "\<F9>", 'xt' )
+  call vimspector#test#signs#AssertSignGroupSingletonAtLine( 'VimspectorBP',
+                                                           \ 25,
+                                                           \ 'vimspectorBP' )
+
+  " Insert a line above the breakpoint
+  call append( 22, '  # Test' )
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 26, 5 )
+  call vimspector#test#signs#AssertSignGroupSingletonAtLine( 'VimspectorBP',
+                                                           \ 26,
+                                                           \ 'vimspectorBP' )
+
+  " CHeck that we break at the right point
+  call setpos( '.', [ 0, 1, 1 ] )
+  call vimspector#LaunchWithSettings( { "configuration": "run" } )
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 26, 1 )
+  call vimspector#Reset()
+  call vimspector#test#setup#WaitForReset()
+
+  " Toggle the breakpoint
+  call setpos( '.', [ 0, 26, 1 ] )
+  call vimspector#test#signs#AssertSignGroupSingletonAtLine( 'VimspectorBP',
+                                                           \ 26,
+                                                           \ 'vimspectorBP' )
+  call feedkeys( "\<F9>", 'xt' )
+  call vimspector#test#signs#AssertSignGroupSingletonAtLine(
+        \ 'VimspectorBP',
+        \ 26,
+        \ 'vimspectorBPDisabled' )
+  " Delete it
+  call feedkeys( "\<F9>", 'xt' )
+  call vimspector#test#signs#AssertSignGroupEmptyAtLine( 'VimspectorBP', 26 )
+
+endfunction

tests/language_python.test.vim

@@ -6,11 +6,11 @@ function! ClearDown()
   call vimspector#test#setup#ClearDown()
 endfunction
 
-function! SetUp_Test_Go_Simple()
+function! SetUp_Test_Python_Simple()
   let g:vimspector_enable_mappings = 'HUMAN'
 endfunction
 
-function! Test_Go_Simple()
+function! Test_Python_Simple()
   let fn='main.py'
   lcd ../support/test/python/simple_python
   exe 'edit ' . fn
@@ -28,16 +28,8 @@ function! Test_Go_Simple()
   call setpos( '.', [ 0, 1, 1 ] )
 
   " Here we go. Start Debugging
-  pyx << EOF
+  call vimspector#LaunchWithSettings( { "configuration": "run" } )
-from unittest.mock import patch
+  call vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 6, 1 )
-with patch( 'vimspector.utils.SelectFromList',
-            return_value=None ) as p:
-  with patch( 'vimspector.utils.AskForInput',
-              return_value=None ) as p:
-    vim.eval( 'vimspector#LaunchWithSettings( { "configuration": "run" } )' )
-    vim.eval( 'vimspector#test#signs#AssertCursorIsAtLineInBuffer( fn, 6, 1 )' )
-    p.assert_called()
-EOF
 
   " Step
   call feedkeys( "\<F10>", 'xt' )

tests/lib/autoload/vimspector/test/setup.vim

@@ -16,8 +16,7 @@ endfunction
 function! vimspector#test#setup#ClearDown() abort
 endfunction
 
-function! vimspector#test#setup#Reset() abort
+function! vimspector#test#setup#WaitForReset() abort
-  call vimspector#Reset()
   call WaitForAssert( {->
         \ assert_true( pyxeval( '_vimspector_session._connection is None' ) )
         \ } )
@@ -26,6 +25,12 @@ function! vimspector#test#setup#Reset() abort
         \ }, 10000 )
 
   call vimspector#test#signs#AssertSignGroupEmpty( 'VimspectorCode' )
+endfunction
+
+function! vimspector#test#setup#Reset() abort
+  call vimspector#Reset()
+  call vimspector#test#setup#WaitForReset()
+
   call vimspector#ClearBreakpoints()
   call vimspector#test#signs#AssertSignGroupEmpty( 'VimspectorBP' )