@@ -661,18 +661,28 @@ func testBuffer(v *Nvim) func(*testing.T) {
661661 if err := v .SetBufferLines (Buffer (0 ), - 1 , - 1 , true , lines ); err != nil {
662662 t .Fatal (err )
663663 }
664+ t .Cleanup (func () {
665+ clearBuffer (t , v , Buffer (0 ))
666+ })
667+
664668 if err := v .SetWindowCursor (Window (0 ), [2 ]int {3 , 4 }); err != nil {
665669 t .Fatal (err )
666670 }
667- if err := v .Command ("mark v" ); err != nil {
668- t .Fatal (err )
669- }
670671
671672 const (
673+ mark = "V"
672674 wantLine = 3
673675 wantCol = 0
674676 )
675- pos , err := v .BufferMark (Buffer (0 ), "v" )
677+ set , err := v .SetBufferMark (Buffer (0 ), mark , wantLine , wantCol , make (map [string ]interface {}))
678+ if err != nil {
679+ t .Fatal (err )
680+ }
681+ if ! set {
682+ t .Fatalf ("could not set %s mark" , mark )
683+ }
684+
685+ pos , err := v .BufferMark (Buffer (0 ), mark )
676686 if err != nil {
677687 t .Fatal (err )
678688 }
@@ -683,9 +693,21 @@ func testBuffer(v *Nvim) func(*testing.T) {
683693 t .Fatalf ("got %d extMark col but want %d" , pos [1 ], wantCol )
684694 }
685695
686- t .Cleanup (func () {
687- clearBuffer (t , v , Buffer (0 ))
688- })
696+ deleted , err := v .DeleteBufferMark (Buffer (0 ), mark )
697+ if err != nil {
698+ t .Fatal (err )
699+ }
700+ if ! deleted {
701+ t .Fatalf ("could not delete %s mark" , mark )
702+ }
703+
704+ pos2 , err := v .BufferMark (Buffer (0 ), mark )
705+ if err != nil {
706+ t .Fatal (err )
707+ }
708+ if pos2 [0 ] != 0 || pos2 [1 ] != 0 {
709+ t .Fatalf ("got %d mark but want zero" , pos2 )
710+ }
689711 })
690712 })
691713
@@ -961,18 +983,28 @@ func testBuffer(v *Nvim) func(*testing.T) {
961983 if err := b .Execute (); err != nil {
962984 t .Fatal (err )
963985 }
986+ t .Cleanup (func () {
987+ clearBuffer (t , v , Buffer (0 ))
988+ })
989+
964990 b .SetWindowCursor (Window (0 ), [2 ]int {3 , 4 })
965- b .Command ("mark v" )
966- if err := b .Execute (); err != nil {
967- t .Fatal (err )
968- }
969991
970992 const (
993+ mark = "V"
971994 wantLine = 3
972995 wantCol = 0
973996 )
997+ var set bool
998+ b .SetBufferMark (Buffer (0 ), mark , wantLine , wantCol , make (map [string ]interface {}), & set )
999+ if err := b .Execute (); err != nil {
1000+ t .Fatal (err )
1001+ }
1002+ if ! set {
1003+ t .Fatalf ("could not set %s mark" , mark )
1004+ }
1005+
9741006 var pos [2 ]int
975- b .BufferMark (Buffer (0 ), "v" , & pos )
1007+ b .BufferMark (Buffer (0 ), mark , & pos )
9761008 if err := b .Execute (); err != nil {
9771009 t .Fatal (err )
9781010 }
@@ -983,9 +1015,23 @@ func testBuffer(v *Nvim) func(*testing.T) {
9831015 t .Fatalf ("got %d extMark col but want %d" , pos [1 ], wantCol )
9841016 }
9851017
986- t .Cleanup (func () {
987- clearBuffer (t , v , Buffer (0 ))
988- })
1018+ var deleted bool
1019+ b .DeleteBufferMark (Buffer (0 ), mark , & deleted )
1020+ if err := b .Execute (); err != nil {
1021+ t .Fatal (err )
1022+ }
1023+ if ! deleted {
1024+ t .Fatalf ("could not delete %s mark" , mark )
1025+ }
1026+
1027+ var pos2 [2 ]int
1028+ b .BufferMark (Buffer (0 ), mark , & pos2 )
1029+ if err := b .Execute (); err != nil {
1030+ t .Fatal (err )
1031+ }
1032+ if pos2 [0 ] != 0 || pos2 [1 ] != 0 {
1033+ t .Fatalf ("got %d mark but want zero" , pos2 )
1034+ }
9891035 })
9901036 })
9911037 }
0 commit comments