From 23bca828235238a3dbfebbdbb1605b307e20540a Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Wed, 30 Jun 2021 09:42:29 +0300 Subject: [PATCH] Fxied cores tests --- cores/core_test.go | 15 +++++++++++---- services/cores_it_test.go | 2 +- services/cores_test.go | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/cores/core_test.go b/cores/core_test.go index d300210f8..20ac4ec47 100644 --- a/cores/core_test.go +++ b/cores/core_test.go @@ -21,6 +21,7 @@ package cores import ( "reflect" "runtime" + "sync" "testing" "time" @@ -35,12 +36,18 @@ func TestNewCoreService(t *testing.T) { stopchan := make(chan struct{}, 1) caps := engine.NewCaps(1, utils.MetaBusy) sts := engine.NewCapsStats(cfgDflt.CoreSCfg().CapsStatsInterval, caps, stopchan) + shdWg := new(sync.WaitGroup) + shdChan := utils.NewSyncedChan() + stopMemPrf := make(chan struct{}) expected := &CoreService{ - cfg: cfgDflt, - CapsStats: sts, + shdWg: shdWg, + shdChan: shdChan, + stopMemPrf: stopMemPrf, + cfg: cfgDflt, + CapsStats: sts, } - rcv := NewCoreService(cfgDflt, caps, nil, stopchan) + rcv := NewCoreService(cfgDflt, caps, nil, stopchan, shdWg, stopMemPrf, shdChan) if !reflect.DeepEqual(expected, rcv) { t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(rcv)) } @@ -55,7 +62,7 @@ func TestCoreServiceStatus(t *testing.T) { caps := engine.NewCaps(1, utils.MetaBusy) stopChan := make(chan struct{}, 1) - cores := NewCoreService(cfgDflt, caps, nil, stopChan) + cores := NewCoreService(cfgDflt, caps, nil, stopChan, nil, nil, nil) args := &utils.TenantWithAPIOpts{ Tenant: "cgrates.org", APIOpts: map[string]interface{}{}, diff --git a/services/cores_it_test.go b/services/cores_it_test.go index a25b7edcb..677f2d874 100644 --- a/services/cores_it_test.go +++ b/services/cores_it_test.go @@ -51,7 +51,7 @@ func TestCoreSReload(t *testing.T) { coreRPC := make(chan rpcclient.ClientConnector, 1) anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) caps := engine.NewCaps(1, "test_caps") - coreS := NewCoreService(cfg, caps, server, coreRPC, anz, nil, srvDep) + coreS := NewCoreService(cfg, caps, server, coreRPC, anz, nil, nil, nil, nil, srvDep) engine.NewConnManager(cfg, nil) srvMngr.AddServices(coreS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db) diff --git a/services/cores_test.go b/services/cores_test.go index c2f1422ac..feca6127d 100644 --- a/services/cores_test.go +++ b/services/cores_test.go @@ -41,7 +41,7 @@ func TestCoreSCoverage(t *testing.T) { srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) srv := NewCoreService(cfg, caps, server, - internalCoreSChan, anz, nil, srvDep) + internalCoreSChan, anz, nil, nil, nil, nil, srvDep) if srv == nil { t.Errorf("\nExpecting ,\n Received <%+v>", utils.ToJSON(srv)) }