Skip to content

Commit a29a119

Browse files
committed
Improve picker test and rename RPCPlatform tests
1 parent 2f74826 commit a29a119

2 files changed

Lines changed: 21 additions & 7 deletions

File tree

internal/balancer/picker/picker_test.go

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"google.golang.org/grpc/resolver"
3030
)
3131

32-
func TestNew(t *testing.T) {
32+
func TestPicker(t *testing.T) {
3333
t.Parallel()
3434

3535
childStates := []endpointsharding.ChildState{{
@@ -105,10 +105,24 @@ func TestNew(t *testing.T) {
105105
}
106106

107107
picker := New(childStates, config).(*picker)
108-
109108
actualSequence := make([]int, len(picker.pickers))
110-
for i, picker := range picker.pickers {
111-
actualSequence[i] = picker.(*namedPicker).name
109+
pickerNext := picker.next
110+
111+
for i, childPicker := range picker.pickers {
112+
actualSequence[i] = childPicker.(*namedPicker).name
113+
114+
if _, err := picker.Pick(balancer.PickInfo{}); err != nil {
115+
t.Fatalf("Pick() failed: %v", err)
116+
}
117+
118+
pickerNext++
119+
if pickerNext == len(picker.pickers) {
120+
pickerNext = 0
121+
}
122+
123+
if picker.next != pickerNext {
124+
t.Errorf("picker next = %v, want: %v", picker.next, pickerNext)
125+
}
112126
}
113127

114128
expectedSequence := []int{2, 3, 4, 2, 3, 2, 2, 3, 4, 2, 3, 2, 2, 3, 4}

rpcplatform_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func TestNew(t *testing.T) {
154154
}
155155
}
156156

157-
func TestLookup(t *testing.T) {
157+
func TestRPCPlatform_Lookup(t *testing.T) {
158158
t.Parallel()
159159

160160
etcdClient := getEtcdClient(t)
@@ -216,7 +216,7 @@ func TestLookup(t *testing.T) {
216216
t.Errorf("channel closed by timeout or unexpectedly")
217217
}
218218

219-
func TestNewClient(t *testing.T) {
219+
func TestRPCPlatform_NewClient(t *testing.T) {
220220
t.Parallel()
221221

222222
insecureTransport := PlatformOptions.ClientOptions(
@@ -339,7 +339,7 @@ func TestNewClient(t *testing.T) {
339339
}
340340
}
341341

342-
func TestNewServer(t *testing.T) {
342+
func TestRPCPlatform_NewServer(t *testing.T) {
343343
t.Parallel()
344344

345345
type input struct {

0 commit comments

Comments
 (0)