Test feat

go.mod

@@ -17,7 +17,7 @@ require golang.org/x/net v0.22.0 // indirect
 require (
  github.com/google/go-cmp v0.6.0
  github.com/openimsdk/protocol v0.0.72-alpha.12
- github.com/openimsdk/tools v0.0.50-alpha.8
+ github.com/openimsdk/tools v0.0.50-alpha.9
  github.com/patrickmn/go-cache v2.1.0+incompatible
  golang.org/x/image v0.15.0
  golang.org/x/sync v0.6.0

go.sum

@@ -27,8 +27,8 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/openimsdk/protocol v0.0.72-alpha.12 h1:GXUtSFXlh1AeOmMjN1CsRfRZMTQYBWZ8mTuRoB7KxLQ=
 github.com/openimsdk/protocol v0.0.72-alpha.12/go.mod h1:OZQA9FR55lseYoN2Ql1XAHYKHJGu7OMNkUbuekrKCM8=
-github.com/openimsdk/tools v0.0.50-alpha.8 h1:Cb4IMqN7ULVbPVRHkf4a6t0lEywLhbjCjHc8bbYhFKk=
-github.com/openimsdk/tools v0.0.50-alpha.8/go.mod h1:oiSQU5Z6fzjxKFjbqDHImD8EmCIwClU1Rkur1sK12Po=
+github.com/openimsdk/tools v0.0.50-alpha.9 h1:oeFFjDdgHyGM+2QUr0j0uiFEiiFtda+rr7lm+0fLmHA=
+github.com/openimsdk/tools v0.0.50-alpha.9/go.mod h1:oiSQU5Z6fzjxKFjbqDHImD8EmCIwClU1Rkur1sK12Po=
 github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaRUnok+kx1WdO15EQc=
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

integration_test/internal/checker/conversation.go

@@ -14,7 +14,7 @@ func CheckConvNumAfterImpFriAndCrGro(ctx context.Context) error {
  // corrects[0] :super user conversion num
  // corrects[1] :common user conversion num
  largeNum := vars.LargeGroupNum
- commonNum := vars.CommonGroupNum * vars.CommonGroupMemberNum
+ commonNum := 0 // cal by userNum
  groupNum := largeNum + commonNum
 
  superNum := vars.UserNum - 1 + groupNum
@@ -35,10 +35,11 @@ func CheckConvNumAfterImpFriAndCrGro(ctx context.Context) error {
  return totalNum, nil
  },
  CalCorrectCount: func(userID string) int {
+ commonGroupNum := calCommonGroup(utils.MustGetUserNum(userID))
  if utils.IsSuperUser(userID) {
- return corrects[0]
+ return corrects[0] + commonGroupNum
  } else {
- return corrects[1]
+ return corrects[1] + commonGroupNum
  }
  },
  LoopSlice: sdk.TestSDKs,

integration_test/internal/checker/counter.go

@@ -5,15 +5,14 @@ import (
  "fmt"
  "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/config"
  "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/pkg/decorator"
+ "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/pkg/progress"
  "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/pkg/reerrgroup"
- "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/pkg/utils"
  "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/sdk"
  "github.com/openimsdk/tools/errs"
  "github.com/openimsdk/tools/log"
  "github.com/openimsdk/tools/utils/stringutil"
  "strings"
  "sync"
- "sync/atomic"
  "time"
 )
 
@@ -58,15 +57,14 @@ func (c *CounterChecker[T, K]) Check(ctx context.Context) error {
 
  var (
  gr, cctx = reerrgroup.WithContext(ctx, c.GoroutineLimit)
- total atomic.Int64
- progress atomic.Int64
+ total int
+ now int
 
  checkers = make(map[K]*Counter, len(sdk.TestSDKs))
  mapLock = sync.RWMutex{}
  )
-
- total.Add(int64(len(c.LoopSlice)))
- utils.FuncProgressBarPrint(cctx, gr, &progress, &total)
+ total = len(c.LoopSlice)
+ progress.FuncBarPrint(cctx, stringutil.GetFuncName(1), gr, now, total)
 
  for _, t := range c.LoopSlice {
  t := t
@@ -110,14 +108,13 @@ func (c *CounterChecker[T, K]) LoopCheck(ctx context.Context) error {
 
  var (
  gr, cctx = reerrgroup.WithContext(ctx, c.GoroutineLimit)
- total atomic.Int64
- progress atomic.Int64
+ total int
+ now int
 
  checkers = make(map[K]*Counter, len(sdk.TestSDKs))
  )
-
- total.Add(int64(len(c.LoopSlice)))
- utils.FuncProgressBarPrint(cctx, gr, &progress, &total)
+ total = len(c.LoopSlice)
+ p := progress.FuncBarPrint(cctx, stringutil.GetFuncName(1), gr, now, total)
 
  for _, t := range c.LoopSlice {
  t := t
@@ -126,24 +123,30 @@ func (c *CounterChecker[T, K]) LoopCheck(ctx context.Context) error {
  gr.Go(func() error {
  key := c.GetKey(t)
  correctNum := c.CalCorrectCount(key)
+
+ bar := progress.NewRemoveBar(fmt.Sprintf("%v", key), 0, correctNum)
+ p.AddBar(bar)
+
  for !isEqual {
 
  totalNum, err := c.GetTotalCount(ctx, t)
  if err != nil {
  return err
  }
+
+ p.SetBarNow(bar, totalNum)
+
  isEqual = totalNum == correctNum
  if !isEqual {
  checkCount++
 
- logStr := fmt.Sprintf("check num:%d, %s un correct. %s: %s,%s: %d, %s: %d",
- checkCount, stringutil.CamelCaseToSpaceSeparated(c.checkNumName),
- c.CheckerKeyName, key, c.checkNumName, totalNum, "correct num", correctNum)
-
- fmt.Println(logStr)
  log.ZWarn(ctx, fmt.Sprintf("check num:%d, %s un correct",
  checkCount, stringutil.CamelCaseToSpaceSeparated(c.checkNumName)),
  nil, c.CheckerKeyName, key, c.checkNumName, totalNum, "correct num", correctNum)
+ } else {
+ log.ZInfo(ctx, fmt.Sprintf("check num:%d, %s correct",
+ checkCount, stringutil.CamelCaseToSpaceSeparated(c.checkNumName)),
+ c.CheckerKeyName, key, c.checkNumName, totalNum, "correct num", correctNum)
  }
  time.Sleep(config.CheckWaitSec * time.Second)
  }

integration_test/internal/checker/group.go

@@ -3,14 +3,15 @@ package checker
 import (
  "context"
  "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/config"
+ "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/pkg/utils"
  "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/sdk"
  "github.com/openimsdk/openim-sdk-core/v3/integration_test/internal/vars"
 )
 
 func CheckGroupNum(ctx context.Context) error {
  correct := func() int {
  largeNum := vars.LargeGroupNum
- commonNum := vars.CommonGroupNum * vars.CommonGroupMemberNum
+ commonNum := 0 // cal by userNum
  return largeNum + commonNum
  }()
 
@@ -26,13 +27,27 @@ func CheckGroupNum(ctx context.Context) error {
  return groupNum, nil
  },
  CalCorrectCount: func(userID string) int {
- return correct
+ return correct + calCommonGroup(utils.MustGetUserNum(userID))
  },
  LoopSlice: sdk.TestSDKs,
  GetKey: func(t *sdk.TestSDK) string {
  return t.UserID
  },
  }
 
- return c.Check(ctx)
+ return c.LoopCheck(ctx)
+}
+
+func calCommonGroup(userNum int) int {
+
+ preNum := utils.NextOffsetNum(userNum, -(vars.CommonGroupMemberNum - 1))
+
+ createNum := 0
+ for i := 0; i < vars.CommonGroupMemberNum; i++ {
+ if utils.IsNumLogin(preNum) {
+ createNum++
+ }
+ preNum = utils.NextNum(preNum)
+ }
+ return createNum * vars.CommonGroupNum
 }

integration_test/internal/checker/msg.go

@@ -10,50 +10,41 @@ import (
 
 // CheckMessageNum check message num.
 func CheckMessageNum(ctx context.Context) error {
+ createdLargeGroupNum := vars.LargeGroupNum / vars.LoginUserNum
  corrects := func() [3]int {
  // corrects[0]: super user msg num
  // corrects[1]: common user msg num
  // corrects[2]: create more one large group largest user no + 1
 
- createdLargeGroupNum := vars.LargeGroupNum / vars.UserNum
  // if a user num smaller than remainder, it means this user created more one large group
- remainder := vars.LargeGroupNum % vars.UserNum
+ remainder := vars.LargeGroupNum % vars.LoginUserNum
 
- largeGroupNum := ((vars.UserNum-1)*vars.GroupMessageNum+1)*vars.LargeGroupNum - createdLargeGroupNum
- // Formula:
- // largeGroupNum =
- // // total send message num
- // vars.GroupMessageNum*vars.UserNum*vars.LargeGroupNum +
- // // total create group notification message
- // vars.LargeGroupNum -
- // // self send group message
- // vars.GroupMessageNum*vars.LargeGroupNum -
- // // self create group notification message. Complete the calculation based on user ID in CalCorrectCount.
- // createdLargeGroupNum
+ largeGroupNum :=
+ // total send message num +
+ vars.GroupMessageNum*vars.LoginUserNum*vars.LargeGroupNum +
+ // total create group notification message -
+ vars.LargeGroupNum
+ // self send group message(cal by userID) -
+ // self create group notification message. Complete the calculation based on user ID in CalCorrectCount.
 
- commonGroupNum := (vars.GroupMessageNum + 1) * (vars.CommonGroupNum * (vars.CommonGroupMemberNum - 1))
+ commonGroupNum := 0
+ // self create group notification message
  // Formula:
  // commonGroupNum =
- // // total send group message
- // vars.GroupMessageNum*(vars.CommonGroupMemberNum*vars.CommonGroupNum) +
- // // total create group notification message
- // (vars.CommonGroupMemberNum * vars.CommonGroupNum) -
- // // self send group message
- // vars.GroupMessageNum*vars.CommonGroupNum -
- // // self create group notification message
- // vars.CommonGroupNum
+ // total send group message(cal by userID) +
+ // total create group notification message(cal by userID) -
+ // self send group message(cal by userID) -
+ // self create group notification message(cal by userID)
 
  groupMsgNum := largeGroupNum + commonGroupNum
 
- superUserMsgNum := (vars.UserNum - 1) * vars.SingleMessageNum // send message + become friend message(in CalCorrectCount)
+ superUserMsgNum := 0
  // Formula:
  // superUserMsgNum =
- // // friend send message num
- // (vars.UserNum-1)*vars.GroupMessageNum +
- // // become friend notification message num. it`s number of friends applied for
- // userNum
+ // friend send message num(cal by userID) +
+ // become friend notification message num(cal by userID)
 
- commonUserMsgNum := vars.SuperUserNum * vars.SingleMessageNum
+ commonUserMsgNum := min(vars.LoginUserNum, vars.SuperUserNum) * vars.SingleMessageNum
 
  return [3]int{superUserMsgNum + groupMsgNum, commonUserMsgNum + groupMsgNum, remainder}
  }()
@@ -71,13 +62,48 @@ func CheckMessageNum(ctx context.Context) error {
  },
  CalCorrectCount: func(userID string) int {
  var res int
- useNum := utils.MustGetUserNum(userID)
+ userNum := utils.MustGetUserNum(userID)
  if utils.IsSuperUser(userID) {
- res = corrects[0] + vars.UserNum - 1 - useNum // become friend message
+ res += corrects[0]
+ res += vars.UserNum - 1 - userNum // become friend notification message num
+ if userNum < vars.LoginUserNum {
+ // friend send message num
+ res += vars.SingleMessageNum * (vars.LoginUserNum - 1)
+ // self send large group message
+ res -= vars.GroupMessageNum * vars.LargeGroupNum
+ res -= createdLargeGroupNum
+ } else {
+ // friend send message num
+ res += vars.SingleMessageNum * vars.LoginUserNum
+ // self send large group message
+ res -= 0
+ }
  } else {
- res = corrects[1]
+ res += corrects[1]
+ if userNum < vars.LoginUserNum {
+ // self send large group message
+ res -= vars.GroupMessageNum * vars.LargeGroupNum
+ // self created large group num
+ res -= createdLargeGroupNum
+ } else {
+ // self send large group message
+ res -= 0
+ }
+ }
+
+ // commonGroupNum =
+ // total send group message(cal by userID) +
+ // total create group notification message(cal by userID) -
+ // self send group message(cal by userID) -
+ // self create group notification message(cal by userID)
+ comGroupNum := calCommonGroup(userNum) * (vars.GroupMessageNum + 1)
+ if utils.IsNumLogin(userNum) {
+ comGroupNum -= vars.CommonGroupNum * (vars.GroupMessageNum + 1)
  }
- if useNum < corrects[2] {
+ res += comGroupNum
+
+ // create more one large group
+ if userNum < corrects[2] {
  res--
  }
  return res

integration_test/internal/checker/relation.go

@@ -35,7 +35,7 @@ func CheckLoginUsersFriends(ctx context.Context) error {
  return corrects[1]
  }
  },
- LoopSlice: sdk.TestSDKs,
+ LoopSlice: sdk.TestSDKs[:vars.LoginUserNum],
  GetKey: func(t *sdk.TestSDK) string {
  return t.UserID
  },

integration_test/internal/checker/user.go

@@ -8,12 +8,12 @@ import (
 
 func CheckLoginByRateNum(ctx context.Context) error {
  correct := func() int {
- return vars.LoginEndUserNum
+ return vars.LoginUserNum
  }()
 
  c := &CounterChecker[int, string]{
  CheckName: "checkLoginByRateNum",
- CheckerKeyName: "login",
+ CheckerKeyName: "loginNum",
  GoroutineLimit: config.ErrGroupCommonLimit,
  GetTotalCount: func(ctx context.Context, t int) (int, error) {
  return int(vars.NowLoginNum.Load()), nil
@@ -38,7 +38,7 @@ func CheckAllLoginNum(ctx context.Context) error {
 
  c := &CounterChecker[int, string]{
  CheckName: "checkLoginByRateNum",
- CheckerKeyName: "login",
+ CheckerKeyName: "loginNum",
  GoroutineLimit: config.ErrGroupCommonLimit,
  GetTotalCount: func(ctx context.Context, t int) (int, error) {
  return int(vars.NowLoginNum.Load()), nil

integration_test/internal/config/config.go

@@ -9,12 +9,12 @@ const (
  TestIP = "127.0.0.1"
  APIAddr = "http://" + TestIP + ":10002"
  WsAddr = "ws://" + TestIP + ":10001"
+ AdminUserID = "imAdmin"
  Secret = "openIM123"
- PlatformID = constant.WindowsPlatformID
- LogLevel = 5
+ PlatformID = constant.AndroidPlatformID
+ LogLevel = 3
  DataDir = "./data/"
  LogFilePath = "./logs/"
- AdminUserID = "imAdmin"
  IsLogStandardOutput = false
 )
 

integration_test/internal/config/limit.go

@@ -5,18 +5,22 @@ const (
 )
 
 const (
- ErrGroupSmallLimit = 1  // max goroutine of a small error group
- ErrGroupMiddleSmallLimit = 5  // max goroutine of a middle small error group
+ ErrGroupSmallLimit = 20 // max goroutine of a small error group
+ ErrGroupMiddleSmallLimit = 50 // max goroutine of a middle small error group
  ErrGroupCommonLimit = 100 // max goroutine of a common error group
 )
 
 const (
- SleepSec = 30
- CheckWaitSec = 5 // check wait sec
- ProgressWaitSec = 1 // progress bar update wait sec
+ SleepSec  = 30
+ CheckWaitSec  = 5 // check wait sec
+ BarRemoveWaiteSec = 1 // progress bar remove wait second
 )
 
 const (
- CheckMsgRate = 0.1 // Sampling and statistical message ratio. Max check message is MaxCheckMsg
- MaxCheckMsg = 1e+5
+ CheckMsgRate = 1 // Sampling and statistical message ratio. Max check message is MaxCheckMsg
+ MaxCheckMsg = 1e+8
+)
+
+const (
+ ApiParamLength = 1000
 )