From e6dd46541074ab56695dd9bc53f3adbabd5acebd Mon Sep 17 00:00:00 2001 From: gezimbll Date: Thu, 20 Oct 2022 10:13:07 -0400 Subject: [PATCH] improved tests in config --- config/datadbcfg_test.go | 52 ++++++++++++++++++++++++++++ config/httpcfg_test.go | 73 ++++++++++++++++++++++++++++++++++++++++ config/routescfg_test.go | 12 ++++++- 3 files changed, 136 insertions(+), 1 deletion(-) diff --git a/config/datadbcfg_test.go b/config/datadbcfg_test.go index f8dad6897..ad6c46bfd 100644 --- a/config/datadbcfg_test.go +++ b/config/datadbcfg_test.go @@ -94,6 +94,58 @@ func TestDataDbCfgloadFromJsonCfg(t *testing.T) { t.Errorf("Expected %+v \n, received %+v", expected.RplConns, jsnCfg.dataDbCfg.RplConns) } } + jsonCfg = &DbJsonCfg{ + Opts: &DBOptsJson{ + RedisClusterSync: utils.StringPointer("test"), + }, + } + + if err := jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil { + t.Error(err) + } + jsonCfg = &DbJsonCfg{ + Opts: &DBOptsJson{ + RedisClusterOndownDelay: utils.StringPointer("test2"), + }, + } + + if err := jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil { + t.Error(err) + } + jsonCfg = &DbJsonCfg{ + Opts: &DBOptsJson{ + RedisConnectTimeout: utils.StringPointer("test3"), + }, + } + + if err := jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil { + t.Error(err) + } + jsonCfg = &DbJsonCfg{ + Opts: &DBOptsJson{ + RedisReadTimeout: utils.StringPointer("test4"), + }, + } + if err := jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil { + t.Error(err) + } + jsonCfg = &DbJsonCfg{ + Opts: &DBOptsJson{ + RedisWriteTimeout: utils.StringPointer("test4"), + }, + } + if err := jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil { + t.Error(err) + } + jsonCfg = &DbJsonCfg{ + Opts: &DBOptsJson{ + MongoQueryTimeout: utils.StringPointer("test4"), + }, + } + if err := jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil { + t.Error(err) + } + } func TestConnsloadFromJsonCfg(t *testing.T) { diff --git a/config/httpcfg_test.go b/config/httpcfg_test.go index 70a4d075a..061705cdb 100644 --- a/config/httpcfg_test.go +++ b/config/httpcfg_test.go @@ -203,3 +203,76 @@ func TestHTTPCfgClone(t *testing.T) { t.Errorf("Expected clone to not modify the cloned") } } + +func TestHTTPNewDialer(t *testing.T) { + dialer := &net.Dialer{ + DualStack: true, + } + var jsnCfg *HTTPClientOptsJson + if err := newDialer(dialer, jsnCfg); err != nil { + t.Error(err) + } + jsnCfg = &HTTPClientOptsJson{ + DialTimeout: utils.StringPointer("test"), + DialFallbackDelay: utils.StringPointer("test2"), + } + if err := newDialer(dialer, jsnCfg); err == nil { + t.Error(err) + } + jsnCfg = &HTTPClientOptsJson{ + DialFallbackDelay: utils.StringPointer("test2"), + } + if err := newDialer(dialer, jsnCfg); err == nil { + t.Error(err) + } + jsnCfg = &HTTPClientOptsJson{ + DialKeepAlive: utils.StringPointer("test3"), + } + if err := newDialer(dialer, jsnCfg); err == nil { + t.Error(err) + } +} + +func TestHTTPLoadTransportFromJSONCfg(t *testing.T) { + + var jsnCfg *HTTPClientOptsJson + httpOpts := &http.Transport{} + httpDialer := &net.Dialer{} + if err := loadTransportFromJSONCfg(httpOpts, httpDialer, jsnCfg); err != nil { + t.Error(err) + } + jsnCfg = &HTTPClientOptsJson{ + TLSHandshakeTimeout: utils.StringPointer("test"), + } + if err := loadTransportFromJSONCfg(httpOpts, httpDialer, jsnCfg); err == nil { + t.Error(err) + } + jsnCfg = &HTTPClientOptsJson{ + IdleConnTimeout: utils.StringPointer("test2"), + } + if err := loadTransportFromJSONCfg(httpOpts, httpDialer, jsnCfg); err == nil { + t.Error(err) + } + jsnCfg = &HTTPClientOptsJson{ + ResponseHeaderTimeout: utils.StringPointer("test3"), + } + if err := loadTransportFromJSONCfg(httpOpts, httpDialer, jsnCfg); err == nil { + t.Error(err) + } + jsnCfg = &HTTPClientOptsJson{ + ExpectContinueTimeout: utils.StringPointer("test4"), + } + if err := loadTransportFromJSONCfg(httpOpts, httpDialer, jsnCfg); err == nil { + t.Error(err) + } + +} + +func TestHTTPLoadFromJSONCfg(t *testing.T) { + var jsnHTTPCfg *HTTPJsonCfg + httpcfg := &HTTPCfg{} + if err := httpcfg.loadFromJSONCfg(jsnHTTPCfg); err != nil { + t.Error(err) + } + +} diff --git a/config/routescfg_test.go b/config/routescfg_test.go index 9ba8bf08f..1871d981d 100644 --- a/config/routescfg_test.go +++ b/config/routescfg_test.go @@ -37,6 +37,12 @@ func TestRouteSCfgloadFromJsonCfg(t *testing.T) { Rals_conns: &[]string{utils.MetaInternal, "conn1"}, Default_ratio: utils.IntPointer(10), Nested_fields: utils.BoolPointer(true), + Opts: &RoutesOptsJson{ + MaxCost: utils.IntPointer(3), + Limit: utils.IntPointer(3), + Offset: utils.IntPointer(3), + ProfileCount: utils.IntPointer(3), + }, } expected := &RouteSCfg{ Enabled: true, @@ -53,7 +59,11 @@ func TestRouteSCfgloadFromJsonCfg(t *testing.T) { Opts: &RoutesOpts{ Context: utils.MetaRoutes, IgnoreErrors: false, - MaxCost: utils.EmptyString, + + MaxCost: utils.IntPointer(3), + Limit: utils.IntPointer(3), + Offset: utils.IntPointer(3), + ProfileCount: utils.IntPointer(3), }, } jsonCfg := NewDefaultCGRConfig()