GAE CL for luci-go common refactor

impl/memory/datastore_query_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 memory
 
 import (
         "bytes"
         "testing"
 
         dstore "github.com/luci/gae/service/datastore"
         "github.com/luci/gae/service/datastore/serialize"
-        "github.com/luci/luci-go/common/cmpbin"
-        "github.com/luci/luci-go/common/stringset"
+        "github.com/luci/luci-go/common/data/cmpbin"
+        "github.com/luci/luci-go/common/data/stringset"
         . "github.com/luci/luci-go/common/testing/assertions"
         . "github.com/smartystreets/goconvey/convey"
 )
 
 type sillyCursor string
 
 func (s sillyCursor) String() string { return string(s) }
 
 func curs(pairs ...interface{}) queryCursor {
         if len(pairs)%2 != 0 {
@@ skipping 144 matching lines @@
                                         So(err, ShouldErrLike, tc.err)
 
                                         if tc.equivalentQuery != nil {
                                                 So(rq, ShouldResemble, tc.equivalentQuery)
                                         }
                                 })
                         }
                 })
         })
 }