diff --git a/services/actions_test.go b/services/actions_test.go deleted file mode 100644 index a8ec9cc9e..000000000 --- a/services/actions_test.go +++ /dev/null @@ -1,98 +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 -*/ -package services - -import ( - "reflect" - "sync" - "testing" - - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/cores" - "github.com/cgrates/cgrates/engine" - "github.com/cgrates/cgrates/utils" - "github.com/cgrates/rpcclient" -) - -func TestNewActionService(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) - utils.Logger.SetLogLevel(7) - shdChan := utils.NewSyncedChan() - chS := engine.NewCacheS(cfg, nil, nil) - filterSChan := make(chan *engine.FilterS, 1) - filterSChan <- nil - close(chS.GetPrecacheChannel(utils.CacheActionProfiles)) - close(chS.GetPrecacheChannel(utils.CacheActionProfilesFilterIndexes)) - server := cores.NewServer(nil) - srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} - db := NewDataDBService(cfg, nil, srvDep) - actRPC := make(chan rpcclient.ClientConnector, 1) - anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) - actS := NewActionService(cfg, db, - chS, filterSChan, server, actRPC, - anz, srvDep) - expected := &ActionService{ - connChan: actRPC, - cfg: cfg, - dm: db, - cacheS: chS, - filterSChan: filterSChan, - server: server, - anz: anz, - srvDep: srvDep, - rldChan: make(chan struct{}), - } - if !reflect.DeepEqual(utils.ToJSON(actS), utils.ToJSON(expected)) { - t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ToJSON(expected), utils.ToJSON(actS)) - } -} - -func TestActionSNotRunning(t *testing.T) { - cfg := config.NewDefaultCGRConfig() - utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) - utils.Logger.SetLogLevel(7) - shdChan := utils.NewSyncedChan() - chS := engine.NewCacheS(cfg, nil, nil) - filterSChan := make(chan *engine.FilterS, 1) - filterSChan <- nil - close(chS.GetPrecacheChannel(utils.CacheActionProfiles)) - close(chS.GetPrecacheChannel(utils.CacheActionProfilesFilterIndexes)) - server := cores.NewServer(nil) - srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} - db := NewDataDBService(cfg, nil, srvDep) - actRPC := make(chan rpcclient.ClientConnector, 1) - anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) - actS := NewActionService(cfg, db, - chS, filterSChan, server, actRPC, - anz, srvDep) - if actS.IsRunning() { - t.Errorf("Expected service to be down") - } - if db.IsRunning() { - t.Errorf("Expected service to be down") - } - serviceName := actS.ServiceName() - if !reflect.DeepEqual(serviceName, utils.ActionS) { - t.Errorf("\nExpecting ,\n Received <%+v>", serviceName) - } - shouldRun := actS.ShouldRun() - if !reflect.DeepEqual(shouldRun, false) { - t.Errorf("\nExpecting ,\n Received <%+v>", shouldRun) - } -} diff --git a/services/apiers_it_test.go b/services/apiers_it_test.go index a668831ad..1e1043f77 100644 --- a/services/apiers_it_test.go +++ b/services/apiers_it_test.go @@ -105,6 +105,7 @@ func TestApiersReload(t *testing.T) { if !stordb.IsRunning() { t.Errorf("Expected service to be running") } + err := apiSv1.Start() if err == nil || err != utils.ErrServiceAlreadyRunning { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index 15948b1fe..2c41c78b8 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -77,6 +77,10 @@ func TestDataDBReload(t *testing.T) { if !db.IsRunning() { t.Errorf("Expected service to be running") } + getDm := db.GetDM() + if !reflect.DeepEqual(getDm, db.dm) { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", db.dm, getDm) + } oldcfg := &config.DataDbCfg{ DataDbType: utils.MONGO, DataDbHost: "127.0.0.1", diff --git a/services/dispatcherh_it_test.go b/services/dispatcherh_it_test.go new file mode 100644 index 000000000..0882fc6ba --- /dev/null +++ b/services/dispatcherh_it_test.go @@ -0,0 +1,78 @@ +// +build integration + +/* +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 +*/ +package services + +import ( + "reflect" + "sync" + "testing" + + "github.com/cgrates/cgrates/dispatcherh" + + "github.com/cgrates/cgrates/config" + "github.com/cgrates/cgrates/cores" + "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/utils" + "github.com/cgrates/rpcclient" +) + +//TestDispatcherCoverage for cover testing +func TestDispatcherHCoverage(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + shdChan := utils.NewSyncedChan() + filterSChan := make(chan *engine.FilterS, 1) + filterSChan <- nil + server := cores.NewServer(nil) + srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} + anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, make(chan rpcclient.ClientConnector, 1), srvDep) + rpcInternal := map[string]chan rpcclient.ClientConnector{} + cM := engine.NewConnManager(cfg, rpcInternal) + srv := NewDispatcherHostsService(cfg, server, cM, anz, srvDep) + if srv == nil { + t.Errorf("\nExpecting ,\n Received <%+v>", utils.ToJSON(srv)) + } + srv2 := &DispatcherHostsService{ + cfg: cfg, + server: server, + connMgr: cM, + anz: anz, + srvDep: srvDep, + } + if srv2.IsRunning() { + t.Errorf("Expected service to be down") + } + srv2.dspS = &dispatcherh.DispatcherHostsService{} + if !srv2.IsRunning() { + t.Errorf("Expected service to be running") + } + err := srv2.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + rld := srv2.Reload() + if rld != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", rld) + } + serviceName := srv2.ServiceName() + if !reflect.DeepEqual(serviceName, utils.DispatcherH) { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.DispatcherH, serviceName) + } + shouldRun := srv2.ShouldRun() + if !reflect.DeepEqual(shouldRun, false) { + t.Errorf("\nExpecting ,\n Received <%+v>", shouldRun) + } +}