Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

Unified Diff: service/datastore/raw_interface_test.go

Issue 1516173002: Fix error message from KeyForObj when passing an invalid struct. (Closed) Base URL: https://github.com/luci/gae.git@master
Patch Set: Fix GetMetaDefault silliness Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« service/datastore/pls_test.go ('K') | « service/datastore/raw_interface.go ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: service/datastore/raw_interface_test.go
diff --git a/service/datastore/raw_interface_test.go b/service/datastore/raw_interface_test.go
index 475d16af72ea34f71b8cd5eb6e8db19fe29b5c42..f8201001413f41e81a0dc7074d5da8beef8e0845 100644
--- a/service/datastore/raw_interface_test.go
+++ b/service/datastore/raw_interface_test.go
@@ -20,13 +20,18 @@ func TestMultiMetaGetter(t *testing.T) {
So(err, ShouldEqual, ErrMetaFieldUnset)
So(val, ShouldBeNil)
- So(mmg.GetMetaDefault(7, "hi", "value"), ShouldEqual, "value")
+ v, err := GetMetaDefault(mmg.GetSingle(7), "hi", "value")
+ So(err, ShouldBeNil)
+ So(v, ShouldEqual, "value")
m := mmg.GetSingle(10)
val, err = m.GetMeta("hi")
So(err, ShouldEqual, ErrMetaFieldUnset)
So(val, ShouldBeNil)
- So(m.GetMetaDefault("hi", "value"), ShouldEqual, "value")
+
+ v, err = GetMetaDefault(m, "hi", "value")
+ So(err, ShouldBeNil)
+ So(v, ShouldEqual, "value")
})
Convey("stuff", func() {
@@ -36,16 +41,22 @@ func TestMultiMetaGetter(t *testing.T) {
mmg := NewMultiMetaGetter(pmaps)
// oob is OK
- So(mmg.GetMetaDefault(7, "hi", "value"), ShouldEqual, "value")
+ v, err := GetMetaDefault(mmg.GetSingle(7), "hi", "value")
+ So(err, ShouldBeNil)
+ So(v, ShouldEqual, "value")
// nil is OK
- So(mmg.GetMetaDefault(1, "key", true), ShouldEqual, true)
+ v, err = GetMetaDefault(mmg.GetSingle(1), "key", true)
+ So(err, ShouldBeNil)
+ So(v, ShouldEqual, true)
val, err := mmg.GetMeta(0, "hi")
So(err, ShouldBeNil)
So(val, ShouldEqual, "thing")
- So(mmg.GetMetaDefault(2, "key", 20), ShouldEqual, 100)
+ v, err = GetMetaDefault(mmg.GetSingle(2), "key", 20)
+ So(err, ShouldBeNil)
+ So(v, ShouldEqual, 100)
})
})
}
« service/datastore/pls_test.go ('K') | « service/datastore/raw_interface.go ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698