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

Fix vet warnings following go version update

Browse Source
This commit is contained in:
ionutboangiu
2025-03-12 20:14:00 +02:00
committed by Dan Christian Bogos
parent cef9bd63ee
commit 23a4c98f8f
6 changed files with 76 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
engine/filters_test.go
View File

@@ -634,7 +634,7 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*string:~*req.Account:1007"}, fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
@@ -642,14 +642,14 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*string:~*req.Account:1007"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
//not
if pass, err := filterS.Pass("cgrates.org",
[]string{"*notstring:~*req.Account:1007"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
@@ -665,32 +665,32 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*prefix:~*req.Account:10"}, fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*prefix:~*req.Account:10"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*suffix:~*req.Account:07"}, fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*suffix:~*req.Account:07"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
//not
if pass, err := filterS.Pass("cgrates.org",
[]string{"*notsuffix:~*req.Account:07"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
@@ -706,20 +706,20 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~Tenant(~^cgr.*\\.org$)"}, fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.Tenant(~^cgr.*\\.org$)"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
//not
if pass, err := filterS.Pass("cgrates.org",
[]string{"*notrsr::~*req.Tenant(~^cgr.*\\.org$)"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
@@ -737,13 +737,13 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*destinations:~*req.Destination:EU"}, fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*destinations:~*req.Destination:EU_LANDLINE"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
@@ -759,13 +759,13 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*gte:~*req.Weight:20"}, fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*gte:~*req.Weight:10"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
@@ -797,26 +797,26 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) {
for key := range failEvent {
if pass, err := filterS.Pass("cgrates.org", []string{"*empty:~*req." + key + ":"},
fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("For %s expecting: %+v, received: %+v", key, false, pass)
}
if pass, err := filterS.Pass("cgrates.org", []string{"*empty:~*req." + key + ":"},
pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("For %s expecting: %+v, received: %+v", key, true, pass)
}
}
if pass, err := filterS.Pass("cgrates.org", []string{"*exists:~*req.NewKey:"},
fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("For NewKey expecting: %+v, received: %+v", false, pass)
}
if pass, err := filterS.Pass("cgrates.org", []string{"*notexists:~*req.NewKey:"},
fEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("For NewKey expecting: %+v, received: %+v", true, pass)
}
@@ -838,7 +838,7 @@ func TestPassRsr(t *testing.T) {
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.8(~^004)"}, pEv1); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
@@ -851,7 +851,7 @@ func TestPassRsr(t *testing.T) {
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.5(~^0$)"}, pEv1); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
@@ -872,7 +872,7 @@ func TestPassRsr2(t *testing.T) {
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.8(~^004)"}, pEv1); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
@@ -904,13 +904,13 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
pEv2.Set([]string{utils.MetaReq}, passEvent2)
if pass, err := filterS.Pass("cgrates.org",
[]string{}, pEv1); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
if pass, err := filterS.Pass("itsyscom.com",
[]string{}, pEv2); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
@@ -921,7 +921,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, ev)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.Test(~^\\w{30,})"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
@@ -932,7 +932,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, ev)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.Test(~^\\w{30,})"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
@@ -946,7 +946,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, ev)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.Test.Test2(~^\\w{30,})"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
@@ -959,7 +959,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, ev)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.Test.Test2(~^\\w{30,})"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", false, pass)
}
@@ -977,7 +977,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) {
[]string{"*string:~*req.Account:1003", "*prefix:~*req.Destination:10",
"*suffix:~*req.Subject:03", "*rsr::~*req.Destination(1002)"},
pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: %+v, received: %+v", true, pass)
}
@@ -999,7 +999,7 @@ func TestPassFilterMaxCost(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent1)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.MaxUsage{*duration_nanoseconds}(>0)"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: false , received: %+v", pass)
}
@@ -1011,7 +1011,7 @@ func TestPassFilterMaxCost(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent2)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.MaxUsage{*duration_nanoseconds}(>0)"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: false, received: %+v", pass)
}
@@ -1023,13 +1023,13 @@ func TestPassFilterMaxCost(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent3)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.MaxUsage{*duration_nanoseconds}(>0)"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: true, received: %+v", pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*gt:~*req.MaxUsage:0"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: true, received: %+v", pass)
}
@@ -1051,7 +1051,7 @@ func TestPassFilterMissingField(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent1)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.Category(^$)"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: true , received: %+v", pass)
}
@@ -1063,7 +1063,7 @@ func TestPassFilterMissingField(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent2)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~Category(^$)"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: true , received: %+v", pass)
}
@@ -1075,7 +1075,7 @@ func TestPassFilterMissingField(t *testing.T) {
pEv.Set([]string{utils.MetaReq}, passEvent3)
if pass, err := filterS.Pass("cgrates.org",
[]string{"*rsr::~*req.Category(^$)"}, pEv); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if pass {
t.Errorf("Expecting: false , received: %+v", pass)
}
@@ -1220,25 +1220,25 @@ func TestEventCostFilter(t *testing.T) {
if pass, err := filterS.Pass("cgrates.org",
[]string{"*string:~*ec.Charges[0].Increments[0].Accounting.Balance.Value:50"}, cgrDp); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: true , received: %+v", pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*string:~*ec.Charges[0].Increments[0].Accounting.AccountID:cgrates.org:1001"}, cgrDp); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: true , received: %+v", pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*string:~*ec.Charges[0].Rating.Rates[0].Value:0.1574"}, cgrDp); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: true , received: %+v", pass)
}
if pass, err := filterS.Pass("cgrates.org",
[]string{"*string:~*ec.Charges[0].Increments[0].Accounting.Balance.ID:MONETARY_POSTPAID"}, cgrDp); err != nil {
t.Errorf(err.Error())
t.Error(err)
} else if !pass {
t.Errorf("Expecting: true , received: %+v", pass)
}

6
engine/onstor_it_test.go
View File

@@ -1386,7 +1386,11 @@ func testOnStorITTiming(t *testing.T) {
func testOnStorITCRUDHistory(t *testing.T) {
time := time.Date(2012, 1, 1, 0, 0, 0, 0, time.UTC)
ist := &utils.LoadInstance{"Load", "RatingLoad", "Account", time}
ist := &utils.LoadInstance{LoadID: "Load",
RatingLoadID: "RatingLoad",
AccountingLoadID: "Account",
LoadTime: time,
}
if err := onStor.DataDB().AddLoadHistory(ist, 1, utils.NonTransactional); err != nil {
t.Error(err)
}