Interface update, per-method Contexts.

service/datastore/context_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.
 
 package datastore
 
 import (
         "testing"
 
         "github.com/luci/gae/service/info"
+
+        "golang.org/x/net/context"
+
         . "github.com/smartystreets/goconvey/convey"
-        "golang.org/x/net/context"
 )
 
-type fakeInfo struct{ info.Interface }
+type fakeInfo struct{ info.RawInterface }
 
-func (fakeInfo) GetNamespace() (string, bool) { return "ns", true }
-func (fakeInfo) AppID() string                { return "aid" }
-func (fakeInfo) FullyQualifiedAppID() string  { return "s~aid" }
+func (fakeInfo) GetNamespace() string        { return "ns" }
+func (fakeInfo) AppID() string               { return "aid" }
+func (fakeInfo) FullyQualifiedAppID() string { return "s~aid" }
 
 type fakeService struct{ RawInterface }
 
 type fakeFilt struct{ RawInterface }
 
 func (f fakeService) DecodeCursor(s string) (Cursor, error) {
         return fakeCursor(s), nil
 }
 
 type fakeCursor string
 
 func (f fakeCursor) String() string {
         return string(f)
 }
 
 func TestServices(t *testing.T) {
         t.Parallel()
 
         Convey("Test service interfaces", t, func() {
                 c := context.Background()
                 Convey("without adding anything", func() {
-                        So(GetRaw(c), ShouldBeNil)
+                        So(Raw(c), ShouldBeNil)
                 })
 
                 Convey("adding a basic implementation", func() {
                         c = SetRaw(info.Set(c, fakeInfo{}), fakeService{})
 
                         Convey("lets you pull them back out", func() {
-                                So(GetRaw(c), ShouldResemble, &checkFilter{fakeService{}, "s~aid", "ns"})
+                                So(Raw(c), ShouldResemble, &checkFilter{
+                                        RawInterface: fakeService{},
+                                        kc:           KeyContext{"s~aid", "ns"},
+                                })
                         })
 
                         Convey("and lets you add filters", func() {
                                 c = AddRawFilters(c, func(ic context.Context, rds RawInterface) RawInterface {
                                         return fakeFilt{rds}
                                 })
 
-                                curs, err := Get(c).DecodeCursor("pants")
+                                curs, err := DecodeCursor(c, "pants")
                                 So(err, ShouldBeNil)
                                 So(curs.String(), ShouldEqual, "pants")
                         })
                 })
                 Convey("adding zero filters does nothing", func() {
                         So(AddRawFilters(c), ShouldEqual, c)
                 })
         })
 }