uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-17 06:09:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

Rename MultipleSum to Sum

Browse Source
This commit is contained in:
TeoV
2018-11-07 08:06:15 -05:00
committed by Dan Christian Bogos
parent 3bd46d7c18
commit 4c2eb336c2
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
agents/agentreq.go
View File

@@ -237,7 +237,7 @@ func (aReq *AgentRequest) ParseField(
}
iFaceVals[i] = utils.StringToInterface(strVal)
}
out, err = utils.MultipleSum(iFaceVals)
out, err = utils.Sum(iFaceVals)
}
if err != nil {
return

4
utils/reflect.go
View File

@@ -320,9 +320,9 @@ func GreaterThan(item, oItem interface{}, orEqual bool) (gte bool, err error) {
return
}
// MultipleSum attempts to sum multiple items
// Sum attempts to sum multiple items
// returns the result or error if not comparable
func MultipleSum(items ...interface{}) (sum interface{}, err error) {
func Sum(items ...interface{}) (sum interface{}, err error) {
//we need at least 2 items to sum them
if len(items) < 2 {
return nil, errors.New("Not enought parameters")

16
utils/reflect_test.go
View File

@@ -419,35 +419,35 @@ func TestIfaceAsBool(t *testing.T) {
}
}
func TestMultipleSum(t *testing.T) {
if _, err := MultipleSum(1); err == nil || err.Error() != "Not enought parameters" {
func TestSum(t *testing.T) {
if _, err := Sum(1); err == nil || err.Error() != "Not enought parameters" {
t.Error(err)
}
if _, err := MultipleSum(1, 1.2, false); err == nil || err.Error() != "incomparable" {
if _, err := Sum(1, 1.2, false); err == nil || err.Error() != "incomparable" {
t.Error(err)
}
if sum, err := MultipleSum(1.2, 1.2, 1.2, 1.2); err != nil {
if sum, err := Sum(1.2, 1.2, 1.2, 1.2); err != nil {
t.Error(err)
} else if sum != 4.8 {
t.Errorf("Expecting: 4.8, received: %+v", sum)
}
if sum, err := MultipleSum(2, 4, 6, 8); err != nil {
if sum, err := Sum(2, 4, 6, 8); err != nil {
t.Error(err)
} else if sum != int64(20) {
t.Errorf("Expecting: 20, received: %+v", sum)
}
if sum, err := MultipleSum(0.5, 1.23, 1.456, 2.234, 11.2, 0.45); err != nil {
if sum, err := Sum(0.5, 1.23, 1.456, 2.234, 11.2, 0.45); err != nil {
t.Error(err)
} else if sum != 17.069999999999997 {
t.Errorf("Expecting: 17.069999999999997, received: %+v", sum)
}
if sum, err := MultipleSum(2*time.Second, 1*time.Second, 2*time.Second,
if sum, err := Sum(2*time.Second, 1*time.Second, 2*time.Second,
5*time.Second, 4*time.Millisecond); err != nil {
t.Error(err)
} else if sum != 10*time.Second+4*time.Millisecond {
t.Errorf("Expecting: 10.004s, received: %+v", sum)
}
if sum, err := MultipleSum(time.Duration(2*time.Second),
if sum, err := Sum(time.Duration(2*time.Second),
time.Duration(10*time.Millisecond)); err != nil {
t.Error(err)
} else if sum != time.Duration(2*time.Second+10*time.Millisecond) {