diff --git a/cmd/robot/addRes.go b/cmd/robot/addRes.go new file mode 100644 index 000000000..c92c1bc9c --- /dev/null +++ b/cmd/robot/addRes.go @@ -0,0 +1,44 @@ +package robot + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/modules/user" + "go_dreamfactory/pb" +) + +var ( + addResBuilders = []*TestCase{ + { + desc: "添加资源", + mainType: string(comm.ModuleUser), + subType: user.UserSubTypeAddRes, + req: &pb.UserAddResReq{ + Res: &pb.UserAssets{ + A: "item", + T: "10001", + N: 1000, + }, + }, + rsp: &pb.UserAddResResp{}, + enabled: true, + }, + { + desc: "添加资源2", + mainType: string(comm.ModuleUser), + subType: user.UserSubTypeAddRes, + req: &pb.UserAddResReq{ + Res: &pb.UserAssets{ + A: "item", + T: "10011", + N: 1000, + }, + }, + rsp: &pb.UserAddResResp{}, + enabled: true, + }, + } +) + +func (r *Robot) RunAddRes() { + r.addBuilders(addResBuilders) +} diff --git a/cmd/robot/hero.go b/cmd/robot/hero.go index 9d4138080..6f33e33a9 100644 --- a/cmd/robot/hero.go +++ b/cmd/robot/hero.go @@ -41,6 +41,21 @@ var ( // r := rsp.(*pb.HeroInfoResp) // fmt.Printf("%v\n", r) // }, + next: func(robot *Robot, rsp proto.Message) { + tcs := []*TestCase{ + { + desc: "觉醒", + mainType: string(comm.ModuleHero), + subType: hero.Awaken, + req: &pb.HeroAwakenReq{ + HeroObjID: v.Id, + }, + rsp: &pb.HeroAwakenResp{}, + enabled: true, + }, + } + robot.addTestCaseAndReq(tcs) + }, } tcs = append(tcs, tc) } diff --git a/cmd/robot/login.go b/cmd/robot/login.go index 7264e407f..9e5efca0f 100644 --- a/cmd/robot/login.go +++ b/cmd/robot/login.go @@ -60,8 +60,8 @@ func (r *Robot) AccountLogin() { req: &pb.UserCreateReq{ //设置请求参数 NickName: nick, }, - rsp: &pb.UserCreateResp{}, - enabled: r.enable, + rsp: &pb.UserCreateResp{}, + // enabled: r.enable, } tcs = append(tcs, tc) r.addBuilders(tcs) diff --git a/cmd/robot/robot.go b/cmd/robot/robot.go index 6ab321495..3781d312d 100644 --- a/cmd/robot/robot.go +++ b/cmd/robot/robot.go @@ -13,7 +13,6 @@ import ( "go_dreamfactory/pb" "io/ioutil" "net/http" - "sync" "time" "github.com/Pallinder/go-randomdata" @@ -32,9 +31,7 @@ type Robot struct { // linkCase *LinkCase enable bool //全局开关 reqCh chan string - endCh chan struct{} - printFormat bool //是否格式化结果 - wg sync.WaitGroup + printFormat bool //是否格式化结果 caseTotal int32 //测试数量 caseSuccess int32 //成功数量 caseError int32 //失败数量 @@ -101,7 +98,7 @@ func (r *Robot) Run() { } }() - ticker := time.NewTicker(time.Second * 5) + ticker := time.NewTicker(time.Second * 65) go func() { for { select { @@ -119,6 +116,7 @@ func (r *Robot) Run() { }() select {} + } type TestCase struct { @@ -232,6 +230,7 @@ func (r *Robot) handleRsp() { } //处理下一层用例 + // r.goNext(v) if v.next != nil { v.next(r, v.rsp) } @@ -439,6 +438,8 @@ func traceFunc(module string, funcName string, uid string, funcArgs interface{}) func (r *Robot) onUserLoaded() { //user r.RunUser() + + r.RunAddRes() //hero r.RunHero() //friend diff --git a/go.mod b/go.mod index ccca2c3b3..8e77dd5c0 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,6 @@ require ( github.com/klauspost/compress v1.13.6 // indirect github.com/klauspost/cpuid/v2 v2.0.12 // indirect github.com/klauspost/reedsolomon v1.9.16 // indirect - github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect github.com/leodido/go-urn v1.2.1 // indirect github.com/lestrrat/go-file-rotatelogs v0.0.0-20180223000712-d3151e2a480f // indirect github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect diff --git a/go.sum b/go.sum index 0f9c3a6b7..5130790b0 100644 --- a/go.sum +++ b/go.sum @@ -407,7 +407,6 @@ github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuOb github.com/klauspost/reedsolomon v1.9.16 h1:mR0AwphBwqFv/I3B9AHtNKvzuowI1vrj8/3UX4XRmHA= github.com/klauspost/reedsolomon v1.9.16/go.mod h1:eqPAcE7xar5CIzcdfwydOEdcmchAKAP/qs14y4GCBOk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -611,7 +610,6 @@ github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5k github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= @@ -950,7 +948,6 @@ golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f h1:8w7RhxzTVgUzw/AH/9mUV5q0vMgy40SQRursCcfmkCw= golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e h1:NHvCuwuS43lGnYhten69ZWqi2QOj/CiDNcKbVqwVoew= golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=