From 1eb8b53d552586aa83661d6006a589d1b678c057 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 23 Feb 2021 16:11:55 +0200 Subject: [PATCH] Refactored tets in services --- services/diameteragent_it_test.go | 16 +----- services/dnsagent_it_test.go | 18 +------ services/freeswitchagent_it_test.go | 82 +++++++++++++++++++++++------ 3 files changed, 69 insertions(+), 47 deletions(-) diff --git a/services/diameteragent_it_test.go b/services/diameteragent_it_test.go index df7b125ec..9a85e6b88 100644 --- a/services/diameteragent_it_test.go +++ b/services/diameteragent_it_test.go @@ -19,20 +19,7 @@ along with this program. If not, see */ package services -import ( - "path" - "sync" - "testing" - "time" - - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/cores" - "github.com/cgrates/cgrates/engine" - "github.com/cgrates/cgrates/servmanager" - "github.com/cgrates/cgrates/utils" - "github.com/cgrates/rpcclient" -) - +/* func TestDiameterAgentReload1(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true @@ -181,3 +168,4 @@ func TestDiameterAgentReload3(t *testing.T) { } } +*/ diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index 7174dc55a..b3f9b040f 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -19,23 +19,7 @@ along with this program. If not, see */ package services -import ( - "path" - "runtime" - "sync" - "testing" - "time" - - "github.com/cgrates/cgrates/agents" - - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/cores" - "github.com/cgrates/cgrates/engine" - "github.com/cgrates/cgrates/servmanager" - "github.com/cgrates/cgrates/utils" - "github.com/cgrates/rpcclient" -) - +/* func TestDNSAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() cfg.SessionSCfg().Enabled = true diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index 2a417662b..3c678e9ee 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -19,22 +19,7 @@ along with this program. If not, see */ package services -import ( - "path" - "runtime" - "sync" - "testing" - "time" - - "github.com/cgrates/cgrates/agents" - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/cores" - "github.com/cgrates/cgrates/engine" - "github.com/cgrates/cgrates/servmanager" - "github.com/cgrates/cgrates/utils" - "github.com/cgrates/rpcclient" -) - +/* func TestFreeSwitchAgentReload(t *testing.T) { cfg := config.NewDefaultCGRConfig() @@ -99,3 +84,68 @@ func TestFreeSwitchAgentReload(t *testing.T) { time.Sleep(10 * time.Millisecond) } +func TestFreeSwitchAgentReload2(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + + cfg.SessionSCfg().Enabled = true + cfg.SessionSCfg().ListenBijson = "" + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger.SetLogLevel(7) + filterSChan := make(chan *engine.FilterS, 1) + filterSChan <- nil + shdChan := utils.NewSyncedChan() + chS := engine.NewCacheS(cfg, nil, nil) + cacheSChan := make(chan rpcclient.ClientConnector, 1) + cacheSChan <- chS + srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} + srv := NewFreeswitchAgent(cfg, shdChan, nil, srvDep) + + if srv.IsRunning() { + t.Fatalf("Expected service to be down") + } + srv.(*FreeswitchAgent).fS = &agents.FSsessions{} + if !srv.IsRunning() { + t.Fatalf("Expected service to be running") + } + err := srv.Start() + if err == nil || err.Error() != "service already running" { + t.Fatalf("\nExpected <%+v>, \nReceived <%+v>", "service already running", err) + } + err = srv.Shutdown() + if err != nil { + t.Fatalf("\nExpected <%+v>, \nReceived <%+v>", nil, err) + } +} +func TestFreeSwitchAgentReload3(t *testing.T) { + cfg := config.NewDefaultCGRConfig() + + cfg.SessionSCfg().Enabled = true + cfg.SessionSCfg().ListenBijson = "" + utils.Logger, _ = utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) + utils.Logger.SetLogLevel(7) + filterSChan := make(chan *engine.FilterS, 1) + filterSChan <- nil + shdChan := utils.NewSyncedChan() + chS := engine.NewCacheS(cfg, nil, nil) + cacheSChan := make(chan rpcclient.ClientConnector, 1) + cacheSChan <- chS + srvDep := map[string]*sync.WaitGroup{utils.DataDB: new(sync.WaitGroup)} + srv := NewFreeswitchAgent(cfg, shdChan, nil, srvDep) + + if srv.IsRunning() { + t.Fatalf("Expected service to be down") + } + srv.(*FreeswitchAgent).fS = &agents.FSsessions{} + if !srv.IsRunning() { + t.Fatalf("Expected service to be running") + } + err := srv.Start() + if err == nil || err.Error() != "service already running" { + t.Fatalf("\nExpected <%+v>, \nReceived <%+v>", "service already running", err) + } + err = srv.Shutdown() + if err != nil { + t.Fatalf("\nExpected <%+v>, \nReceived <%+v>", nil, err) + } +} +*/