Skip to content

Commit 2d468f8

Browse files
DerekBumDerekBum
committed
test: more correct use of the Fatalf in request_test.go
Replaced `t.Errorf` + `return` by `t.Fatalf`. This made all tests in the file follow the same code style. Part of #338
1 parent b884933 commit 2d468f8

File tree

1 file changed

+34
-68
lines changed

1 file changed

+34
-68
lines changed

‎request_test.go

+34-68
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,7 @@ func TestPingRequestDefaultValues(t *testing.T) {
387387
refEnc := msgpack.NewEncoder(&refBuf)
388388
err := RefImplPingBody(refEnc)
389389
if err != nil {
390-
t.Errorf("An unexpected RefImplPingBody() error: %q", err.Error())
391-
return
390+
t.Fatalf("An unexpected RefImplPingBody() error: %q", err.Error())
392391
}
393392

394393
req := NewPingRequest()
@@ -402,8 +401,7 @@ func TestSelectRequestDefaultValues(t *testing.T) {
402401
err := RefImplSelectBody(refEnc, &resolver, validSpace, defaultIndex, 0, 0xFFFFFFFF,
403402
IterAll, []interface{}{}, nil, false)
404403
if err != nil {
405-
t.Errorf("An unexpected RefImplSelectBody() error %q", err.Error())
406-
return
404+
t.Fatalf("An unexpected RefImplSelectBody() error %q", err.Error())
407405
}
408406

409407
req := NewSelectRequest(validSpace)
@@ -451,8 +449,7 @@ func TestSelectRequestDefaultIteratorEqIfKey(t *testing.T) {
451449
err := RefImplSelectBody(refEnc, &resolver, validSpace, defaultIndex, 0, 0xFFFFFFFF,
452450
IterEq, key, nil, false)
453451
if err != nil {
454-
t.Errorf("An unexpected RefImplSelectBody() error %q", err.Error())
455-
return
452+
t.Fatalf("An unexpected RefImplSelectBody() error %q", err.Error())
456453
}
457454

458455
req := NewSelectRequest(validSpace).
@@ -469,8 +466,7 @@ func TestSelectRequestIteratorNotChangedIfKey(t *testing.T) {
469466
err := RefImplSelectBody(refEnc, &resolver, validSpace, defaultIndex, 0, 0xFFFFFFFF,
470467
iter, key, nil, false)
471468
if err != nil {
472-
t.Errorf("An unexpected RefImplSelectBody() error %q", err.Error())
473-
return
469+
t.Fatalf("An unexpected RefImplSelectBody() error %q", err.Error())
474470
}
475471

476472
req := NewSelectRequest(validSpace).
@@ -492,16 +488,14 @@ func TestSelectRequestSetters(t *testing.T) {
492488
err := RefImplSelectBody(refEncAfterBytes, &resolver, validSpace, validIndex, offset,
493489
limit, iter, key, afterBytes, true)
494490
if err != nil {
495-
t.Errorf("An unexpected RefImplSelectBody() error %s", err)
496-
return
491+
t.Fatalf("An unexpected RefImplSelectBody() error %s", err)
497492
}
498493

499494
refEncAfterKey := msgpack.NewEncoder(&refBufAfterKey)
500495
err = RefImplSelectBody(refEncAfterKey, &resolver, validSpace, validIndex, offset,
501496
limit, iter, key, afterKey, true)
502497
if err != nil {
503-
t.Errorf("An unexpected RefImplSelectBody() error %s", err)
504-
return
498+
t.Fatalf("An unexpected RefImplSelectBody() error %s", err)
505499
}
506500

507501
reqAfterBytes := NewSelectRequest(validSpace).
@@ -531,8 +525,7 @@ func TestInsertRequestDefaultValues(t *testing.T) {
531525
refEnc := msgpack.NewEncoder(&refBuf)
532526
err := RefImplInsertBody(refEnc, &resolver, validSpace, []interface{}{})
533527
if err != nil {
534-
t.Errorf("An unexpected RefImplInsertBody() error: %q", err.Error())
535-
return
528+
t.Fatalf("An unexpected RefImplInsertBody() error: %q", err.Error())
536529
}
537530

538531
req := NewInsertRequest(validSpace)
@@ -561,8 +554,7 @@ func TestInsertRequestSetters(t *testing.T) {
561554
refEnc := msgpack.NewEncoder(&refBuf)
562555
err := RefImplInsertBody(refEnc, &resolver, validSpace, tuple)
563556
if err != nil {
564-
t.Errorf("An unexpected RefImplInsertBody() error: %q", err.Error())
565-
return
557+
t.Fatalf("An unexpected RefImplInsertBody() error: %q", err.Error())
566558
}
567559

568560
req := NewInsertRequest(validSpace).
@@ -576,8 +568,7 @@ func TestReplaceRequestDefaultValues(t *testing.T) {
576568
refEnc := msgpack.NewEncoder(&refBuf)
577569
err := RefImplReplaceBody(refEnc, &resolver, validSpace, []interface{}{})
578570
if err != nil {
579-
t.Errorf("An unexpected RefImplReplaceBody() error: %q", err.Error())
580-
return
571+
t.Fatalf("An unexpected RefImplReplaceBody() error: %q", err.Error())
581572
}
582573

583574
req := NewReplaceRequest(validSpace)
@@ -592,8 +583,7 @@ func TestReplaceRequestSpaceByName(t *testing.T) {
592583
refEnc := msgpack.NewEncoder(&refBuf)
593584
err := RefImplReplaceBody(refEnc, &resolver, "valid", []interface{}{})
594585
if err != nil {
595-
t.Errorf("An unexpected RefImplReplaceBody() error: %q", err.Error())
596-
return
586+
t.Fatalf("An unexpected RefImplReplaceBody() error: %q", err.Error())
597587
}
598588

599589
req := NewReplaceRequest("valid")
@@ -607,8 +597,7 @@ func TestReplaceRequestSetters(t *testing.T) {
607597
refEnc := msgpack.NewEncoder(&refBuf)
608598
err := RefImplReplaceBody(refEnc, &resolver, validSpace, tuple)
609599
if err != nil {
610-
t.Errorf("An unexpected RefImplReplaceBody() error: %q", err.Error())
611-
return
600+
t.Fatalf("An unexpected RefImplReplaceBody() error: %q", err.Error())
612601
}
613602

614603
req := NewReplaceRequest(validSpace).
@@ -622,8 +611,7 @@ func TestDeleteRequestDefaultValues(t *testing.T) {
622611
refEnc := msgpack.NewEncoder(&refBuf)
623612
err := RefImplDeleteBody(refEnc, &resolver, validSpace, defaultIndex, []interface{}{})
624613
if err != nil {
625-
t.Errorf("An unexpected RefImplDeleteBody() error: %q", err.Error())
626-
return
614+
t.Fatalf("An unexpected RefImplDeleteBody() error: %q", err.Error())
627615
}
628616

629617
req := NewDeleteRequest(validSpace)
@@ -668,8 +656,7 @@ func TestDeleteRequestSetters(t *testing.T) {
668656
refEnc := msgpack.NewEncoder(&refBuf)
669657
err := RefImplDeleteBody(refEnc, &resolver, validSpace, validIndex, key)
670658
if err != nil {
671-
t.Errorf("An unexpected RefImplDeleteBody() error: %q", err.Error())
672-
return
659+
t.Fatalf("An unexpected RefImplDeleteBody() error: %q", err.Error())
673660
}
674661

675662
req := NewDeleteRequest(validSpace).
@@ -685,8 +672,7 @@ func TestUpdateRequestDefaultValues(t *testing.T) {
685672
err := RefImplUpdateBody(refEnc, &resolver, validSpace, defaultIndex,
686673
[]interface{}{}, []Op{})
687674
if err != nil {
688-
t.Errorf("An unexpected RefImplUpdateBody() error: %q", err.Error())
689-
return
675+
t.Fatalf("An unexpected RefImplUpdateBody() error: %q", err.Error())
690676
}
691677

692678
req := NewUpdateRequest(validSpace)
@@ -734,8 +720,7 @@ func TestUpdateRequestSetters(t *testing.T) {
734720
refEnc := msgpack.NewEncoder(&refBuf)
735721
err := RefImplUpdateBody(refEnc, &resolver, validSpace, validIndex, key, refOps)
736722
if err != nil {
737-
t.Errorf("An unexpected RefImplUpdateBody() error: %q", err.Error())
738-
return
723+
t.Fatalf("An unexpected RefImplUpdateBody() error: %q", err.Error())
739724
}
740725

741726
req := NewUpdateRequest(validSpace).
@@ -751,8 +736,7 @@ func TestUpsertRequestDefaultValues(t *testing.T) {
751736
refEnc := msgpack.NewEncoder(&refBuf)
752737
err := RefImplUpsertBody(refEnc, &resolver, validSpace, []interface{}{}, []Op{})
753738
if err != nil {
754-
t.Errorf("An unexpected RefImplUpsertBody() error: %q", err.Error())
755-
return
739+
t.Fatalf("An unexpected RefImplUpsertBody() error: %q", err.Error())
756740
}
757741

758742
req := NewUpsertRequest(validSpace)
@@ -782,8 +766,7 @@ func TestUpsertRequestSetters(t *testing.T) {
782766
refEnc := msgpack.NewEncoder(&refBuf)
783767
err := RefImplUpsertBody(refEnc, &resolver, validSpace, tuple, refOps)
784768
if err != nil {
785-
t.Errorf("An unexpected RefImplUpsertBody() error: %q", err.Error())
786-
return
769+
t.Fatalf("An unexpected RefImplUpsertBody() error: %q", err.Error())
787770
}
788771

789772
req := NewUpsertRequest(validSpace).
@@ -798,8 +781,7 @@ func TestCallRequestsDefaultValues(t *testing.T) {
798781
refEnc := msgpack.NewEncoder(&refBuf)
799782
err := RefImplCallBody(refEnc, validExpr, []interface{}{})
800783
if err != nil {
801-
t.Errorf("An unexpected RefImplCallBody() error: %q", err.Error())
802-
return
784+
t.Fatalf("An unexpected RefImplCallBody() error: %q", err.Error())
803785
}
804786

805787
req := NewCallRequest(validExpr)
@@ -817,8 +799,7 @@ func TestCallRequestsSetters(t *testing.T) {
817799
refEnc := msgpack.NewEncoder(&refBuf)
818800
err := RefImplCallBody(refEnc, validExpr, args)
819801
if err != nil {
820-
t.Errorf("An unexpected RefImplCallBody() error: %q", err.Error())
821-
return
802+
t.Fatalf("An unexpected RefImplCallBody() error: %q", err.Error())
822803
}
823804

824805
req := NewCallRequest(validExpr).
@@ -838,8 +819,7 @@ func TestEvalRequestDefaultValues(t *testing.T) {
838819
refEnc := msgpack.NewEncoder(&refBuf)
839820
err := RefImplEvalBody(refEnc, validExpr, []interface{}{})
840821
if err != nil {
841-
t.Errorf("An unexpected RefImplEvalBody() error: %q", err.Error())
842-
return
822+
t.Fatalf("An unexpected RefImplEvalBody() error: %q", err.Error())
843823
}
844824

845825
req := NewEvalRequest(validExpr)
@@ -853,8 +833,7 @@ func TestEvalRequestSetters(t *testing.T) {
853833
refEnc := msgpack.NewEncoder(&refBuf)
854834
err := RefImplEvalBody(refEnc, validExpr, args)
855835
if err != nil {
856-
t.Errorf("An unexpected RefImplEvalBody() error: %q", err.Error())
857-
return
836+
t.Fatalf("An unexpected RefImplEvalBody() error: %q", err.Error())
858837
}
859838

860839
req := NewEvalRequest(validExpr).
@@ -868,8 +847,7 @@ func TestExecuteRequestDefaultValues(t *testing.T) {
868847
refEnc := msgpack.NewEncoder(&refBuf)
869848
err := RefImplExecuteBody(refEnc, validExpr, []interface{}{})
870849
if err != nil {
871-
t.Errorf("An unexpected RefImplExecuteBody() error: %q", err.Error())
872-
return
850+
t.Fatalf("An unexpected RefImplExecuteBody() error: %q", err.Error())
873851
}
874852

875853
req := NewExecuteRequest(validExpr)
@@ -883,8 +861,7 @@ func TestExecuteRequestSetters(t *testing.T) {
883861
refEnc := msgpack.NewEncoder(&refBuf)
884862
err := RefImplExecuteBody(refEnc, validExpr, args)
885863
if err != nil {
886-
t.Errorf("An unexpected RefImplExecuteBody() error: %q", err.Error())
887-
return
864+
t.Fatalf("An unexpected RefImplExecuteBody() error: %q", err.Error())
888865
}
889866

890867
req := NewExecuteRequest(validExpr).
@@ -898,8 +875,7 @@ func TestPrepareRequestDefaultValues(t *testing.T) {
898875
refEnc := msgpack.NewEncoder(&refBuf)
899876
err := RefImplPrepareBody(refEnc, validExpr)
900877
if err != nil {
901-
t.Errorf("An unexpected RefImplPrepareBody() error: %q", err.Error())
902-
return
878+
t.Fatalf("An unexpected RefImplPrepareBody() error: %q", err.Error())
903879
}
904880

905881
req := NewPrepareRequest(validExpr)
@@ -912,8 +888,7 @@ func TestUnprepareRequestDefaultValues(t *testing.T) {
912888
refEnc := msgpack.NewEncoder(&refBuf)
913889
err := RefImplUnprepareBody(refEnc, *validStmt)
914890
if err != nil {
915-
t.Errorf("An unexpected RefImplUnprepareBody() error: %q", err.Error())
916-
return
891+
t.Fatalf("An unexpected RefImplUnprepareBody() error: %q", err.Error())
917892
}
918893

919894
req := NewUnprepareRequest(validStmt)
@@ -928,8 +903,7 @@ func TestExecutePreparedRequestSetters(t *testing.T) {
928903
refEnc := msgpack.NewEncoder(&refBuf)
929904
err := RefImplExecutePreparedBody(refEnc, *validStmt, args)
930905
if err != nil {
931-
t.Errorf("An unexpected RefImplExecutePreparedBody() error: %q", err.Error())
932-
return
906+
t.Fatalf("An unexpected RefImplExecutePreparedBody() error: %q", err.Error())
933907
}
934908

935909
req := NewExecutePreparedRequest(validStmt).
@@ -944,8 +918,7 @@ func TestExecutePreparedRequestDefaultValues(t *testing.T) {
944918
refEnc := msgpack.NewEncoder(&refBuf)
945919
err := RefImplExecutePreparedBody(refEnc, *validStmt, []interface{}{})
946920
if err != nil {
947-
t.Errorf("An unexpected RefImplExecutePreparedBody() error: %q", err.Error())
948-
return
921+
t.Fatalf("An unexpected RefImplExecutePreparedBody() error: %q", err.Error())
949922
}
950923

951924
req := NewExecutePreparedRequest(validStmt)
@@ -959,8 +932,7 @@ func TestBeginRequestDefaultValues(t *testing.T) {
959932
refEnc := msgpack.NewEncoder(&refBuf)
960933
err := RefImplBeginBody(refEnc, defaultIsolationLevel, defaultTimeout)
961934
if err != nil {
962-
t.Errorf("An unexpected RefImplBeginBody() error: %q", err.Error())
963-
return
935+
t.Fatalf("An unexpected RefImplBeginBody() error: %q", err.Error())
964936
}
965937

966938
req := NewBeginRequest()
@@ -973,8 +945,7 @@ func TestBeginRequestSetters(t *testing.T) {
973945
refEnc := msgpack.NewEncoder(&refBuf)
974946
err := RefImplBeginBody(refEnc, ReadConfirmedLevel, validTimeout)
975947
if err != nil {
976-
t.Errorf("An unexpected RefImplBeginBody() error: %q", err.Error())
977-
return
948+
t.Fatalf("An unexpected RefImplBeginBody() error: %q", err.Error())
978949
}
979950

980951
req := NewBeginRequest().TxnIsolation(ReadConfirmedLevel).Timeout(validTimeout)
@@ -987,8 +958,7 @@ func TestCommitRequestDefaultValues(t *testing.T) {
987958
refEnc := msgpack.NewEncoder(&refBuf)
988959
err := RefImplCommitBody(refEnc)
989960
if err != nil {
990-
t.Errorf("An unexpected RefImplCommitBody() error: %q", err.Error())
991-
return
961+
t.Fatalf("An unexpected RefImplCommitBody() error: %q", err.Error())
992962
}
993963

994964
req := NewCommitRequest()
@@ -1001,8 +971,7 @@ func TestRollbackRequestDefaultValues(t *testing.T) {
1001971
refEnc := msgpack.NewEncoder(&refBuf)
1002972
err := RefImplRollbackBody(refEnc)
1003973
if err != nil {
1004-
t.Errorf("An unexpected RefImplRollbackBody() error: %q", err.Error())
1005-
return
974+
t.Fatalf("An unexpected RefImplRollbackBody() error: %q", err.Error())
1006975
}
1007976

1008977
req := NewRollbackRequest()
@@ -1016,8 +985,7 @@ func TestBroadcastRequestDefaultValues(t *testing.T) {
1016985
expectedArgs := []interface{}{validKey}
1017986
err := RefImplCallBody(refEnc, "box.broadcast", expectedArgs)
1018987
if err != nil {
1019-
t.Errorf("An unexpected RefImplCallBody() error: %q", err.Error())
1020-
return
988+
t.Fatalf("An unexpected RefImplCallBody() error: %q", err.Error())
1021989
}
1022990

1023991
req := NewBroadcastRequest(validKey)
@@ -1032,8 +1000,7 @@ func TestBroadcastRequestSetters(t *testing.T) {
10321000
expectedArgs := []interface{}{validKey, value}
10331001
err := RefImplCallBody(refEnc, "box.broadcast", expectedArgs)
10341002
if err != nil {
1035-
t.Errorf("An unexpected RefImplCallBody() error: %q", err.Error())
1036-
return
1003+
t.Fatalf("An unexpected RefImplCallBody() error: %q", err.Error())
10371004
}
10381005

10391006
req := NewBroadcastRequest(validKey).Value(value)
@@ -1046,8 +1013,7 @@ func TestWatchOnceRequestDefaultValues(t *testing.T) {
10461013
refEnc := msgpack.NewEncoder(&refBuf)
10471014
err := RefImplWatchOnceBody(refEnc, validKey)
10481015
if err != nil {
1049-
t.Errorf("An unexpected RefImplCallBody() error: %q", err.Error())
1050-
return
1016+
t.Fatalf("An unexpected RefImplCallBody() error: %q", err.Error())
10511017
}
10521018

10531019
req := NewWatchOnceRequest(validKey)

0 commit comments

Comments
 (0)