Interface update, per-method Contexts.

service/datastore/query_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 (
         "math"
         "testing"
 
@@ skipping 64 matching lines @@
 
 func nq(kinds ...string) *Query {
         kind := "Foo"
         if len(kinds) > 0 {
                 kind = kinds[0]
         }
         return NewQuery(kind)
 }
 
 func mkKey(elems ...interface{}) *Key {
-        return MakeKey("s~aid", "ns", elems...)
+        return KeyContext{"s~aid", "ns"}.MakeKey(elems...)
 }
 
 var queryTests = []queryTest{
         {"only one inequality",
                 nq().Order("bob", "wat").Gt("bob", 10).Lt("wat", 29),
                 "",
                 "inequality filters on multiple properties", nil},
 
         {"bad order",
                 nq().Order("+Bob"),
@@ skipping 218 matching lines @@
 }
 
 func TestQueries(t *testing.T) {
         t.Parallel()
 
         Convey("queries have tons of condition checking", t, func() {
                 for _, tc := range queryTests {
                         Convey(tc.name, func() {
                                 fq, err := tc.q.Finalize()
                                 if err == nil {
-                                        err = fq.Valid("s~aid", "ns")
+                                        err = fq.Valid(KeyContext{"s~aid", "ns"})
                                 }
                                 So(err, ShouldErrLike, tc.err)
 
                                 if tc.gql != "" {
                                         So(fq.GQL(), ShouldEqual, tc.gql)
                                 }
 
                                 if tc.equivalentQuery != nil {
                                         fq2, err := tc.equivalentQuery.Finalize()
                                         So(err, ShouldBeNil)
@@ skipping 35 matching lines @@
                                                                 return err
                                                         }
                                                 }
                                         })
                                 }
                         }
                 })
                 So(err, ShouldBeNil)
         })
 }