uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-20 06:38:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Resolved unit tests

Browse Source
This commit is contained in:
andronache98
2022-03-07 19:26:40 +02:00
committed by Dan Christian Bogos
parent 928dbd9e42
commit 9a4da75210
9 changed files with 125 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
config/accountscfg.go
View File

@@ -1,17 +1,14 @@
/*
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
Copyright (C) ITsysCOM GmbH
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
@@ -139,11 +136,17 @@ func (acS *AccountSCfg) loadFromJSONCfg(jsnCfg *AccountSJsonCfg) (err error) {
// AsMapInterface returns the config as a map[string]interface{}
func (acS AccountSCfg) AsMapInterface(string) interface{} {
opts := map[string]interface{}{
utils.MetaProfileIDs: acS.Opts.ProfileIDs,
utils.MetaUsage: acS.Opts.Usage,
utils.MetaProfileIgnoreFilters: acS.Opts.ProfileIgnoreFilters,
}
mp := map[string]interface{}{
utils.EnabledCfg: acS.Enabled,
utils.IndexedSelectsCfg: acS.IndexedSelects,
utils.NestedFieldsCfg: acS.NestedFields,
utils.MaxIterations: acS.MaxIterations,
utils.OptsCfg: opts,
}
if acS.AttributeSConns != nil {
mp[utils.AttributeSConnsCfg] = getInternalJSONConns(acS.AttributeSConns)
@@ -154,6 +157,21 @@ func (acS AccountSCfg) AsMapInterface(string) interface{} {
if acS.ThresholdSConns != nil {
mp[utils.ThresholdSConnsCfg] = getInternalJSONConns(acS.ThresholdSConns)
}
if acS.StringIndexedFields != nil {
mp[utils.StringIndexedFieldsCfg] = utils.CloneStringSlice(*acS.StringIndexedFields)
}
if acS.PrefixIndexedFields != nil {
mp[utils.PrefixIndexedFieldsCfg] = utils.CloneStringSlice(*acS.PrefixIndexedFields)
}
if acS.SuffixIndexedFields != nil {
mp[utils.SuffixIndexedFieldsCfg] = utils.CloneStringSlice(*acS.SuffixIndexedFields)
}
if acS.ExistsIndexedFields != nil {
mp[utils.ExistsIndexedFieldsCfg] = utils.CloneStringSlice(*acS.ExistsIndexedFields)
}
if acS.NotExistsIndexedFields != nil {
mp[utils.NotExistsIndexedFieldsCfg] = utils.CloneStringSlice(*acS.NotExistsIndexedFields)
}
if acS.MaxUsage != nil {
mp[utils.MaxUsage] = acS.MaxUsage.String()
}

2
config/cdrscfg_test.go
View File

@@ -190,7 +190,6 @@ func TestCdrsCfgAsMapInterface(t *testing.T) {
eMap := map[string]interface{}{
utils.EnabledCfg: true,
utils.ExtraFieldsCfg: []string{"~*req.PayPalAccount", "~*req.LCRProfile", "~*req.ResourceID"},
utils.StoreCdrsCfg: true,
utils.SessionCostRetires: 5,
utils.ChargerSConnsCfg: []string{utils.MetaInternal, "*conn1"},
utils.AttributeSConnsCfg: []string{utils.MetaInternal, "*conn1"},
@@ -230,7 +229,6 @@ func TestCdrsCfgAsMapInterface2(t *testing.T) {
eMap := map[string]interface{}{
utils.EnabledCfg: true,
utils.ExtraFieldsCfg: []string{},
utils.StoreCdrsCfg: true,
utils.SessionCostRetires: 5,
utils.ChargerSConnsCfg: []string{"conn1", "conn2"},
utils.AttributeSConnsCfg: []string{"*internal"},

12
config/config_test.go
View File

File diff suppressed because one or more lines are too long

276
engine/cdrs_test.go
View File

@@ -32,21 +32,19 @@ import (
)
func TestCDRsNewCDRServer(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
expected := &CDRServer{
cfg: cfg,
dm: dm,
guard: guardian.Guardian,
fltrS: fltrs,
connMgr: connMng,
storDBChan: storDBChan,
cfg: cfg,
dm: dm,
guard: guardian.Guardian,
fltrS: fltrs,
connMgr: connMng,
}
if !reflect.DeepEqual(newCDRSrv, expected) {
t.Errorf("\nExpected <%+v> \n, received <%+v>", expected, newCDRSrv)
@@ -54,14 +52,13 @@ func TestCDRsNewCDRServer(t *testing.T) {
}
func TestCDRsChrgrSProcessEventErrMsnConnIDs(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
@@ -87,14 +84,11 @@ func TestCDRsChrgrSProcessEventErrMsnConnIDs(t *testing.T) {
}
func TestCDRsAttrSProcessEventNoOpts(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
@@ -116,14 +110,13 @@ func TestCDRsAttrSProcessEventNoOpts(t *testing.T) {
}
func TestCDRsAttrSProcessEvent(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
@@ -148,14 +141,13 @@ func TestCDRsAttrSProcessEvent(t *testing.T) {
}
func TestCDRsRateSCostForEventErr(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
@@ -180,14 +172,13 @@ func TestCDRsRateSCostForEventErr(t *testing.T) {
}
func TestCDRsAccountSDebitEventErr(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
@@ -212,14 +203,13 @@ func TestCDRsAccountSDebitEventErr(t *testing.T) {
}
func TestCDRsThdSProcessEventErr(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
@@ -242,14 +232,13 @@ func TestCDRsThdSProcessEventErr(t *testing.T) {
}
func TestCDRsStatSProcessEventErrMsnConnIDs(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
@@ -275,14 +264,13 @@ func TestCDRsStatSProcessEventErrMsnConnIDs(t *testing.T) {
}
func TestCDRsEESProcessEventErrMsnConnIDs(t *testing.T) {
var sent StorDB
cfg := config.NewDefaultCGRConfig()
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
dm := &DataManager{}
fltrs := &FilterS{}
connMng := &ConnManager{}
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
cgrEv := &utils.CGREventWithEeIDs{
CGREvent: &utils.CGREvent{
@@ -338,18 +326,16 @@ func TestCDRsAttrSProcessEventMock(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaAttributes)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.AttributeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -417,18 +403,16 @@ func TestCDRsAttrSProcessEventMockNotFoundErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaAttributes)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.AttributeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -498,18 +482,16 @@ func TestCDRsAttrSProcessEventMockNotEmptyAF(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaAttributes)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.AttributeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -598,17 +580,16 @@ func TestCDRsChrgrSProcessEvent(t *testing.T) {
config.SetCgrConfig(tmpC)
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().ChargerSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaChargers)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.ChargerSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -666,18 +647,16 @@ func TestCDRsRateProcessEventMock(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().RateSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaRateS)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.RateSv1CostForEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -744,18 +723,16 @@ func TestCDRsAccountProcessEventMock(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().AccountSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaAccounts)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.AccountSv1DebitAbstracts: func(ctx *context.Context, args, reply interface{}) error {
@@ -824,18 +801,16 @@ func TestCDRsThdSProcessEventMock(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaThresholds)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.ThresholdSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -896,18 +871,16 @@ func TestCDRsThdSProcessEventMockNotfound(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaThresholds)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.ThresholdSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -967,18 +940,16 @@ func TestCDRsStatSProcessEventMock(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().StatSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaStats)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.StatSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1039,18 +1010,16 @@ func TestCDRsEESProcessEventMock(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1115,18 +1084,16 @@ func TestCDRsProcessEventMock(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1187,18 +1154,16 @@ func TestCDRsProcessEventMockSkipOpts(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1273,7 +1238,6 @@ func TestCDRsProcessEventMockAttrsErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1282,14 +1246,13 @@ func TestCDRsProcessEventMockAttrsErr(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1336,7 +1299,6 @@ func TestCDRsProcessEventMockAttrsErrBoolOpts(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1345,14 +1307,13 @@ func TestCDRsProcessEventMockAttrsErrBoolOpts(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1399,7 +1360,6 @@ func TestCDRsProcessEventMockChrgsErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1408,14 +1368,13 @@ func TestCDRsProcessEventMockChrgsErr(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1463,7 +1422,6 @@ func TestCDRsProcessEventMockChrgsErrBoolOpts(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1472,14 +1430,13 @@ func TestCDRsProcessEventMockChrgsErrBoolOpts(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1527,7 +1484,6 @@ func TestCDRsProcessEventMockRateSErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1536,14 +1492,13 @@ func TestCDRsProcessEventMockRateSErr(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1591,7 +1546,6 @@ func TestCDRsProcessEventMockRateSErrBoolOpts(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1600,14 +1554,13 @@ func TestCDRsProcessEventMockRateSErrBoolOpts(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1655,7 +1608,6 @@ func TestCDRsProcessEventMockAcntsErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1664,14 +1616,13 @@ func TestCDRsProcessEventMockAcntsErr(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1719,7 +1670,6 @@ func TestCDRsProcessEventMockAcntsErrBoolOpts(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1728,14 +1678,13 @@ func TestCDRsProcessEventMockAcntsErrBoolOpts(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1783,7 +1732,6 @@ func TestCDRsProcessEventMockExportErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1793,14 +1741,13 @@ func TestCDRsProcessEventMockExportErr(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1848,7 +1795,6 @@ func TestCDRsProcessEventMockExportErrBoolOpts(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1857,14 +1803,13 @@ func TestCDRsProcessEventMockExportErrBoolOpts(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1912,7 +1857,6 @@ func TestCDRsProcessEventMockThdsErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1921,14 +1865,13 @@ func TestCDRsProcessEventMockThdsErr(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -1976,7 +1919,6 @@ func TestCDRsProcessEventMockThdsErrBoolOpts(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -1985,14 +1927,13 @@ func TestCDRsProcessEventMockThdsErrBoolOpts(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2040,7 +1981,6 @@ func TestCDRsProcessEventMockStatsErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -2049,14 +1989,13 @@ func TestCDRsProcessEventMockStatsErr(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2104,7 +2043,6 @@ func TestCDRsProcessEventMockStatsErrGetBoolOpts(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
@@ -2113,14 +2051,13 @@ func TestCDRsProcessEventMockStatsErrGetBoolOpts(t *testing.T) {
Value: false,
},
}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2168,18 +2105,16 @@ func TestCDRsV1ProcessEventMock(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2246,18 +2181,16 @@ func TestCDRsV1ProcessEventMockErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2327,18 +2260,16 @@ func TestCDRsV1ProcessEventMockCache(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2410,18 +2341,16 @@ func TestCDRsV1ProcessEventWithGetMockCache(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2492,18 +2421,16 @@ func TestCDRsV1ProcessEventWithGetMockCacheErr(t *testing.T) {
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().EEsConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaEEs)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.EeSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2556,18 +2483,17 @@ func TestCDRsChrgrSProcessEventEmptyChrgrs(t *testing.T) {
config.SetCgrConfig(tmpC)
connMgr = tmpCM
}()
var sent StorDB
cfg := config.NewDefaultCGRConfig()
cfg.CdrsCfg().ChargerSConns = []string{utils.ConcatenatedKey(utils.MetaInternal,
utils.MetaChargers)}
storDBChan := make(chan StorDB, 1)
storDBChan <- sent
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
connMng := NewConnManager(cfg)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, connMng)
ccM := &ccMock{
calls: map[string]func(ctx *context.Context, args interface{}, reply interface{}) error{
utils.ChargerSv1ProcessEvent: func(ctx *context.Context, args, reply interface{}) error {
@@ -2615,13 +2541,12 @@ func TestCDRsV1ProcessEventCacheGet(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 1
storDBChan := make(chan StorDB, 1)
storDBChan <- nil
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, nil)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
ID: "testID",
@@ -2663,13 +2588,12 @@ func TestCDRsV1ProcessEventWithGetCacheGet(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.CacheCfg().Partitions[utils.CacheRPCResponses].Limit = 1
storDBChan := make(chan StorDB, 1)
storDBChan <- nil
data := NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := NewDataManager(data, cfg.CacheCfg(), nil)
fltrs := NewFilterS(cfg, nil, dm)
Cache = NewCacheS(cfg, dm, nil)
newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, nil)
newCDRSrv := NewCDRServer(cfg, dm, fltrs, nil)
cgrEv := &utils.CGREvent{
Tenant: "cgrates.org",
ID: "testID",

29
engine/version_test.go
View File

@@ -32,32 +32,11 @@ func TestVersionCompare(t *testing.T) {
y := Versions{utils.Accounts: 1, utils.Actions: 2,
utils.Attributes: 2, utils.Chargers: 2,
utils.CostDetails: 2}
c := Versions{utils.CostDetails: 1}
a := Versions{utils.Accounts: 2, utils.Actions: 2,
utils.Attributes: 2, utils.Chargers: 2,
utils.CostDetails: 2,
utils.SessionSCosts: 1}
b := Versions{utils.Accounts: 2, utils.Actions: 2,
utils.Attributes: 2, utils.Chargers: 2,
utils.CostDetails: 2,
utils.SessionSCosts: 2}
message1 := y.Compare(x, utils.Mongo, true)
if message1 != "cgr-migrator -exec=*accounts" {
t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*accounts", message1)
}
message4 := c.Compare(x, utils.Mongo, false)
if message4 != "cgr-migrator -exec=*cost_details" {
t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*cost_details", message4)
}
message5 := a.Compare(b, utils.MySQL, false)
if message5 != "cgr-migrator -exec=*sessions_costs" {
t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*sessions_costs", message5)
}
message6 := a.Compare(b, utils.Postgres, false)
if message6 != "cgr-migrator -exec=*sessions_costs" {
t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*sessions_costs", message6)
}
message7 := y.Compare(x, utils.Redis, true)
if message7 != "cgr-migrator -exec=*accounts" {
t.Errorf("Error failed to compare to curent version expected: %s received: %s", "cgr-migrator -exec=*accounts", message7)
@@ -92,14 +71,6 @@ func TestCurrentDBVersions(t *testing.T) {
t.Errorf("Expectred %+v, received %+v", expVersDataDB, vrs)
}
if vrs := CurrentDBVersions(utils.Mongo, false); !reflect.DeepEqual(expVersStorDB, vrs) {
t.Errorf("Expectred %+v, received %+v", expVersStorDB, vrs)
}
if vrs := CurrentDBVersions(utils.Postgres, false); !reflect.DeepEqual(expVersStorDB, vrs) {
t.Errorf("Expectred %+v, received %+v", expVersStorDB, vrs)
}
if vrs := CurrentDBVersions(utils.Redis, true); !reflect.DeepEqual(expVersDataDB, vrs) {
t.Errorf("Expectred %+v, received %+v", expVersDataDB, vrs)
}

6
rates/rates_test.go
View File

@@ -1082,11 +1082,7 @@ func TestCDRProcessRatesCostForEvent(t *testing.T) {
data := engine.NewInternalDB(nil, nil, cfg.DataDbCfg().Items)
dm := engine.NewDataManager(data, cfg.CacheCfg(), connMgr)
filters := engine.NewFilterS(cfg, connMgr, dm)
storDBChan := make(chan engine.StorDB, 1)
storDBChan <- new(engine.InternalDB)
cdrs := engine.NewCDRServer(cfg, storDBChan, dm, filters, connMgr)
cdrs := engine.NewCDRServer(cfg, dm, filters, connMgr)
ratesConns := make(chan birpc.ClientConnector, 1)
rateSrv, err := birpc.NewServiceWithMethodsRename(NewRateS(cfg, filters, dm), utils.RateSv1, true, func(key string) (newKey string) {
return strings.TrimPrefix(key, utils.V1Prfx)

1
services/sessions_test.go
View File

@@ -50,7 +50,6 @@ func TestSessionSCoverage(t *testing.T) {
server := cores.NewServer(nil)
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
db := NewDataDBService(cfg, nil, srvDep)
cfg.StorDbCfg().Type = utils.Internal
anz := NewAnalyzerService(cfg, server, filterSChan, make(chan birpc.ClientConnector, 1), srvDep)
srv := NewSessionService(cfg, db, nil, server, make(chan birpc.ClientConnector, 1), nil, anz, srvDep)
engine.NewConnManager(cfg)

62
services/stordb_test.go
View File

@@ -1,62 +0,0 @@
/*
Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments
Copyright (C) ITsysCOM GmbH
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package services
import (
"reflect"
"sync"
"testing"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/engine"
"github.com/cgrates/cgrates/utils"
)
//TestStorDBServiceCoverage for cover testing
func TestStorDBServiceCoverage(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)}
srv := NewStorDBService(cfg, srvDep)
if srv.IsRunning() {
t.Errorf("Expected service to be down")
}
srv.db = engine.NewInternalDB([]string{"test"}, []string{"test2"}, cfg.StorDbCfg().Items)
if !srv.IsRunning() {
t.Errorf("Expected service to be running")
}
srv.oldDBCfg = &config.StorDbCfg{
Type: utils.Internal,
Host: "test_host",
Port: "test_port",
Name: "test_name",
User: "test_user",
Password: "test_pass",
}
serviceName := srv.ServiceName()
if !reflect.DeepEqual(serviceName, utils.StorDB) {
t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.StorDB, serviceName)
}
shouldRun := srv.ShouldRun()
if !reflect.DeepEqual(shouldRun, false) {
t.Errorf("\nExpecting <false>,\n Received <%+v>", shouldRun)
}
srv.Shutdown()
if srv.IsRunning() {
t.Errorf("Expected service to be down")
}
}

6
utils/consts.go
View File

@@ -1651,11 +1651,6 @@ const (
CacheVersions = "*versions"
CacheCapsEvents = "*caps_events"
CacheReplicationHosts = "*replication_hosts"
// storDB
CacheSessionCostsTBL = "*session_costs"
CacheCDRsTBL = "*cdrs"
)
// Prefix for indexing
@@ -1724,7 +1719,6 @@ const (
DecimalRoundingModeCfg = "decimal_rounding_mode"
)
// StorDbCfg
const (
TypeCfg = "type"
SQLMaxOpenConnsCfg = "sqlMaxOpenConns"