Make rawdatastore API safer for writing filters.

service/rawdatastore/datastore_key_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.
 
 package rawdatastore
 
 import (
         "encoding/json"
         "fmt"
         "testing"
@@ skipping 124 matching lines @@
 func TestBadKeyEncode(t *testing.T) {
         t.Parallel()
 
         Convey("bad keys", t, func() {
                 Convey("incomplete", func() {
                         So(KeyIncomplete(mkKey("aid", "ns", "kind", 1)), ShouldBeFalse)
                         So(KeyIncomplete(mkKey("aid", "ns", "kind", 0)), ShouldBeTrue)
                 })
 
                 Convey("invalid", func() {
-                        So(KeyValid(mkKey("aid", "ns", "hat", "face", "__kind__", 1), "ns", true), ShouldBeTrue)
-                        So(KeyValid(mkKey("aid", "ns", "hat", "face", "kind", 1), "wat", false), ShouldBeFalse)
+                        So(KeyValid(mkKey("aid", "ns", "hat", "face", "__kind__", 1), true, "aid", "ns"), ShouldBeTrue)
 
                         bads := []Key{
                                 nil,
                                 mkKey("", "ns", "hat", "face"),
                                 mkKey("aid", "ns", "base", 1, "", "id"),
                                 mkKey("aid", "ns", "hat", "face", "__kind__", 1),
                                 mkKey("aid", "ns", "hat", 0, "kind", 1),
                                 dumbKey1{mkKey("aid", "badNS", "hat", 1)},
                                 dumbKey2{},
                         }
                         for _, k := range bads {
                                 s := "<nil>"
                                 if k != nil {
                                         s = k.String()
                                 }
                                 Convey(s, func() {
-                                        So(KeyValid(k, "ns", false), ShouldBeFalse)
+                                        So(KeyValid(k, false, "aid", "ns"), ShouldBeFalse)
                                 })
                         }
                 })
         })
 }
 
 type keyWrap struct{ Key }
 
 func (k keyWrap) Parent() Key {
         if k.Key.Parent() != nil {
@@ skipping 61 matching lines @@
                                 NewKey("aid", "ns", "parent", "", 1, nil),
                         )}
                 d, err := json.Marshal(t)
                 So(err, ShouldBeNil)
                 t2 := &TestStruct{}
                 err = json.Unmarshal(d, t2)
                 So(err, ShouldBeNil)
                 So(t, ShouldResemble, t2)
         })
 }