From bc6701a6e60888a9e938fe48ae115bcdbfb7ee47 Mon Sep 17 00:00:00 2001 From: andronache Date: Fri, 18 Dec 2020 14:49:23 +0200 Subject: [PATCH] Tests in services --- services/actions_it_test.go | 8 ++++++++ services/analyzers_it_test.go | 10 +++++++++- services/asteriskagent_it_test.go | 4 ++++ services/dispatcherh_it_test.go | 12 ++++++++++++ services/freeswitchagent_it_test.go | 2 -- services/httpagent_it_test.go | 7 +++++++ services/stordb_it_test.go | 27 +++++++++++++++++++++++++-- 7 files changed, 65 insertions(+), 5 deletions(-) diff --git a/services/actions_it_test.go b/services/actions_it_test.go index 874038a12..a0be55255 100644 --- a/services/actions_it_test.go +++ b/services/actions_it_test.go @@ -97,6 +97,10 @@ func TestActionSCoverage(t *testing.T) { if !actS2.IsRunning() { t.Errorf("Expected service to be running") } + errStart := actS2.Start() + if errStart == nil || errStart != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, errStart) + } serviceName := actS2.ServiceName() if !reflect.DeepEqual(serviceName, utils.ActionS) { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ActionS, serviceName) @@ -117,4 +121,8 @@ func TestActionSCoverage(t *testing.T) { if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) } + if actS2.IsRunning() { + t.Errorf("Expected service to be down") + } + } diff --git a/services/analyzers_it_test.go b/services/analyzers_it_test.go index 79f93bcd9..03fe25836 100644 --- a/services/analyzers_it_test.go +++ b/services/analyzers_it_test.go @@ -55,6 +55,7 @@ func TestNewAnalyzerCoverage(t *testing.T) { filterSChan: filterSChan, shdChan: shdChan, srvDep: srvDep, + stopChan: make(chan struct{}, 1), } if anz2.IsRunning() { t.Errorf("Expected service to be down") @@ -63,7 +64,14 @@ func TestNewAnalyzerCoverage(t *testing.T) { if !anz2.IsRunning() { t.Errorf("Expected service to be running") } - err := anz2.Reload() + if !anz2.IsRunning() { + t.Errorf("Expected service to be running") + } + err := anz2.Start() + if err == nil || err != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) + } + err = anz2.Reload() if err != nil { t.Errorf("\nExpecting ,\n Received <%+v>", err) } diff --git a/services/asteriskagent_it_test.go b/services/asteriskagent_it_test.go index 2393626ee..467b8036a 100644 --- a/services/asteriskagent_it_test.go +++ b/services/asteriskagent_it_test.go @@ -78,6 +78,10 @@ func TestAsteriskAgentReload(t *testing.T) { if !srv.IsRunning() { t.Errorf("Expected service to be running") } + srvReload := srv.Reload() + if srvReload != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", srvReload) + } err := srv.Start() if err != utils.ErrServiceAlreadyRunning { t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err) diff --git a/services/dispatcherh_it_test.go b/services/dispatcherh_it_test.go index 0882fc6ba..25d4995f7 100644 --- a/services/dispatcherh_it_test.go +++ b/services/dispatcherh_it_test.go @@ -75,4 +75,16 @@ func TestDispatcherHCoverage(t *testing.T) { if !reflect.DeepEqual(shouldRun, false) { t.Errorf("\nExpecting ,\n Received <%+v>", shouldRun) } + if !srv2.IsRunning() { + t.Errorf("Expected service to be running") + } + srv2.stopChan = make(chan struct{}, 1) + srv2.dspS = dispatcherh.NewDispatcherHService(cfg, cM) + shutdownSrv := srv2.Shutdown() + if shutdownSrv != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", shutdownSrv) + } + if srv2.IsRunning() { + t.Errorf("Expected service to be down") + } } diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index 6eceef448..d9ade8d1b 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -46,7 +46,6 @@ func TestFreeSwitchAgentReload(t *testing.T) { shdChan := utils.NewSyncedChan() shdWg := new(sync.WaitGroup) chS := engine.NewCacheS(cfg, nil, nil) - cacheSChan := make(chan rpcclient.ClientConnector, 1) cacheSChan <- chS @@ -81,7 +80,6 @@ func TestFreeSwitchAgentReload(t *testing.T) { if srv.IsRunning() { t.Errorf("Expected service to be down") } - shdChan.CloseOnce() runtime.Gosched() time.Sleep(10 * time.Millisecond) diff --git a/services/httpagent_it_test.go b/services/httpagent_it_test.go index 4aa7a2000..73374d286 100644 --- a/services/httpagent_it_test.go +++ b/services/httpagent_it_test.go @@ -74,4 +74,11 @@ func TestHTTPAgentCoverage(t *testing.T) { if rld != nil { t.Errorf("\nExpecting ,\n Received <%+v>", rld) } + shutdownError := srv.Shutdown() + if shutdownError != nil { + t.Errorf("\nExpecting ,\n Received <%+v>", shutdownError) + } + if srv.IsRunning() { + t.Errorf("Expected service to be down") + } } diff --git a/services/stordb_it_test.go b/services/stordb_it_test.go index bd806cfae..62fc94740 100644 --- a/services/stordb_it_test.go +++ b/services/stordb_it_test.go @@ -23,6 +23,8 @@ import ( "sync" "testing" + "github.com/cgrates/cgrates/engine" + "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" ) @@ -32,8 +34,29 @@ 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() { + err := srv.IsRunning() + if err == true { + t.Errorf("Expected service to be down") + } + srv.db = engine.NewInternalDB([]string{"test"}, []string{"test2"}, true) + err = srv.IsRunning() + if err == false { t.Errorf("Expected service to be running") } - + err2 := srv.Start() + if err2 == nil || err2 != utils.ErrServiceAlreadyRunning { + t.Errorf("\nExpecting <%+v>,\n Received <%+v>", utils.ErrServiceAlreadyRunning, err2) + } + srv.oldDBCfg = &config.StorDbCfg{ + Type: utils.INTERNAL, + Host: "test_host", + Port: "test_port", + Name: "test_name", + User: "test_user", + Password: "test_pass", + } + err2 = srv.Reload() + if err2 == nil { + t.Errorf("\nExpecting ,\n Received <%+v>", err2) + } }