From 94a7ec68fd39463ee7b2ae3529f393f5173f0544 Mon Sep 17 00:00:00 2001 From: andronache Date: Wed, 16 Dec 2020 17:02:18 +0200 Subject: [PATCH] Continuing tests in services --- services/actions_it_test.go | 2 +- services/analyzers_it_test.go | 56 +++++++++++++++-------------------- services/apiers_it_test.go | 24 +++++++++++++++ 3 files changed, 49 insertions(+), 33 deletions(-) diff --git a/services/actions_it_test.go b/services/actions_it_test.go index 35f8e845f..962b97398 100644 --- a/services/actions_it_test.go +++ b/services/actions_it_test.go @@ -73,7 +73,6 @@ func TestActionSCoverage(t *testing.T) { if !actS2.IsRunning() { t.Errorf("Expected service to be running") } - serviceName := actS2.ServiceName() if !reflect.DeepEqual(serviceName, utils.ActionS) { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ActionS, serviceName) @@ -82,4 +81,5 @@ func TestActionSCoverage(t *testing.T) { if !reflect.DeepEqual(shouldRun, false) { t.Errorf("\nExpecting ,\n Received <%+v>", shouldRun) } + } diff --git a/services/analyzers_it_test.go b/services/analyzers_it_test.go index dc7ac9ea5..79f93bcd9 100644 --- a/services/analyzers_it_test.go +++ b/services/analyzers_it_test.go @@ -24,6 +24,8 @@ import ( "sync" "testing" + "github.com/cgrates/cgrates/analyzers" + "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/cores" "github.com/cgrates/cgrates/engine" @@ -31,21 +33,22 @@ import ( "github.com/cgrates/rpcclient" ) -func TestNewAnalyzerService(t *testing.T) { +//TestNewActionService for cover testing +func TestNewAnalyzerCoverage(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)} connChan := make(chan rpcclient.ClientConnector, 1) anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, connChan, srvDep) - expected := &AnalyzerService{ + if anz == nil { + t.Errorf("\nExpecting ,\n Received <%+v>", utils.ToJSON(anz)) + } + anz2 := &AnalyzerService{ connChan: connChan, cfg: cfg, server: server, @@ -53,38 +56,27 @@ func TestNewAnalyzerService(t *testing.T) { shdChan: shdChan, srvDep: srvDep, } - if !reflect.DeepEqual(anz, expected) { - t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ToJSON(expected), utils.ToJSON(anz)) - } -} - -func TestAnalyzerSNotRunning(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)} - connChan := make(chan rpcclient.ClientConnector, 1) - anz := NewAnalyzerService(cfg, server, filterSChan, shdChan, connChan, srvDep) - if anz.IsRunning() { + if anz2.IsRunning() { t.Errorf("Expected service to be down") } - serviceName := anz.ServiceName() - if !reflect.DeepEqual(serviceName, utils.AnalyzerS) { - t.Errorf("\nExpecting ,\n Received <%+v>", serviceName) + anz2.anz = &analyzers.AnalyzerService{} + if !anz2.IsRunning() { + t.Errorf("Expected service to be running") } - shouldRun := anz.ShouldRun() + err := anz2.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + serviceName := anz2.ServiceName() + if !reflect.DeepEqual(serviceName, utils.AnalyzerS) { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.AnalyzerS, serviceName) + } + shouldRun := anz2.ShouldRun() if !reflect.DeepEqual(shouldRun, false) { t.Errorf("\nExpecting ,\n Received <%+v>", shouldRun) } - getAnalyzerS := anz.GetAnalyzerS() - if !reflect.DeepEqual(anz.anz, getAnalyzerS) { - t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ToJSON(anz.anz), utils.ToJSON(getAnalyzerS)) + getAnalyzerS := anz2.GetAnalyzerS() + if !reflect.DeepEqual(anz2.anz, getAnalyzerS) { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ToJSON(anz2.anz), utils.ToJSON(getAnalyzerS)) } } diff --git a/services/apiers_it_test.go b/services/apiers_it_test.go index a727fab5c..a668831ad 100644 --- a/services/apiers_it_test.go +++ b/services/apiers_it_test.go @@ -21,10 +21,13 @@ package services import ( "path" + "reflect" "sync" "testing" "time" + v1 "github.com/cgrates/cgrates/apier/v1" + "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/cores" "github.com/cgrates/cgrates/engine" @@ -102,6 +105,27 @@ 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) + } + err2 := apiSv2.Start() + if err2 == nil || err2 != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err2) + } + err = apiSv1.Reload() + if err != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err) + } + err2 = apiSv2.Reload() + if err2 != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err2) + } + expected := &v1.APIerSv1{} + getAPIerSv1 := apiSv1.GetAPIerSv1() + if reflect.DeepEqual(expected, getAPIerSv1) { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", expected, utils.ToJSON(getAPIerSv1)) + } cfg.ApierCfg().Enabled = false cfg.GetReloadChan(config.ApierS) <- struct{}{} time.Sleep(100 * time.Millisecond)