Interface update, per-method Contexts.

service/datastore/checkfilter_test.go

 // Copyright 2015 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 // adapted from github.com/golang/appengine/datastore
 
 package datastore
 
 import (
         "testing"
@@ skipping 10 matching lines @@
         t.Parallel()
 
         Convey("Test checkFilter", t, func() {
                 // Note that the way we have this context set up, any calls which aren't
                 // stopped at the checkFilter will nil-pointer panic. We use this panic
                 // behavior to indicate that the checkfilter has allowed a call to pass
                 // through to the implementation in the tests below. In a real application
                 // the panics observed in the tests below would actually be sucessful calls
                 // to the implementation.
                 c := SetRaw(info.Set(context.Background(), fakeInfo{}), fakeRDS{})
-                rds := GetRaw(c) // has checkFilter
+                rds := Raw(c) // has checkFilter
                 So(rds, ShouldNotBeNil)
 
                 Convey("RunInTransaction", func() {
                         So(rds.RunInTransaction(nil, nil).Error(), ShouldContainSubstring, "is nil")
                         hit := false
                         So(func() {
                                 So(rds.RunInTransaction(func(context.Context) error {
                                         hit = true
                                         return nil
                                 }, nil), ShouldBeNil)
@@ skipping 15 matching lines @@
                                 }), ShouldBeNil)
                         }, ShouldPanic)
                         So(hit, ShouldBeFalse)
                 })
 
                 Convey("GetMulti", func() {
                         So(rds.GetMulti(nil, nil, nil), ShouldBeNil)
                         So(rds.GetMulti([]*Key{mkKey("", "", "", "")}, nil, nil).Error(), ShouldContainSubstring, "is nil")
 
                         // this is in the wrong aid/ns
-                        keys := []*Key{MakeKey("wut", "wrong", "Kind", 1)}
+                        keys := []*Key{KeyContext{"wut", "wrong"}.MakeKey("Kind", 1)}
                         So(rds.GetMulti(keys, nil, func(pm PropertyMap, err error) error {
                                 So(pm, ShouldBeNil)
                                 So(err, ShouldEqual, ErrInvalidKey)
                                 return nil
                         }), ShouldBeNil)
 
                         keys[0] = mkKey("Kind", 1)
                         hit := false
                         So(func() {
                                 So(rds.GetMulti(keys, nil, func(pm PropertyMap, err error) error {
@@ skipping 52 matching lines @@
                                 So(rds.DeleteMulti([]*Key{mkKey("s~aid", "ns", "Kind", 1)}, func(error) error {
                                         hit = true
                                         return nil
                                 }), ShouldBeNil)
                         }, ShouldPanic)
                         So(hit, ShouldBeFalse)
                 })
 
         })
 }