diff --git a/cmd/robot/friend.go b/cmd/robot/friend.go index de8aa0bd0..d4d0cb9ac 100644 --- a/cmd/robot/friend.go +++ b/cmd/robot/friend.go @@ -8,7 +8,7 @@ import ( var ( //friend - friendBuilders = []*builder{ + friendBuilders = []*testCase{ { //list mainType: string(comm.ModuleFriend), diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index 2ea33ac8a..15958b5ac 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -11,7 +11,7 @@ import ( var ( //hero - heroBuilders = []*builder{ + heroBuilders = []*testCase{ { desc: "英雄列表", mainType: string(comm.ModuleHero), diff --git a/cmd/robot/job.go b/cmd/robot/job.go new file mode 100644 index 000000000..bc15dcf44 --- /dev/null +++ b/cmd/robot/job.go @@ -0,0 +1,16 @@ +package robot + +type CaseNode struct { + caseName testCase //用例名 + next *CaseNode //测试用例 +} + +type LinkCase struct { + head *CaseNode +} + +func NewLinkCase() *LinkCase { + return &LinkCase{} +} + + diff --git a/cmd/robot/login.go b/cmd/robot/login.go index 11f0db9ab..0a907c2ae 100644 --- a/cmd/robot/login.go +++ b/cmd/robot/login.go @@ -35,7 +35,7 @@ func (r *Robot) BuildSecStr() string { //处理登录请求 func (r *Robot) AccountLogin() { log.Printf("区服:[%d] 账号:[%s] login...", r.opts.ServerId, r.opts.Account) - builders := []*builder{ + builders := []*testCase{ { mainType: string(comm.ModuleUser), subType: user.UserSubTypeLogin, diff --git a/cmd/robot/notify.go b/cmd/robot/notify.go index 331b4e651..61bb3fde5 100644 --- a/cmd/robot/notify.go +++ b/cmd/robot/notify.go @@ -5,7 +5,7 @@ import ( "go_dreamfactory/pb" ) -var notify_builders = []*builder{ +var notify_builders = []*testCase{ { //create mainType: comm.MainTypeNotify, diff --git a/cmd/robot/pack.go b/cmd/robot/pack.go index e5d0ef588..aeeba61b2 100644 --- a/cmd/robot/pack.go +++ b/cmd/robot/pack.go @@ -6,7 +6,7 @@ import ( ) //申明测试接口及请求和响应参数 -var pack_builders = []*builder{ +var pack_builders = []*testCase{ { //create mainType: string(comm.ModulePack), diff --git a/cmd/robot/robot.go b/cmd/robot/robot.go index 6cf465a03..953d08959 100644 --- a/cmd/robot/robot.go +++ b/cmd/robot/robot.go @@ -20,7 +20,7 @@ type Robot struct { ws *websocket.Conn opts *Options user *pb.DBUser - builders []*builder + builders []*testCase } func NewRobot(opts *Options) *Robot { @@ -67,7 +67,7 @@ func (r *Robot) Run() { select {} } -type builder struct { +type testCase struct { desc string mainType string subType string @@ -79,7 +79,7 @@ type builder struct { print func(rsp proto.Message) } -func (r *Robot) addBuilders(builders []*builder) { +func (r *Robot) addBuilders(builders []*testCase) { for _, b := range builders { if b.enabled { r.builders = append(r.builders, b) @@ -199,7 +199,7 @@ func (r *Robot) AccountRegister(account string, sid int32) { fmt.Printf("account:%s 注册成功", regRsp.Account) //登录 - var user_builders = []*builder{ + var user_builders = []*testCase{ { desc: "登录", mainType: "user", @@ -218,7 +218,7 @@ func (r *Robot) AccountRegister(account string, sid int32) { } //打印响应 -func printReply(msg *pb.UserMessage, builder *builder) { +func printReply(msg *pb.UserMessage, builder *testCase) { if m, ok := builder.rsp.(*pb.NotifyErrorNotifyPush); ok { var tt time.Duration if builder.start.IsZero() { diff --git a/cmd/robot/user.go b/cmd/robot/user.go index 1f709eb08..cd78bdd8e 100644 --- a/cmd/robot/user.go +++ b/cmd/robot/user.go @@ -7,7 +7,7 @@ import ( ) //申明测试接口及请求和响应参数 -var user_builders = []*builder{ +var user_builders = []*testCase{ { //create desc: "创角",