Differentiate between single- and multi- props.

filter/count/count_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 count
 
 import (
         "fmt"
         "testing"
 
@@ skipping 37 matching lines @@
 
         Convey("Test Count filter", t, func() {
                 c, fb := featureBreaker.FilterRDS(memory.Use(context.Background()), nil)
                 c, ctr := FilterRDS(c)
 
                 So(c, ShouldNotBeNil)
                 So(ctr, ShouldNotBeNil)
 
                 ds := datastore.Get(c)
                 vals := []datastore.PropertyMap{{
-                        "Val":  {datastore.MkProperty(100)},
-                        "$key": {datastore.MkPropertyNI(ds.NewKey("Kind", "", 1, nil))},
+                        "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.PutMulti.Successes(), ShouldEqual, 1)
 
                         Convey("effects are cumulative", func() {
                                 So(ds.PutMulti(vals), ShouldBeNil)
                                 So(ctr.PutMulti.Successes(), ShouldEqual, 2)
 
@@ skipping 131 matching lines @@
         c := memory.Use(context.Background())
 
         // Apply the counter.FilterRDS
         c, counter := FilterRDS(c)
 
         // functions use ds from the context like normal... they don't need to know
         // that there are any filters at all.
         someCalledFunc := func(c context.Context) {
                 ds := datastore.Get(c)
                 vals := []datastore.PropertyMap{{
-                        "FieldName": {datastore.MkProperty(100)},
-                        "$key":      {datastore.MkProperty(ds.NewKey("Kind", "", 1, nil))}},
+                        "FieldName": datastore.MkProperty(100),
+                        "$key":      datastore.MkProperty(ds.NewKey("Kind", "", 1, nil))},
                 }
                 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("%d\n", counter.PutMulti.Successes())
         // Output:
         // 2
 }