Get rid of awkward proto argument to Interface.Run

service/datastore/datastore_test.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // adapted from github.com/golang/appengine/datastore
 
 package datastore
 
 import (
         "fmt"
@@ skipping 742 matching lines @@
         Convey("Test Run", t, func() {
                 c := info.Set(context.Background(), fakeInfo{})
                 c = SetRawFactory(c, fakeDatastoreFactory)
                 ds := Get(c)
                 So(ds, ShouldNotBeNil)
 
                 q := ds.NewQuery("").Limit(5)
 
                 Convey("bad", func() {
                         Convey("bad proto type", func() {
-                                So(ds.Run(q, 100, func(obj interface{}, _ func() (Cursor, error)) bool {
+                                So(ds.Run(q, func(v int, _ CursorCB) bool {
                                         panic("never here!")
-                                }).Error(), ShouldContainSubstring, "invalid Run proto type")
+                                }).Error(), ShouldContainSubstring, "cb has a bad first argument")
                         })
 
                         Convey("early abort on error", func() {
                                 rq := q.(*fakeQuery).Fail(3)
                                 i := 0
-                                So(ds.Run(rq, CommonStruct{}, func(_ interface{}, _ func() (Cursor, error)) bool {
+                                So(ds.Run(rq, func(c CommonStruct, _ CursorCB) bool {
                                         i++
                                         return true
                                 }).Error(), ShouldEqual, "Query fail")
                                 So(i, ShouldEqual, 3)
                         })
 
                         Convey("return error on serialization failure", func() {
-                                So(ds.Run(q, permaBad{}, func(_ interface{}, _ func() (Cursor, error)) bool {
+                                So(ds.Run(q, func(_ permaBad, _ CursorCB) bool {
                                         panic("never here")
                                 }).Error(), ShouldEqual, "permaBad")
                         })
                 })
 
                 Convey("ok", func() {
                         Convey("*S", func() {
                                 i := 0
-                                So(ds.Run(q, (*CommonStruct)(nil), func(obj interface{}, _ func() (Cursor, error)) bool {
-                                        cs := obj.(*CommonStruct)
+                                So(ds.Run(q, func(cs *CommonStruct, _ CursorCB) bool {
                                         So(cs.ID, ShouldEqual, i+1)
                                         So(cs.Value, ShouldEqual, i)
                                         i++
                                         return true
                                 }), ShouldBeNil)
                         })
 
                         Convey("*P", func() {
                                 i := 0
-                                So(ds.Run(q.Limit(12), (*FakePLS)(nil), func(obj interface{}, _ func() (Cursor, error)) bool {
-                                        fpls := obj.(*FakePLS)
+                                So(ds.Run(q.Limit(12), func(fpls *FakePLS, _ CursorCB) bool {
                                         So(fpls.gotLoaded, ShouldBeTrue)
                                         if i == 10 {
                                                 So(fpls.StringID, ShouldEqual, "eleven")
                                         } else {
                                                 So(fpls.IntID, ShouldEqual, i+1)
                                         }
                                         So(fpls.Value, ShouldEqual, i)
                                         i++
                                         return true
                                 }), ShouldBeNil)
                         })
 
                         Convey("*P (map)", func() {
                                 i := 0
-                                So(ds.Run(q, (*PropertyMap)(nil), func(obj interface{}, _ func() (Cursor, error)) bool {
-                                        pm := *obj.(*PropertyMap)
+                                So(ds.Run(q, func(pm *PropertyMap, _ CursorCB) bool {
                                         k, err := pm.GetMeta("key")
                                         So(err, ShouldBeNil)
                                         So(k.(Key).IntID(), ShouldEqual, i+1)
-                                        So(pm["Value"][0].Value(), ShouldEqual, i)
+                                        So((*pm)["Value"][0].Value(), ShouldEqual, i)
                                         i++
                                         return true
                                 }), ShouldBeNil)
                         })
 
                         Convey("S", func() {
                                 i := 0
-                                So(ds.Run(q, CommonStruct{}, func(obj interface{}, _ func() (Cursor, error)) bool {
-                                        cs := obj.(CommonStruct)
+                                So(ds.Run(q, func(cs CommonStruct, _ CursorCB) bool {
                                         So(cs.ID, ShouldEqual, i+1)
                                         So(cs.Value, ShouldEqual, i)
                                         i++
                                         return true
                                 }), ShouldBeNil)
                         })
 
                         Convey("P", func() {
                                 i := 0
-                                So(ds.Run(q, FakePLS{}, func(obj interface{}, _ func() (Cursor, error)) bool {
-                                        fpls := obj.(FakePLS)
+                                So(ds.Run(q, func(fpls FakePLS, _ CursorCB) bool {
                                         So(fpls.gotLoaded, ShouldBeTrue)
                                         So(fpls.IntID, ShouldEqual, i+1)
                                         So(fpls.Value, ShouldEqual, i)
                                         i++
                                         return true
                                 }), ShouldBeNil)
                         })
 
                         Convey("P (map)", func() {
                                 i := 0
-                                So(ds.Run(q, (PropertyMap)(nil), func(obj interface{}, _ func() (Cursor, error)) bool {
-                                        pm := obj.(PropertyMap)
+                                So(ds.Run(q, func(pm PropertyMap, _ CursorCB) bool {
                                         k, err := pm.GetMeta("key")
                                         So(err, ShouldBeNil)
                                         So(k.(Key).IntID(), ShouldEqual, i+1)
                                         So(pm["Value"][0].Value(), ShouldEqual, i)
                                         i++
                                         return true
                                 }), ShouldBeNil)
                         })
 
                         Convey("*Key", func() {
                                 i := 0
-                                So(ds.Run(q, (*Key)(nil), func(obj interface{}, _ func() (Cursor, error)) bool {
-                                        So(obj.(Key).IntID(), ShouldEqual, i+1)
+                                So(ds.Run(q, func(k Key, _ CursorCB) bool {
+                                        So(k.IntID(), ShouldEqual, i+1)
                                         i++
                                         return true
                                 }), ShouldBeNil)
                         })
 
                 })
         })
 }