diff --git a/config/dispatcherhcfg_test.go b/config/dispatcherhcfg_test.go index efab55e70..1cd53d389 100644 --- a/config/dispatcherhcfg_test.go +++ b/config/dispatcherhcfg_test.go @@ -27,52 +27,36 @@ import ( ) func TestDispatcherHCfgloadFromJsonCfg(t *testing.T) { - var daCfg, expected DispatcherHCfg - if err := daCfg.loadFromJsonCfg(nil); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(daCfg, expected) { - t.Errorf("Expected: %+v ,recived: %+v", expected, daCfg) - } - if err := daCfg.loadFromJsonCfg(new(DispatcherHJsonCfg)); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(daCfg, expected) { - t.Errorf("Expected: %+v ,recived: %+v", expected, daCfg) - } - daCfg.Hosts = make(map[string][]*DispatcherHRegistarCfg) - cfgJSONStr := `{ - "dispatcherh":{ - "enabled": true, - "dispatchers_conns": ["conn1","conn2"], - "hosts": { - "*default": [ - { - "ID": "Host1", - "register_transport": "*json", - "register_tls": false - }, - { - "ID": "Host2", - "register_transport": "*gob", - "register_tls": false - } - ], - "cgrates.net": [ - { - "ID": "Host1", - "register_transport": "*json", - "register_tls": true - }, - { - "ID": "Host2", - "register_transport": "*gob", - "register_tls": true - } - ] + jsonCfg := &DispatcherHJsonCfg{ + Enabled: utils.BoolPointer(true), + Dispatchers_conns: &[]string{"conn1", "conn2"}, + Hosts: map[string][]DispatcherHRegistarJsonCfg{ + utils.MetaDefault: { + { + Id: utils.StringPointer("Host1"), + Register_transport: utils.StringPointer(utils.MetaJSON), + }, + { + Id: utils.StringPointer("Host2"), + Register_transport: utils.StringPointer(utils.MetaGOB), + }, + }, + "cgrates.net": { + { + Id: utils.StringPointer("Host1"), + Register_transport: utils.StringPointer(utils.MetaJSON), + Register_tls: utils.BoolPointer(true), + }, + { + Id: utils.StringPointer("Host2"), + Register_transport: utils.StringPointer(utils.MetaGOB), + Register_tls: utils.BoolPointer(true), + }, }, - "register_interval": "5m", }, -}` - expected = DispatcherHCfg{ + Register_interval: utils.StringPointer("5"), + } + expected := &DispatcherHCfg{ Enabled: true, DispatchersConns: []string{"conn1", "conn2"}, Hosts: map[string][]*DispatcherHRegistarCfg{ @@ -99,17 +83,16 @@ func TestDispatcherHCfgloadFromJsonCfg(t *testing.T) { }, }, }, - RegisterInterval: 5 * time.Minute, + RegisterInterval: time.Duration(5), } - if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { + if jsnCfg, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if jsnDaCfg, err := jsnCfg.DispatcherHJsonCfg(); err != nil { + } else if err = jsnCfg.dispatcherHCfg.loadFromJsonCfg(jsonCfg); err != nil { t.Error(err) - } else if err = daCfg.loadFromJsonCfg(jsnDaCfg); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(expected, daCfg) { - t.Errorf("Expected: %+v,\nRecived: %+v", utils.ToJSON(expected), utils.ToJSON(daCfg)) + } else if !reflect.DeepEqual(expected, jsnCfg.dispatcherHCfg) { + t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.dispatcherHCfg)) } + } func TestDispatcherHCfgAsMapInterface(t *testing.T) { diff --git a/config/dispatcherscfg_test.go b/config/dispatcherscfg_test.go index 211e3e65b..440207dd5 100644 --- a/config/dispatcherscfg_test.go +++ b/config/dispatcherscfg_test.go @@ -26,43 +26,28 @@ import ( ) func TestDispatcherSCfgloadFromJsonCfg(t *testing.T) { - var daCfg, expected DispatcherSCfg - if err := daCfg.loadFromJsonCfg(nil); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(daCfg, expected) { - t.Errorf("Expected: %+v ,recived: %+v", expected, daCfg) + jsonCfg := &DispatcherSJsonCfg{ + Enabled: utils.BoolPointer(true), + Indexed_selects: utils.BoolPointer(true), + Prefix_indexed_fields: &[]string{"*req.prefix", "*req.indexed", "*req.fields"}, + Suffix_indexed_fields: &[]string{"*req.prefix", "*req.indexed", "*req.fields"}, + Attributes_conns: &[]string{"*internal"}, + Nested_fields: utils.BoolPointer(true), } - if err := daCfg.loadFromJsonCfg(new(DispatcherSJsonCfg)); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(daCfg, expected) { - t.Errorf("Expected: %+v ,recived: %+v", expected, daCfg) - } - cfgJSONStr := `{ - "dispatchers":{ - "enabled": false, - "indexed_selects":true, - //"string_indexed_fields": [], - "prefix_indexed_fields": [], - "nested_fields": false, - "attributes_conns": [], - }, - -}` - expected = DispatcherSCfg{ - Enabled: false, + expected := &DispatcherSCfg{ + Enabled: true, IndexedSelects: true, - PrefixIndexedFields: &[]string{}, - AttributeSConns: []string{}, - NestedFields: false, + PrefixIndexedFields: &[]string{"*req.prefix", "*req.indexed", "*req.fields"}, + SuffixIndexedFields: &[]string{"*req.prefix", "*req.indexed", "*req.fields"}, + AttributeSConns: []string{"*internal:*attributes"}, + NestedFields: true, } - if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil { + if jsnCfg, err := NewDefaultCGRConfig(); err != nil { t.Error(err) - } else if jsnDaCfg, err := jsnCfg.DispatcherSJsonCfg(); err != nil { + } else if err = jsnCfg.dispatcherSCfg.loadFromJsonCfg(jsonCfg); err != nil { t.Error(err) - } else if err = daCfg.loadFromJsonCfg(jsnDaCfg); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(expected, daCfg) { - t.Errorf("Expected: %+v,\nRecived: %+v", utils.ToJSON(expected), utils.ToJSON(daCfg)) + } else if !reflect.DeepEqual(expected, jsnCfg.dispatcherSCfg) { + t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.dispatcherSCfg)) } }