@@ -304,7 +304,9 @@ func TestErrorTypeEval(t *testing.T) {
304304
305305 for name , testcase := range tupleCases {
306306 t .Run (name , func (t * testing.T ) {
307- data , err := conn .Eval ("return ..." , []interface {}{& testcase .tuple .val })
307+ data , err := conn .Do (NewEvalRequest ("return ..." ).
308+ Args ([]interface {}{& testcase .tuple .val }),
309+ ).Get ()
308310 require .Nil (t , err )
309311 require .NotNil (t , data )
310312 require .Equal (t , len (data ), 1 )
@@ -324,7 +326,9 @@ func TestErrorTypeEvalTyped(t *testing.T) {
324326 for name , testcase := range tupleCases {
325327 t .Run (name , func (t * testing.T ) {
326328 var res []BoxError
327- err := conn .EvalTyped ("return ..." , []interface {}{& testcase .tuple .val }, & res )
329+ err := conn .Do (NewEvalRequest ("return ..." ).
330+ Args ([]interface {}{& testcase .tuple .val }),
331+ ).GetTyped (& res )
328332 require .Nil (t , err )
329333 require .NotNil (t , res )
330334 require .Equal (t , len (res ), 1 )
@@ -340,12 +344,12 @@ func TestErrorTypeInsert(t *testing.T) {
340344 defer conn .Close ()
341345
342346 truncateEval := fmt .Sprintf ("box.space[%q]:truncate()" , space )
343- _ , err := conn .Eval ( truncateEval , []interface {}{})
347+ _ , err := conn .Do ( NewEvalRequest ( truncateEval ). Args ( []interface {}{})). Get ( )
344348 require .Nil (t , err )
345349
346350 for name , testcase := range tupleCases {
347351 t .Run (name , func (t * testing.T ) {
348- _ , err = conn .Insert ( space , & testcase .tuple )
352+ _ , err = conn .Do ( NewInsertRequest ( space ). Tuple ( & testcase .tuple )). Get ( )
349353 require .Nil (t , err )
350354
351355 checkEval := fmt .Sprintf (`
@@ -365,7 +369,7 @@ func TestErrorTypeInsert(t *testing.T) {
365369 // of connector BoxError are equal to the Tarantool ones
366370 // since they may differ between different Tarantool versions
367371 // and editions.
368- _ , err := conn .Eval ( checkEval , []interface {}{})
372+ _ , err := conn .Do ( NewEvalRequest ( checkEval ). Args ( []interface {}{})). Get ( )
369373 require .Nilf (t , err , "Tuple has been successfully inserted" )
370374 })
371375 }
@@ -378,13 +382,13 @@ func TestErrorTypeInsertTyped(t *testing.T) {
378382 defer conn .Close ()
379383
380384 truncateEval := fmt .Sprintf ("box.space[%q]:truncate()" , space )
381- _ , err := conn .Eval ( truncateEval , []interface {}{})
385+ _ , err := conn .Do ( NewEvalRequest ( truncateEval ). Args ( []interface {}{})). Get ( )
382386 require .Nil (t , err )
383387
384388 for name , testcase := range tupleCases {
385389 t .Run (name , func (t * testing.T ) {
386390 var res []TupleBoxError
387- err = conn .InsertTyped ( space , & testcase .tuple , & res )
391+ err = conn .Do ( NewInsertRequest ( space ). Tuple ( & testcase .tuple )). GetTyped ( & res )
388392 require .Nil (t , err )
389393 require .NotNil (t , res )
390394 require .Equal (t , len (res ), 1 )
@@ -407,7 +411,7 @@ func TestErrorTypeInsertTyped(t *testing.T) {
407411 // of connector BoxError are equal to the Tarantool ones
408412 // since they may differ between different Tarantool versions
409413 // and editions.
410- _ , err := conn .Eval ( checkEval , []interface {}{})
414+ _ , err := conn .Do ( NewEvalRequest ( checkEval ). Args ( []interface {}{})). Get ( )
411415 require .Nilf (t , err , "Tuple has been successfully inserted" )
412416 })
413417 }
@@ -420,7 +424,7 @@ func TestErrorTypeSelect(t *testing.T) {
420424 defer conn .Close ()
421425
422426 truncateEval := fmt .Sprintf ("box.space[%q]:truncate()" , space )
423- _ , err := conn .Eval ( truncateEval , []interface {}{})
427+ _ , err := conn .Do ( NewEvalRequest ( truncateEval ). Args ( []interface {}{})). Get ( )
424428 require .Nil (t , err )
425429
426430 for name , testcase := range tupleCases {
@@ -433,13 +437,18 @@ func TestErrorTypeSelect(t *testing.T) {
433437 assert(tuple ~= nil)
434438 ` , testcase .ttObj , space , testcase .tuple .pk )
435439
436- _ , err := conn .Eval ( insertEval , []interface {}{})
440+ _ , err := conn .Do ( NewEvalRequest ( insertEval ). Args ( []interface {}{})). Get ( )
437441 require .Nilf (t , err , "Tuple has been successfully inserted" )
438442
439443 var offset uint32 = 0
440444 var limit uint32 = 1
441- data , err := conn .Select (space , index , offset , limit , IterEq ,
442- []interface {}{testcase .tuple .pk })
445+ data , err := conn .Do (NewSelectRequest (space ).
446+ Index (index ).
447+ Offset (offset ).
448+ Limit (limit ).
449+ Iterator (IterEq ).
450+ Key ([]interface {}{testcase .tuple .pk }),
451+ ).Get ()
443452 require .Nil (t , err )
444453 require .NotNil (t , data )
445454 require .Equalf (t , len (data ), 1 , "Exactly one tuple had been found" )
@@ -464,7 +473,7 @@ func TestErrorTypeSelectTyped(t *testing.T) {
464473 defer conn .Close ()
465474
466475 truncateEval := fmt .Sprintf ("box.space[%q]:truncate()" , space )
467- _ , err := conn .Eval ( truncateEval , []interface {}{})
476+ _ , err := conn .Do ( NewEvalRequest ( truncateEval ). Args ( []interface {}{})). Get ( )
468477 require .Nil (t , err )
469478
470479 for name , testcase := range tupleCases {
@@ -477,14 +486,19 @@ func TestErrorTypeSelectTyped(t *testing.T) {
477486 assert(tuple ~= nil)
478487 ` , testcase .ttObj , space , testcase .tuple .pk )
479488
480- _ , err := conn .Eval ( insertEval , []interface {}{})
489+ _ , err := conn .Do ( NewEvalRequest ( insertEval ). Args ( []interface {}{})). Get ( )
481490 require .Nilf (t , err , "Tuple has been successfully inserted" )
482491
483492 var offset uint32 = 0
484493 var limit uint32 = 1
485494 var resp []TupleBoxError
486- err = conn .SelectTyped (space , index , offset , limit , IterEq ,
487- []interface {}{testcase .tuple .pk }, & resp )
495+ err = conn .Do (NewSelectRequest (space ).
496+ Index (index ).
497+ Offset (offset ).
498+ Limit (limit ).
499+ Iterator (IterEq ).
500+ Key ([]interface {}{testcase .tuple .pk }),
501+ ).GetTyped (& resp )
488502 require .Nil (t , err )
489503 require .NotNil (t , resp )
490504 require .Equalf (t , len (resp ), 1 , "Exactly one tuple had been found" )
0 commit comments