From ebcdc7c49f93bd78acfd7cce35a89dc537ad3c94 Mon Sep 17 00:00:00 2001 From: TeoV Date: Fri, 24 Aug 2018 05:32:44 -0400 Subject: [PATCH] Update filters_test after moving NavigableMap into config package --- engine/filters_test.go | 23 ++++++++--------------- engine/suppliers.go | 3 ++- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/engine/filters_test.go b/engine/filters_test.go index 8c7f3c7fa..17ae593a0 100644 --- a/engine/filters_test.go +++ b/engine/filters_test.go @@ -149,24 +149,20 @@ func TestFilterPassDestinations(t *testing.T) { } } -/* -REVIEW THIS TEST func TestFilterPassGreaterThan(t *testing.T) { rf, err := NewFilterRule(MetaLessThan, "ASR", []string{"40"}) if err != nil { t.Error(err) } - ev := &config.NavigableMap{ - data: map[string]interface{}{"ASR": 20}, - } + ev := config.NewNavigableMap(nil) + ev.Set([]string{"ASR"}, 20, true) if passes, err := rf.passGreaterThan(ev); err != nil { t.Error(err) } else if !passes { t.Error("not passing") } - ev = &config.NavigableMap{ - data: map[string]interface{}{"ASR": 40}, - } + ev = config.NewNavigableMap(nil) + ev.Set([]string{"ASR"}, 40, true) if passes, err := rf.passGreaterThan(ev); err != nil { t.Error(err) } else if passes { @@ -190,9 +186,8 @@ func TestFilterPassGreaterThan(t *testing.T) { } else if !passes { t.Error("not passing") } - ev = &config.NavigableMap{ - data: map[string]interface{}{"ASR": 20}, - } + ev = config.NewNavigableMap(nil) + ev.Set([]string{"ASR"}, 20, true) if passes, err := rf.passGreaterThan(ev); err != nil { t.Error(err) } else if passes { @@ -202,16 +197,14 @@ func TestFilterPassGreaterThan(t *testing.T) { if err != nil { t.Error(err) } - ev = &config.NavigableMap{ - data: map[string]interface{}{"ACD": time.Duration(2 * time.Minute)}, - } + ev = config.NewNavigableMap(nil) + ev.Set([]string{"ACD"}, time.Duration(2*time.Minute), true) if passes, err := rf.passGreaterThan(ev); err != nil { t.Error(err) } else if !passes { t.Error("not pass") } } -*/ func TestFilterNewRequestFilter(t *testing.T) { rf, err := NewFilterRule(MetaString, "MetaString", []string{"String"}) diff --git a/engine/suppliers.go b/engine/suppliers.go index 3f07ff134..c36446118 100644 --- a/engine/suppliers.go +++ b/engine/suppliers.go @@ -285,7 +285,6 @@ func (spS *SupplierService) resourceUsage(resIDs []string) (tUsage float64, err return } -// func (spS *SupplierService) populateSortingData(ev *utils.CGREvent, spl *Supplier, extraOpts *optsGetSuppliers) (srtSpl *SortedSupplier, pass bool, err error) { globalStats := map[string]float64{ //used for QOS strategy @@ -307,6 +306,7 @@ func (spS *SupplierService) populateSortingData(ev *utils.CGREvent, spl *Supplie fmt.Sprintf("<%s> ignoring supplier with ID: %s, err: %s", utils.SupplierS, spl.ID, err.Error())) // return nil, false, nil + // Need to add test to catch the panic and after that apply the changes } else { return nil, false, err } @@ -336,6 +336,7 @@ func (spS *SupplierService) populateSortingData(ev *utils.CGREvent, spl *Supplie fmt.Sprintf("<%s> ignoring supplier with ID: %s, err: %s", utils.SupplierS, spl.ID, err.Error())) // return nil, false, nil + // Need to add test to catch the panic and after that apply the changes } else { return nil, false, err }