uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Update filters_test after moving NavigableMap into config package

Browse Source
This commit is contained in:
TeoV
2018-08-24 05:32:44 -04:00
committed by Dan Christian Bogos
parent 43113a0626
commit ebcdc7c49f
2 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
engine/filters_test.go
View File

@@ -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"})

3
engine/suppliers.go
View File

@@ -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
}