Fix key encoding to be null terminated

service/datastore/serialize/serialize_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 serialize
 
 import (
         "bytes"
         "fmt"
         "io"
@@ skipping 238 matching lines @@
                                         buf.WriteByte(1) // actualCtx == 1
                                         cmpbin.WriteString(buf, "aid")
                                         cmpbin.WriteString(buf, "ns")
                                         _, err := ReadKey(buf, WithContext, "", "")
                                         So(err, ShouldEqual, io.EOF)
                                 })
                                 Convey("huge key", func() {
                                         buf.WriteByte(1) // actualCtx == 1
                                         cmpbin.WriteString(buf, "aid")
                                         cmpbin.WriteString(buf, "ns")
-                                        cmpbin.WriteUint(buf, 1000)
+                                        for i := 1; i < 60; i++ {
+                                                buf.WriteByte(1)
+                                                WriteKeyTok(buf, ds.KeyTok{Kind: "sup", IntID: int64(i)})
+                                        }
+                                        buf.WriteByte(0)
                                         _, err := ReadKey(buf, WithContext, "", "")
                                         So(err, ShouldErrLike, "huge key")
                                 })
                                 Convey("insufficient tokens", func() {
                                         buf.WriteByte(1) // actualCtx == 1
                                         cmpbin.WriteString(buf, "aid")
                                         cmpbin.WriteString(buf, "ns")
                                         cmpbin.WriteUint(buf, 2)
                                         _, err := ReadKey(buf, WithContext, "", "")
                                         So(err, ShouldEqual, io.EOF)
                                 })
                                 Convey("partial token 1", func() {
                                         buf.WriteByte(1) // actualCtx == 1
                                         cmpbin.WriteString(buf, "aid")
                                         cmpbin.WriteString(buf, "ns")
-                                        cmpbin.WriteUint(buf, 2)
+                                        buf.WriteByte(1)
                                         cmpbin.WriteString(buf, "hi")
                                         _, err := ReadKey(buf, WithContext, "", "")
                                         So(err, ShouldEqual, io.EOF)
                                 })
                                 Convey("partial token 2", func() {
                                         buf.WriteByte(1) // actualCtx == 1
                                         cmpbin.WriteString(buf, "aid")
                                         cmpbin.WriteString(buf, "ns")
-                                        cmpbin.WriteUint(buf, 2)
+                                        buf.WriteByte(1)
                                         cmpbin.WriteString(buf, "hi")
                                         buf.WriteByte(byte(ds.PTString))
                                         _, err := ReadKey(buf, WithContext, "", "")
                                         So(err, ShouldEqual, io.EOF)
                                 })
                                 Convey("bad token (invalid type)", func() {
                                         buf.WriteByte(1) // actualCtx == 1
                                         cmpbin.WriteString(buf, "aid")
                                         cmpbin.WriteString(buf, "ns")
-                                        cmpbin.WriteUint(buf, 2)
+                                        buf.WriteByte(1)
                                         cmpbin.WriteString(buf, "hi")
                                         buf.WriteByte(byte(ds.PTBlobKey))
                                         _, err := ReadKey(buf, WithContext, "", "")
                                         So(err, ShouldErrLike, "invalid type PTBlobKey")
                                 })
                                 Convey("bad token (invalid IntID)", func() {
                                         buf.WriteByte(1) // actualCtx == 1
                                         cmpbin.WriteString(buf, "aid")
                                         cmpbin.WriteString(buf, "ns")
-                                        cmpbin.WriteUint(buf, 2)
+                                        buf.WriteByte(1)
                                         cmpbin.WriteString(buf, "hi")
                                         buf.WriteByte(byte(ds.PTInt))
                                         cmpbin.WriteInt(buf, -2)
                                         _, err := ReadKey(buf, WithContext, "", "")
                                         So(err, ShouldErrLike, "zero/negative")
                                 })
                         })
                 })
 
                 Convey("ReadGeoPoint", func() {
@@ skipping 131 matching lines @@
                                 for i := 0; i < MaxIndexColumns+1; i++ {
                                         id.SortBy = append(id.SortBy, ds.IndexColumn{Property: "Hi", Direction: ds.ASCENDING})
                                 }
                                 data := ToBytes(id)
                                 newID, err = ReadIndexDefinition(mkBuf(data))
                                 So(err, ShouldErrLike, "over 64 sort orders")
                         })
                 })
         })
 }