From 9e4ef8642d3b43755b6b62a098e27a5ee4034044 Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Tue, 29 Sep 2020 15:55:08 +0300 Subject: [PATCH] Updated load tests for schedulercfg --- config/schedulercfg_test.go | 35 +++++++++++------------------------ 1 file changed, 11 insertions(+), 24 deletions(-) diff --git a/config/schedulercfg_test.go b/config/schedulercfg_test.go index 6c742739d..64b413ae0 100644 --- a/config/schedulercfg_test.go +++ b/config/schedulercfg_test.go @@ -25,35 +25,22 @@ import ( ) func TestSchedulerCfgloadFromJsonCfg(t *testing.T) { - var schdcfg, expected SchedulerCfg - if err := schdcfg.loadFromJsonCfg(nil); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(schdcfg, expected) { - t.Errorf("Expected: %+v ,recived: %+v", expected, schdcfg) + cfgJSONS := &SchedulerJsonCfg{ + Enabled: utils.BoolPointer(true), + Cdrs_conns: &[]string{utils.MetaInternal}, + Filters: &[]string{}, } - if err := schdcfg.loadFromJsonCfg(new(SchedulerJsonCfg)); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(schdcfg, expected) { - t.Errorf("Expected: %+v ,recived: %+v", expected, schdcfg) - } - cfgJSONStr := `{ -"schedulers": { - "enabled": true, // start Scheduler service: - "cdrs_conns": [], // address where to reach CDR Server, empty to disable CDR capturing <*internal|x.y.z.y:1234> - }, -}` - expected = SchedulerCfg{ + expected := &SchedulerCfg{ Enabled: true, - CDRsConns: []string{}, + CDRsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCDRs)}, + Filters: []string{}, } - if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { + if jsonCfg, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if jsnSchCfg, err := jsnCfg.SchedulerJsonCfg(); err != nil { + } else if err = jsonCfg.schedulerCfg.loadFromJsonCfg(cfgJSONS); err != nil { t.Error(err) - } else if err = schdcfg.loadFromJsonCfg(jsnSchCfg); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(expected, schdcfg) { - t.Errorf("Expected: %+v , recived: %+v", expected, schdcfg) + } else if !reflect.DeepEqual(expected, jsonCfg.schedulerCfg) { + t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.schedulerCfg)) } }