Updated unit tests

This commit is contained in:
Trial97
2021-04-13 10:08:37 +03:00
committed by Dan Christian Bogos
parent 8aa7009d36
commit edd276c412
4 changed files with 12 additions and 12 deletions

View File

@@ -27,12 +27,12 @@ import (
"testing"
"time"
"github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/rates"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/rpcclient"
"github.com/ericlagergren/decimal"
)
@@ -1212,9 +1212,9 @@ func TestV1DebitAbstractsEventCharges(t *testing.T) {
dm := engine.NewDataManager(data, cfg.CacheCfg(), nil)
fltrS := engine.NewFilterS(cfg, nil, dm)
// Set the internal rateS within connMngr
rateSConn := make(chan rpcclient.ClientConnector, 1)
rateSConn := make(chan birpc.ClientConnector, 1)
rateSConn <- rates.NewRateS(cfg, fltrS, dm)
connMngr := engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{
connMngr := engine.NewConnManager(cfg, map[string]chan birpc.ClientConnector{
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRateS): rateSConn,
})
cfg.AccountSCfg().RateSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRateS)}

View File

@@ -119,8 +119,8 @@ func TestACExecuteAccountsRemBalance(t *testing.T) {
func TestACExecuteAccountsParseError(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.ActionSCfg().AccountSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAccounts)}
internalChan := make(chan rpcclient.ClientConnector, 1)
connMngr := engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{
internalChan := make(chan birpc.ClientConnector, 1)
connMngr := engine.NewConnManager(cfg, map[string]chan birpc.ClientConnector{
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAccounts): internalChan,
})
apAction := &engine.APAction{

View File

@@ -324,7 +324,7 @@ func (sma *AsteriskAgent) handleChannelDestroyed(ev *SMAsteriskEvent) {
}
// Call implements rpcclient.ClientConnector interface
// Call implements birpc.ClientConnector interface
func (sma *AsteriskAgent) Call(ctx *context.Context, serviceMethod string, args interface{}, reply interface{}) error {
return utils.RPCCall(sma, serviceMethod, args, reply)
}

View File

@@ -25,8 +25,8 @@ import (
"testing"
"time"
"github.com/cgrates/rpcclient"
"github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/utils"
"github.com/cgrates/cgrates/config"
@@ -4477,7 +4477,7 @@ func TestBiRPCv1GetCost(t *testing.T) {
type mkCall struct{}
func (sT *mkCall) Call(method string, arg interface{}, rply interface{}) error {
func (sT *mkCall) Call(ctx *context.Context, method string, arg interface{}, rply interface{}) error {
if arg.(*utils.DPRArgs).OriginHost != "cgrates" {
return utils.ErrNoActiveSession
}
@@ -4531,7 +4531,7 @@ func TestBiRPCv1DisconnectPeer(t *testing.T) {
type mkCallForces struct{}
func (sT *mkCallForces) Call(method string, arg interface{}, rply interface{}) error {
func (sT *mkCallForces) Call(ctx *context.Context, method string, arg interface{}, rply interface{}) error {
return utils.ErrNoActiveSession
}
@@ -4604,10 +4604,10 @@ func TestBiRPCv1ForceDisconnect(t *testing.T) {
}
testMk := &mkCallForces{}
clntConn := make(chan rpcclient.ClientConnector, 1)
clntConn := make(chan birpc.ClientConnector, 1)
clntConn <- testMk
sessions.cgrCfg.SessionSCfg().ResSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources)}
connMngr := engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{
connMngr := engine.NewConnManager(cfg, map[string]chan birpc.ClientConnector{
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources): clntConn,
})
sessions.connMgr = connMngr