Refactor a bit.

impl/memory/taskqueue_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 memory
 
 import (
         "fmt"
         "math/rand"
         "net/http"
         "testing"
         "time"
 
-        "github.com/luci/gae"
+        rdsS "github.com/luci/gae/service/rawdatastore"
+        tqS "github.com/luci/gae/service/taskqueue"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/clock/testclock"
+        "github.com/luci/luci-go/common/mathrand"
         . "github.com/smartystreets/goconvey/convey"
         "golang.org/x/net/context"
 )
 
 func TestTaskQueue(t *testing.T) {
         t.Parallel()
 
         Convey("TaskQueue", t, func() {
                 now := time.Date(2000, time.January, 1, 1, 1, 1, 1, time.UTC)
                 c, tc := testclock.UseTime(context.Background(), now)
-                c = gae.SetMathRand(c, rand.New(rand.NewSource(clock.Now(c).UnixNano())))
+                c = mathrand.Set(c, rand.New(rand.NewSource(clock.Now(c).UnixNano())))
                 c = Use(c)
 
-                tq := gae.GetTQ(c).(interface {
-                        gae.TaskQueue
-                        gae.TQTestable
+                tq := tqS.Get(c).(interface {
+                        tqS.Interface
+                        tqS.Testable
                 })
 
                 So(tq, ShouldNotBeNil)
 
                 Convey("implements TQMultiReadWriter", func() {
                         Convey("Add", func() {
-                                t := &gae.TQTask{Path: "/hello/world"}
+                                t := &tqS.Task{Path: "/hello/world"}
 
                                 Convey("works", func() {
                                         t.Delay = 4 * time.Second
                                         t.Header = http.Header{}
                                         t.Header.Add("Cat", "tabby")
                                         t.Payload = []byte("watwatwat")
-                                        t.RetryOptions = &gae.TQRetryOptions{AgeLimit: 7 * time.Second}
+                                        t.RetryOptions = &tqS.RetryOptions{AgeLimit: 7 * time.Second}
                                         _, err := tq.Add(t, "")
                                         So(err, ShouldBeNil)
                                         name := "Z_UjshxM9ecyMQfGbZmUGOEcgxWU0_5CGLl_-RntudwAw2DqQ5-58bzJiWQN4OKzeuUb9O4JrPkUw2rOvk2Ax46THojnQ6avBQgZdrKcJmrwQ6o4qKfJdiyUbGXvy691yRfzLeQhs6cBhWrgf3wH-VPMcA4SC-zlbJ2U8An7I0zJQA5nBFnMNoMgT-2peGoay3rCSbj4z9VFFm9kS_i6JCaQH518ujLDSNCYdjTq6B6lcWrZAh0U_q3a1S2nXEwrKiw_t9MTNQFgAQZWyGBbvZQPmeRYtu8SPaWzTfd25v_YWgBuVL2rRSPSMvlDwE04nNdtvVzE8vNNiA1zRimmdzKeqATQF9_ReUvj4D7U8dcS703DZWfKMBLgBffY9jqCassOOOw77V72Oq5EVauUw3Qw0L6bBsfM9FtahTKUdabzRZjXUoze3EK4KXPt3-wdidau-8JrVf2XFocjjZbwHoxcGvbtT3b4nGLDlgwdC00bwaFBZWff"
-                                        So(*tq.GetScheduledTasks()["default"][name], ShouldResemble, gae.TQTask{
+                                        So(*tq.GetScheduledTasks()["default"][name], ShouldResemble, tqS.Task{
                                                 ETA:          now.Add(4 * time.Second),
                                                 Header:       http.Header{"Cat": []string{"tabby"}},
                                                 Method:       "POST",
                                                 Name:         name,
                                                 Path:         "/hello/world",
                                                 Payload:      []byte("watwatwat"),
-                                                RetryOptions: &gae.TQRetryOptions{AgeLimit: 7 * time.Second},
+                                                RetryOptions: &tqS.RetryOptions{AgeLimit: 7 * time.Second},
                                         })
                                 })
 
                                 Convey("cannot add to bad queues", func() {
                                         _, err := tq.Add(nil, "waaat")
                                         So(err.Error(), ShouldContainSubstring, "UNKNOWN_QUEUE")
 
                                         Convey("but you can add Queues when testing", func() {
                                                 tq.CreateQueue("waaat")
                                                 _, err := tq.Add(t, "waaat")
@@ skipping 12 matching lines @@
                                         So(tr.Path, ShouldEqual, "/_ah/queue/default")
                                 })
 
                                 Convey("cannot add twice", func() {
                                         t.Name = "bob"
                                         _, err := tq.Add(t, "")
                                         So(err, ShouldBeNil)
 
                                         // can't add the same one twice!
                                         _, err = tq.Add(t, "")
-                                        So(err, ShouldEqual, gae.ErrTQTaskAlreadyAdded)
+                                        So(err, ShouldEqual, tqS.ErrTaskAlreadyAdded)
                                 })
 
                                 Convey("cannot add deleted task", func() {
                                         t.Name = "bob"
                                         _, err := tq.Add(t, "")
                                         So(err, ShouldBeNil)
 
                                         err = tq.Delete(t, "")
                                         So(err, ShouldBeNil)
 
                                         // can't add a deleted task!
                                         _, err = tq.Add(t, "")
-                                        So(err, ShouldEqual, gae.ErrTQTaskAlreadyAdded)
+                                        So(err, ShouldEqual, tqS.ErrTaskAlreadyAdded)
                                 })
 
                                 Convey("cannot set ETA+Delay", func() {
                                         t.ETA = clock.Now(c).Add(time.Hour)
                                         tc.Add(time.Second)
                                         t.Delay = time.Hour
                                         So(func() { tq.Add(t, "") }, ShouldPanic)
                                 })
 
                                 Convey("must use a reasonable method", func() {
@@ skipping 16 matching lines @@
                                 Convey("invalid names are rejected", func() {
                                         t.Name = "happy times"
                                         _, err := tq.Add(t, "")
                                         So(err.Error(), ShouldContainSubstring, "INVALID_TASK_NAME")
                                 })
 
                                 Convey("AddMulti also works", func() {
                                         t2 := dupTask(t)
                                         t2.Path = "/hi/city"
 
-                                        expect := []*gae.TQTask{t, t2}
+                                        expect := []*tqS.Task{t, t2}
 
                                         tasks, err := tq.AddMulti(expect, "default")
                                         So(err, ShouldBeNil)
                                         So(len(tasks), ShouldEqual, 2)
                                         So(len(tq.GetScheduledTasks()["default"]), ShouldEqual, 2)
 
                                         for i := range expect {
                                                 Convey(fmt.Sprintf("task %d: %s", i, expect[i].Path), func() {
                                                         expect[i].Method = "POST"
                                                         expect[i].ETA = now
                                                         So(expect[i].Name, ShouldEqual, "")
                                                         So(len(tasks[i].Name), ShouldEqual, 500)
                                                         tasks[i].Name = ""
                                                         So(tasks[i], ShouldResemble, expect[i])
                                                 })
                                         }
                                 })
                         })
 
                         Convey("Delete", func() {
-                                t := &gae.TQTask{Path: "/hello/world"}
+                                t := &tqS.Task{Path: "/hello/world"}
                                 tEnQ, err := tq.Add(t, "")
                                 So(err, ShouldBeNil)
 
                                 Convey("works", func() {
                                         t.Name = tEnQ.Name
                                         err := tq.Delete(t, "")
                                         So(err, ShouldBeNil)
                                         So(len(tq.GetScheduledTasks()["default"]), ShouldEqual, 0)
                                         So(len(tq.GetTombstonedTasks()["default"]), ShouldEqual, 1)
                                         So(tq.GetTombstonedTasks()["default"][tEnQ.Name], ShouldResemble, tEnQ)
@@ skipping 27 matching lines @@
                                         So(err.Error(), ShouldContainSubstring, "UNKNOWN_TASK")
                                 })
 
                                 Convey("DeleteMulti also works", func() {
                                         t2 := dupTask(t)
                                         t2.Path = "/hi/city"
                                         tEnQ2, err := tq.Add(t2, "")
                                         So(err, ShouldBeNil)
 
                                         Convey("usually works", func() {
-                                                err = tq.DeleteMulti([]*gae.TQTask{tEnQ, tEnQ2}, "")
+                                                err = tq.DeleteMulti([]*tqS.Task{tEnQ, tEnQ2}, "")
                                                 So(err, ShouldBeNil)
                                                 So(len(tq.GetScheduledTasks()["default"]), ShouldEqual, 0)
                                                 So(len(tq.GetTombstonedTasks()["default"]), ShouldEqual, 2)
                                         })
                                 })
                         })
                 })
 
                 Convey("works with transactions", func() {
-                        t := &gae.TQTask{Path: "/hello/world"}
+                        t := &tqS.Task{Path: "/hello/world"}
                         tEnQ, err := tq.Add(t, "")
                         So(err, ShouldBeNil)
 
-                        t2 := &gae.TQTask{Path: "/hi/city"}
+                        t2 := &tqS.Task{Path: "/hi/city"}
                         tEnQ2, err := tq.Add(t2, "")
                         So(err, ShouldBeNil)
 
                         err = tq.Delete(tEnQ2, "")
                         So(err, ShouldBeNil)
 
                         Convey("can view regular tasks", func() {
-                                gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
-                                        tq := gae.GetTQ(c).(interface {
-                                                gae.TQTestable
-                                                gae.TaskQueue
+                                rdsS.Get(c).RunInTransaction(func(c context.Context) error {
+                                        tq := tqS.Get(c).(interface {
+                                                tqS.Testable
+                                                tqS.Interface
                                         })
 
                                         So(tq.GetScheduledTasks()["default"][tEnQ.Name], ShouldResemble, tEnQ)
                                         So(tq.GetTombstonedTasks()["default"][tEnQ2.Name], ShouldResemble, tEnQ2)
                                         So(tq.GetTransactionTasks()["default"], ShouldBeNil)
                                         return nil
                                 }, nil)
                         })
 
                         Convey("can add a new task", func() {
-                                tEnQ3 := (*gae.TQTask)(nil)
+                                tEnQ3 := (*tqS.Task)(nil)
 
-                                gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
-                                        tq := gae.GetTQ(c).(interface {
-                                                gae.TQTestable
-                                                gae.TaskQueue
+                                rdsS.Get(c).RunInTransaction(func(c context.Context) error {
+                                        tq := tqS.Get(c).(interface {
+                                                tqS.Testable
+                                                tqS.Interface
                                         })
 
-                                        t3 := &gae.TQTask{Path: "/sandwitch/victory"}
+                                        t3 := &tqS.Task{Path: "/sandwitch/victory"}
                                         tEnQ3, err = tq.Add(t3, "")
                                         So(err, ShouldBeNil)
 
                                         So(tq.GetScheduledTasks()["default"][tEnQ.Name], ShouldResemble, tEnQ)
                                         So(tq.GetTombstonedTasks()["default"][tEnQ2.Name], ShouldResemble, tEnQ2)
                                         So(tq.GetTransactionTasks()["default"][0], ShouldResemble, tEnQ3)
                                         return nil
                                 }, nil)
 
                                 // name gets generated at transaction-commit-time
                                 for name := range tq.GetScheduledTasks()["default"] {
                                         if name == tEnQ.Name {
                                                 continue
                                         }
                                         tEnQ3.Name = name
                                         break
                                 }
 
                                 So(tq.GetScheduledTasks()["default"][tEnQ.Name], ShouldResemble, tEnQ)
                                 So(tq.GetScheduledTasks()["default"][tEnQ3.Name], ShouldResemble, tEnQ3)
                                 So(tq.GetTombstonedTasks()["default"][tEnQ2.Name], ShouldResemble, tEnQ2)
                                 So(tq.GetTransactionTasks()["default"], ShouldBeNil)
                         })
 
                         Convey("can a new task (but reset the state in a test)", func() {
-                                tEnQ3 := (*gae.TQTask)(nil)
+                                tEnQ3 := (*tqS.Task)(nil)
 
                                 ttq := interface {
-                                        gae.TQTestable
-                                        gae.TaskQueue
+                                        tqS.Testable
+                                        tqS.Interface
                                 }(nil)
 
-                                gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
-                                        ttq = gae.GetTQ(c).(interface {
-                                                gae.TQTestable
-                                                gae.TaskQueue
+                                rdsS.Get(c).RunInTransaction(func(c context.Context) error {
+                                        ttq = tqS.Get(c).(interface {
+                                                tqS.Testable
+                                                tqS.Interface
                                         })
 
-                                        t3 := &gae.TQTask{Path: "/sandwitch/victory"}
+                                        t3 := &tqS.Task{Path: "/sandwitch/victory"}
                                         tEnQ3, err = ttq.Add(t3, "")
                                         So(err, ShouldBeNil)
 
                                         So(ttq.GetScheduledTasks()["default"][tEnQ.Name], ShouldResemble, tEnQ)
                                         So(ttq.GetTombstonedTasks()["default"][tEnQ2.Name], ShouldResemble, tEnQ2)
                                         So(ttq.GetTransactionTasks()["default"][0], ShouldResemble, tEnQ3)
 
                                         ttq.ResetTasks()
 
                                         So(len(ttq.GetScheduledTasks()["default"]), ShouldEqual, 0)
                                         So(len(ttq.GetTombstonedTasks()["default"]), ShouldEqual, 0)
                                         So(len(ttq.GetTransactionTasks()["default"]), ShouldEqual, 0)
 
                                         return nil
                                 }, nil)
 
                                 So(len(tq.GetScheduledTasks()["default"]), ShouldEqual, 0)
                                 So(len(tq.GetTombstonedTasks()["default"]), ShouldEqual, 0)
                                 So(len(tq.GetTransactionTasks()["default"]), ShouldEqual, 0)
 
                                 Convey("and reusing a closed context is bad times", func() {
                                         _, err := ttq.Add(nil, "")
                                         So(err.Error(), ShouldContainSubstring, "expired")
                                 })
                         })
 
                         Convey("you can AddMulti as well", func() {
-                                gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
-                                        tq := gae.GetTQ(c).(interface {
-                                                gae.TQTestable
-                                                gae.TaskQueue
+                                rdsS.Get(c).RunInTransaction(func(c context.Context) error {
+                                        tq := tqS.Get(c).(interface {
+                                                tqS.Testable
+                                                tqS.Interface
                                         })
-                                        _, err := tq.AddMulti([]*gae.TQTask{t, t, t}, "")
+                                        _, err := tq.AddMulti([]*tqS.Task{t, t, t}, "")
                                         So(err, ShouldBeNil)
                                         So(len(tq.GetScheduledTasks()["default"]), ShouldEqual, 1)
                                         So(len(tq.GetTransactionTasks()["default"]), ShouldEqual, 3)
                                         return nil
                                 }, nil)
                                 So(len(tq.GetScheduledTasks()["default"]), ShouldEqual, 4)
                                 So(len(tq.GetTransactionTasks()["default"]), ShouldEqual, 0)
                         })
 
                         Convey("unless you add too many things", func() {
-                                gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
+                                rdsS.Get(c).RunInTransaction(func(c context.Context) error {
                                         for i := 0; i < 5; i++ {
-                                                _, err = gae.GetTQ(c).Add(t, "")
+                                                _, err = tqS.Get(c).Add(t, "")
                                                 So(err, ShouldBeNil)
                                         }
-                                        _, err = gae.GetTQ(c).Add(t, "")
+                                        _, err = tqS.Get(c).Add(t, "")
                                         So(err.Error(), ShouldContainSubstring, "BAD_REQUEST")
                                         return nil
                                 }, nil)
                         })
 
                         Convey("unless you Add to a bad queue", func() {
-                                gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
-                                        _, err = gae.GetTQ(c).Add(t, "meat")
+                                rdsS.Get(c).RunInTransaction(func(c context.Context) error {
+                                        _, err = tqS.Get(c).Add(t, "meat")
                                         So(err.Error(), ShouldContainSubstring, "UNKNOWN_QUEUE")
 
                                         Convey("unless you add it!", func() {
-                                                gae.GetTQ(c).(gae.TQTestable).CreateQueue("meat")
-                                                _, err = gae.GetTQ(c).Add(t, "meat")
+                                                tqS.Get(c).(tqS.Testable).CreateQueue("meat")
+                                                _, err = tqS.Get(c).Add(t, "meat")
                                                 So(err, ShouldBeNil)
                                         })
 
                                         return nil
                                 }, nil)
                         })
 
                         Convey("No other features are available, however", func() {
                                 err := error(nil)
                                 func() {
                                         defer func() { err = recover().(error) }()
-                                        gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
-                                                gae.GetTQ(c).Delete(t, "")
+                                        rdsS.Get(c).RunInTransaction(func(c context.Context) error {
+                                                tqS.Get(c).Delete(t, "")
                                                 return nil
                                         }, nil)
                                 }()
                                 So(err.Error(), ShouldContainSubstring, "TaskQueue.Delete")
                         })
 
                         Convey("adding a new task only happens if we don't errout", func() {
-                                gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
-                                        t3 := &gae.TQTask{Path: "/sandwitch/victory"}
-                                        _, err = gae.GetTQ(c).Add(t3, "")
+                                rdsS.Get(c).RunInTransaction(func(c context.Context) error {
+                                        t3 := &tqS.Task{Path: "/sandwitch/victory"}
+                                        _, err = tqS.Get(c).Add(t3, "")
                                         So(err, ShouldBeNil)
                                         return fmt.Errorf("nooooo")
                                 }, nil)
 
                                 So(tq.GetScheduledTasks()["default"][tEnQ.Name], ShouldResemble, tEnQ)
                                 So(tq.GetTombstonedTasks()["default"][tEnQ2.Name], ShouldResemble, tEnQ2)
                                 So(tq.GetTransactionTasks()["default"], ShouldBeNil)
                         })
 
                         Convey("likewise, a panic doesn't schedule anything", func() {
                                 func() {
                                         defer func() { recover() }()
-                                        gae.GetRDS(c).RunInTransaction(func(c context.Context) error {
-                                                tq := gae.GetTQ(c).(interface {
-                                                        gae.TQTestable
-                                                        gae.TaskQueue
+                                        rdsS.Get(c).RunInTransaction(func(c context.Context) error {
+                                                tq := tqS.Get(c).(interface {
+                                                        tqS.Testable
+                                                        tqS.Interface
                                                 })
 
-                                                t3 := &gae.TQTask{Path: "/sandwitch/victory"}
+                                                t3 := &tqS.Task{Path: "/sandwitch/victory"}
                                                 _, err = tq.Add(t3, "")
                                                 So(err, ShouldBeNil)
 
                                                 panic(fmt.Errorf("nooooo"))
                                         }, nil)
                                 }()
 
                                 So(tq.GetScheduledTasks()["default"][tEnQ.Name], ShouldResemble, tEnQ)
                                 So(tq.GetTombstonedTasks()["default"][tEnQ2.Name], ShouldResemble, tEnQ2)
                                 So(tq.GetTransactionTasks()["default"], ShouldBeNil)
                         })
 
                 })
         })
 }