Skip to content

Commit 312307f

Browse files
committed
Address review feedback
Signed-off-by: Glenn Lewis <6598971+gmlewis@users.noreply.github.com>
1 parent 378c150 commit 312307f

2 files changed

Lines changed: 1176 additions & 2058 deletions

File tree

github/gen-iterators.go

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -494,19 +494,18 @@ func Test{{.RecvType}}_{{.IterMethod}}(t *testing.T) {
494494
{{else}}
495495
w.Header().Set("Link", ` + "`" + `<https://api.github.com/?page=1>; rel="next"` + "`" + `)
496496
{{end -}}
497-
fmt.Fprint(w, ` + "`" + `{{.TestJSON1}}` + "`" + `) // Call 1 below: return 3 items, NextPage=1, no errors
497+
fmt.Fprint(w, ` + "`" + `{{.TestJSON1}}` + "`" + `)
498498
case 2:
499-
fmt.Fprint(w, ` + "`" + `{{.TestJSON2}}` + "`" + `) // still Call 1 below: return 4 more items, no next page, no errors
499+
fmt.Fprint(w, ` + "`" + `{{.TestJSON2}}` + "`" + `)
500500
case 3:
501-
fmt.Fprint(w, ` + "`" + `{{.TestJSON3}}` + "`" + `) // Call 2 below: return 2 items, no next page, no errors
501+
fmt.Fprint(w, ` + "`" + `{{.TestJSON3}}` + "`" + `)
502502
case 4:
503-
w.WriteHeader(http.StatusNotFound) // Call 3 below: endpoint returns an error
503+
w.WriteHeader(http.StatusNotFound)
504504
case 5:
505-
fmt.Fprint(w, ` + "`" + `{{.TestJSON3}}` + "`" + `) // Call 4 below: return 2 items, no next page, no errors
505+
fmt.Fprint(w, ` + "`" + `{{.TestJSON3}}` + "`" + `)
506506
}
507507
})
508508
509-
// Call 1: iterator using zero values
510509
iter := client.{{.ClientField}}.{{.IterMethod}}({{.ZeroArgs}})
511510
var gotItems int
512511
for _, err := range iter {
@@ -519,10 +518,9 @@ func Test{{.RecvType}}_{{.IterMethod}}(t *testing.T) {
519518
t.Errorf("client.{{.ClientField}}.{{.IterMethod}} call 1 got %v items; want %v", gotItems, want)
520519
}
521520
522-
// Call 2: iterator using non-nil opts
523521
{{.OptsName}} := &{{.OptsType}}{}
524522
iter = client.{{.ClientField}}.{{.IterMethod}}({{.TestCallArgs}})
525-
gotItems = 0 // reset
523+
gotItems = 0
526524
for _, err := range iter {
527525
gotItems++
528526
if err != nil {
@@ -533,9 +531,8 @@ func Test{{.RecvType}}_{{.IterMethod}}(t *testing.T) {
533531
t.Errorf("client.{{.ClientField}}.{{.IterMethod}} call 2 got %v items; want %v", gotItems, want)
534532
}
535533
536-
// Call 3: iterator returns an error
537534
iter = client.{{.ClientField}}.{{.IterMethod}}({{.ZeroArgs}})
538-
gotItems = 0 // reset
535+
gotItems = 0
539536
for _, err := range iter {
540537
gotItems++
541538
if err == nil {
@@ -546,16 +543,13 @@ func Test{{.RecvType}}_{{.IterMethod}}(t *testing.T) {
546543
t.Errorf("client.{{.ClientField}}.{{.IterMethod}} call 3 got %v items; want 1 (an error)", gotItems)
547544
}
548545
549-
// Call 4: iterator returns false
550546
iter = client.{{.ClientField}}.{{.IterMethod}}({{.ZeroArgs}})
551-
gotItems = 0 // reset
547+
gotItems = 0
552548
iter(func(item {{.ReturnType}}, err error) bool {
553549
gotItems++
554550
if err != nil {
555551
t.Errorf("Unexpected error: %v", err)
556552
}
557-
// Force the iterator to hit:
558-
// if !yield(item, nil) { return }
559553
return false
560554
})
561555
if gotItems != 1 {

0 commit comments

Comments
 (0)