From fd3706717495ee447381c4c171d9f822923d0b1a Mon Sep 17 00:00:00 2001 From: andronache Date: Thu, 4 Mar 2021 12:08:52 +0200 Subject: [PATCH] Refactored tests in services/datadb_it_test.go --- ers/ers_it_test.go | 30 ------------------------------ ers/kafka_it_test.go | 15 +++++++++++++-- registrarc/registrarc_test.go | 1 - services/datadb_it_test.go | 19 +++---------------- 4 files changed, 16 insertions(+), 49 deletions(-) diff --git a/ers/ers_it_test.go b/ers/ers_it_test.go index 03540a6d6..40d135c2d 100644 --- a/ers/ers_it_test.go +++ b/ers/ers_it_test.go @@ -736,33 +736,3 @@ func TestERsProcessEvent11(t *testing.T) { t.Fatalf("\nExpecting <%+v>,\n Received <%+v>", "MANDATORY_IE_MISSING: [connIDs]", err) } } - -func TestERsProcessEvent12(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - cfg.ERsCfg().Readers = []*config.EventReaderCfg{ - { - ID: "test", - Type: utils.MetaNone, - }, - } - cfg.ERsCfg().SessionSConns = []string{rpcclient.InternalRPC} - fltrS := &engine.FilterS{} - rpcInt := map[string]chan rpcclient.ClientConnector{} - connMang := engine.NewConnManager(cfg, rpcInt) - srv := NewERService(cfg, fltrS, connMang) - - rdrCfg := &config.EventReaderCfg{ - Flags: map[string]utils.FlagParams{ - utils.MetaMessage: map[string][]string{}, - }, - } - cgrEvent := &utils.CGREvent{ - Opts: map[string]interface{}{ - utils.OptsRoutesLimit: true, - }, - } - err := srv.processEvent(cgrEvent, rdrCfg) - if err == nil || err.Error() != "UNSUPPORTED_SERVICE_METHOD" { - t.Fatalf("\nExpecting <%+v>,\n Received <%+v>", "UNSUPPORTED_SERVICE_METHOD", err) - } -} diff --git a/ers/kafka_it_test.go b/ers/kafka_it_test.go index 9948ea566..6c710f587 100644 --- a/ers/kafka_it_test.go +++ b/ers/kafka_it_test.go @@ -20,6 +20,19 @@ along with this program. If not, see package ers +import ( + "context" + "fmt" + "reflect" + "testing" + "time" + + "github.com/cgrates/cgrates/config" + "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/utils" + kafka "github.com/segmentio/kafka-go" +) + var ( rdrEvents chan *erEvent rdrErr chan error @@ -27,7 +40,6 @@ var ( rdr EventReader ) -/* func TestKafkaER(t *testing.T) { cfg, err := config.NewCGRConfigFromJSONStringWithDefaults(`{ "ers": { // EventReaderService @@ -103,4 +115,3 @@ func TestKafkaER(t *testing.T) { } close(rdrExit) } -*/ diff --git a/registrarc/registrarc_test.go b/registrarc/registrarc_test.go index 5165b8cb6..5000ad147 100644 --- a/registrarc/registrarc_test.go +++ b/registrarc/registrarc_test.go @@ -148,5 +148,4 @@ func TestRegistrarcShutdown(t *testing.T) { cfg.RegistrarCCfg().RPC.Enabled = true regStSrv := NewRegistrarCService(cfg, nil) regStSrv.Shutdown() - } diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index fd8fca635..c4a174998 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -553,27 +553,14 @@ func TestDataDBReloadVersion(t *testing.T) { utils.Logger.SetLogLevel(7) shdChan := utils.NewSyncedChan() - shdWg := new(sync.WaitGroup) - chS := engine.NewCacheS(cfg, nil, nil) filterSChan := make(chan *engine.FilterS, 1) filterSChan <- nil - close(chS.GetPrecacheChannel(utils.CacheAttributeProfiles)) - close(chS.GetPrecacheChannel(utils.CacheAttributeFilterIndexes)) - server := cores.NewServer(nil) srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} - srvMngr := servmanager.NewServiceManager(cfg, shdChan, shdWg) cM := engine.NewConnManager(cfg, nil) db := NewDataDBService(cfg, cM, srvDep) - anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) - srvMngr.AddServices(NewAttributeService(cfg, db, - chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), anz, srvDep), - NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz, srvDep), db) - srvMngr.StartServices() - <-shdChan.Done() - db.dm = nil - err = db.Reload() - if err == nil || err.Error() != "can't conver DataDB of type mongo to MongoStorage" { - t.Fatal(err) + err = db.Start() + if err == nil || err.Error() != "Migration needed: please backup cgr data and run : " { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", "Migration needed: please backup cgr data and run : ", err) } shdChan.CloseOnce() time.Sleep(10 * time.Millisecond)