Simplify memory package interface.

go/src/infra/gae/libs/wrapper/memory/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.
 
 package memory
 
 import (
         "fmt"
         "infra/gae/libs/meta"
         "infra/gae/libs/wrapper"
         "testing"
 
         . "github.com/smartystreets/goconvey/convey"
         "golang.org/x/net/context"
 
         "appengine/datastore"
 )
 
 func TestDatastoreKinder(t *testing.T) {
         t.Parallel()
 
         Convey("Datastore kinds and keys", t, func() {
-                c := Use(Enable(context.Background()))
+                c := Use(context.Background())
                 ds := wrapper.GetDS(c)
                 So(ds, ShouldNotBeNil)
 
                 Convey("implements DSKinder", func() {
                         type Foo struct{}
                         So(ds.Kind(&Foo{}), ShouldEqual, "Foo")
 
                         Convey("which can be tweaked by DSKindSetter", func() {
                                 ds.SetKindNameResolver(func(interface{}) string { return "spam" })
                                 So(ds.Kind(&Foo{}), ShouldEqual, "spam")
@@ skipping 11 matching lines @@
                                 key := ds.NewKey("nerd", "stringID", 0, nil)
                                 So(key, ShouldNotBeNil)
                                 So(key.Kind(), ShouldEqual, "nerd")
                                 So(key.StringID(), ShouldEqual, "stringID")
                                 So(key.IntID(), ShouldEqual, 0)
                                 So(key.Parent(), ShouldBeNil)
                                 So(key.AppID(), ShouldEqual, "dev~my~app")
                                 So(key.Namespace(), ShouldEqual, "")
                                 So(key.String(), ShouldEqual, "/nerd,stringID")
                                 So(key.Incomplete(), ShouldBeFalse)
-                                So(KeyValid("", key, UserKeyOnly), ShouldBeTrue)
+                                So(keyValid("", key, userKeyOnly), ShouldBeTrue)
 
                                 chkey := ds.NewKey("wat", "", 100, key)
                                 So(chkey, ShouldNotBeNil)
                                 So(chkey.Kind(), ShouldEqual, "wat")
                                 So(chkey.StringID(), ShouldEqual, "")
                                 So(chkey.IntID(), ShouldEqual, 100)
                                 So(chkey.Parent(), ShouldEqual, key)
                                 So(chkey.AppID(), ShouldEqual, "dev~my~app")
                                 So(chkey.Namespace(), ShouldEqual, "")
                                 So(chkey.String(), ShouldEqual, "/nerd,stringID/wat,100")
                                 So(key.Incomplete(), ShouldBeFalse)
-                                So(KeyValid("", chkey, UserKeyOnly), ShouldBeTrue)
+                                So(keyValid("", chkey, userKeyOnly), ShouldBeTrue)
 
                                 incompl := ds.NewKey("sup", "", 0, key)
                                 So(incompl, ShouldNotBeNil)
                                 So(incompl.Incomplete(), ShouldBeTrue)
-                                So(KeyValid("", incompl, UserKeyOnly), ShouldBeTrue)
+                                So(keyValid("", incompl, userKeyOnly), ShouldBeTrue)
                                 So(incompl.String(), ShouldEqual, "/nerd,stringID/sup,0")
 
                                 bad := ds.NewKey("nooo", "", 10, incompl)
                                 So(bad, ShouldNotBeNil)
                                 So(bad.Incomplete(), ShouldBeFalse)
-                                So(KeyValid("", bad, UserKeyOnly), ShouldBeFalse)
+                                So(keyValid("", bad, userKeyOnly), ShouldBeFalse)
                                 So(bad.String(), ShouldEqual, "/nerd,stringID/sup,0/nooo,10")
 
                                 So(rootKey(bad), ShouldEqual, key)
 
                                 Convey("other key validation", func() {
-                                        So(KeyValid("", nil, UserKeyOnly), ShouldBeFalse)
+                                        So(keyValid("", nil, userKeyOnly), ShouldBeFalse)
 
                                         key := ds.NewKey("", "", 0, nil)
                                         So(key, ShouldNotBeNil)
 
-                                        So(KeyValid("", key, UserKeyOnly), ShouldBeFalse)
+                                        So(keyValid("", key, userKeyOnly), ShouldBeFalse)
 
                                         key = ds.NewKey("noop", "power level", 9000, nil)
                                         So(key, ShouldNotBeNil)
 
-                                        So(KeyValid("", key, UserKeyOnly), ShouldBeFalse)
+                                        So(keyValid("", key, userKeyOnly), ShouldBeFalse)
                                 })
                         })
 
                         Convey("NewKeyObj", func() {
                                 type Foo struct {
                                         _knd   string         `goon:"kind,coool"`
                                         ID     int64          `goon:"id"`
                                         Parent *datastore.Key `goon:"parent"`
                                 }
                                 f := &Foo{ID: 100}
@@ skipping 23 matching lines @@
                         })
                 })
 
         })
 }
 
 func TestDatastoreSingleReadWriter(t *testing.T) {
         t.Parallel()
 
         Convey("Datastore single reads and writes", t, func() {
-                c := Use(Enable(context.Background()))
+                c := Use(context.Background())
                 ds := wrapper.GetDS(c)
                 So(ds, ShouldNotBeNil)
 
                 Convey("implements DSSingleReadWriter", func() {
                         type Foo struct {
                                 ID     int64          `goon:"id" datastore:"-"`
                                 Parent *datastore.Key `goon:"parent" datastore:"-"`
                                 Val    int
                         }
 
@@ skipping 366 matching lines @@
                                                 f := &Foo{ID: 1}
                                                 So(ds.Get(f), ShouldBeNil)
                                                 So(f.Val, ShouldEqual, 10)
                                         })
                                 })
                         })
                 })
 
         })
 }