Refactor keys and queries in datastore service and implementation.

filter/count/count_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 count
 
 import (
         "fmt"
         "testing"
 
@@ skipping 34 matching lines @@
                 So(ctr, ShouldNotBeNil)
 
                 ds := datastore.Get(c)
                 vals := []datastore.PropertyMap{{
                         "Val":  {datastore.MkProperty(100)},
                         "$key": {datastore.MkPropertyNI(ds.NewKey("Kind", "", 1, nil))},
                 }}
 
                 Convey("Calling a ds function should reflect in counter", func() {
                         So(ds.PutMulti(vals), ShouldBeNil)
-                        So(ctr.NewKey.Successes(), ShouldEqual, 1)
                         So(ctr.PutMulti.Successes(), ShouldEqual, 1)
 
                         Convey("effects are cumulative", func() {
                                 So(ds.PutMulti(vals), ShouldBeNil)
                                 So(ctr.PutMulti.Successes(), ShouldEqual, 2)
 
                                 Convey("even within transactions", func() {
                                         ds.RunInTransaction(func(c context.Context) error {
                                                 ds := datastore.Get(c)
                                                 So(ds.PutMulti(append(vals, vals[0])), ShouldBeNil)
@@ skipping 81 matching lines @@
                 if err := ds.PutMulti(vals); err != nil {
                         panic(err)
                 }
         }
 
         // Using the other function.
         someCalledFunc(c)
         someCalledFunc(c)
 
         // Then we can see what happened!
-        fmt.Printf("%s\n", counter.NewKey.String())
         fmt.Printf("%d\n", counter.PutMulti.Successes())
         // Output:
-        // {Successes:2, Errors:0}
         // 2
 }