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 integration tests in engine on 1.0

Browse Source
This commit is contained in:
ionutboangiu
2021-05-12 16:18:24 +03:00
committed by Dan Christian Bogos
parent e061a85e8a
commit 8196f507c4
3 changed files with 50 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
engine/z_loader_it_test.go
View File

@@ -23,9 +23,11 @@ import (
"flag"
"path"
"reflect"
"strings"
"testing"
"github.com/cgrates/birpc"
"github.com/cgrates/birpc/context"
"github.com/cgrates/cgrates/config"
"github.com/cgrates/cgrates/utils"
)
@@ -104,7 +106,11 @@ func testLoaderITInitDataDB(t *testing.T) {
}
}
cacheChan := make(chan birpc.ClientConnector, 1)
cacheChan <- NewCacheS(lCfg, dataDbCsv, nil)
srv, _ := birpc.NewService(NewCacheS(lCfg, dataDbCsv, nil), "", false)
srv.UpdateMethodName(func(key string) (newKey string) {
return strings.TrimPrefix(key, "V1")
})
cacheChan <- srv
connMgr = NewConnManager(lCfg, map[string]chan birpc.ClientConnector{
utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches): cacheChan,
})
@@ -262,7 +268,7 @@ func testLoaderITWriteToDatabase(t *testing.T) {
}
for tenantid, fltr := range loader.filters {
rcv, err := loader.dm.GetFilter(tenantid.Tenant, tenantid.ID, false, false, utils.NonTransactional)
rcv, err := loader.dm.GetFilter(context.TODO(), tenantid.Tenant, tenantid.ID, false, false, utils.NonTransactional)
if err != nil {
t.Error("Failed GetFilter: ", err.Error())
}
@@ -331,7 +337,7 @@ func testLoaderITWriteToDatabase(t *testing.T) {
}
for tenatid, attrPrf := range loader.attributeProfiles {
rcv, err := loader.dm.GetAttributeProfile(tenatid.Tenant, tenatid.ID, false, false, utils.NonTransactional)
rcv, err := loader.dm.GetAttributeProfile(context.TODO(), tenatid.Tenant, tenatid.ID, false, false, utils.NonTransactional)
if err != nil {
t.Errorf("Failed GetAttributeProfile, tenant: %s, id: %s, error: %s ", attrPrf.Tenant, attrPrf.ID, err.Error())
}

82
engine/z_onstor_it_test.go
View File

@@ -138,7 +138,7 @@ func testOnStorITCacheDestinations(t *testing.T) {
t.SkipNow()
}
if err := onStor.CacheDataFromDB("INVALID", nil, false); err == nil || err.Error() != utils.UnsupportedCachePrefix {
if err := onStor.CacheDataFromDB(context.TODO(), "INVALID", nil, false); err == nil || err.Error() != utils.UnsupportedCachePrefix {
t.Error(err)
}
dst := &Destination{ID: "TEST_CACHE", Prefixes: []string{"+491", "+492", "+493"}}
@@ -149,13 +149,13 @@ func testOnStorITCacheDestinations(t *testing.T) {
if _, hasIt := Cache.Get(utils.CacheDestinations, dst.ID); hasIt {
t.Error("Already in cache")
}
if err := onStor.CacheDataFromDB(utils.DestinationPrefix, []string{dst.ID}, true); err != nil { // Should not cache due to mustBeCached
if err := onStor.CacheDataFromDB(context.TODO(), utils.DestinationPrefix, []string{dst.ID}, true); err != nil { // Should not cache due to mustBeCached
t.Error(err)
}
if _, hasIt := Cache.Get(utils.CacheDestinations, dst.ID); hasIt {
t.Error("Should not be in cache")
}
if err := onStor.CacheDataFromDB(utils.DestinationPrefix, []string{dst.ID}, false); err != nil {
if err := onStor.CacheDataFromDB(context.TODO(), utils.DestinationPrefix, []string{dst.ID}, false); err != nil {
t.Error(err)
}
if itm, hasIt := Cache.Get(utils.CacheDestinations, dst.ID); !hasIt {
@@ -176,7 +176,7 @@ func testOnStorITCacheReverseDestinations(t *testing.T) {
t.Errorf("Prefix: %s already in cache", prfx)
}
}
if err := onStor.CacheDataFromDB(utils.ReverseDestinationPrefix, dst.Prefixes, false); err != nil {
if err := onStor.CacheDataFromDB(context.TODO(), utils.ReverseDestinationPrefix, dst.Prefixes, false); err != nil {
t.Error(err)
}
if onStor.dataDB.GetStorageType() != utils.Internal {
@@ -403,7 +403,7 @@ func testOnStorITTiming(t *testing.T) {
utils.NonTransactional); rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
if err := onStor.SetTiming(tmg); err != nil {
if err := onStor.SetTiming(context.TODO(), tmg); err != nil {
t.Error(err)
}
if onStor.dataDB.GetStorageType() != utils.Internal {
@@ -428,7 +428,7 @@ func testOnStorITTiming(t *testing.T) {
}
//update
tmg.MonthDays = utils.MonthDays{1, 2, 3, 4, 5, 6, 7}
if err := onStor.SetTiming(tmg); err != nil {
if err := onStor.SetTiming(context.TODO(), tmg); err != nil {
t.Error(err)
}
@@ -697,7 +697,7 @@ func testOnStorITThresholdProfile(t *testing.T) {
Weight: 1.4,
ActionIDs: []string{"Action1"},
}
if err := onStor.SetFilter(fp, true); err != nil {
if err := onStor.SetFilter(context.TODO(), fp, true); err != nil {
t.Error(err)
}
if _, rcvErr := onStor.GetThresholdProfile(th.Tenant, th.ID,
@@ -813,22 +813,22 @@ func testOnStorITFilter(t *testing.T) {
if err := fp.Compile(); err != nil {
t.Fatal(err)
}
if _, rcvErr := onStor.GetFilter("cgrates.org", "Filter1",
if _, rcvErr := onStor.GetFilter(context.TODO(), "cgrates.org", "Filter1",
true, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
if err := onStor.SetFilter(fp, true); err != nil {
if err := onStor.SetFilter(context.TODO(), fp, true); err != nil {
t.Error(err)
}
//get from cache
if rcv, err := onStor.GetFilter("cgrates.org", "Filter1",
if rcv, err := onStor.GetFilter(context.TODO(), "cgrates.org", "Filter1",
true, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(fp, rcv)) {
t.Errorf("Expecting: %v, received: %v", fp, rcv)
}
//get from database
if rcv, err := onStor.GetFilter("cgrates.org", "Filter1",
if rcv, err := onStor.GetFilter(context.TODO(), "cgrates.org", "Filter1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(fp, rcv)) {
@@ -856,34 +856,34 @@ func testOnStorITFilter(t *testing.T) {
if err := fp.Compile(); err != nil {
t.Fatal(err)
}
if err := onStor.SetFilter(fp, true); err != nil {
if err := onStor.SetFilter(context.TODO(), fp, true); err != nil {
t.Error(err)
}
//get from cache
if rcv, err := onStor.GetFilter("cgrates.org", "Filter1",
if rcv, err := onStor.GetFilter(context.TODO(), "cgrates.org", "Filter1",
true, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(fp, rcv)) {
t.Errorf("Expecting: %v, received: %v", fp, rcv)
}
//get from database
if rcv, err := onStor.GetFilter("cgrates.org", "Filter1",
if rcv, err := onStor.GetFilter(context.TODO(), "cgrates.org", "Filter1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(fp, rcv)) {
t.Errorf("Expecting: %v, received: %v", fp, rcv)
}
if err := onStor.RemoveFilter(fp.Tenant, fp.ID, utils.NonTransactional, true); err != nil {
if err := onStor.RemoveFilter(context.TODO(), fp.Tenant, fp.ID, utils.NonTransactional, true); err != nil {
t.Error(err)
}
//check cache if removed
if _, rcvErr := onStor.GetFilter("cgrates.org", "Filter1",
if _, rcvErr := onStor.GetFilter(context.TODO(), "cgrates.org", "Filter1",
true, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
//check database if removed
if _, rcvErr := onStor.GetFilter("cgrates.org", "Filter1",
if _, rcvErr := onStor.GetFilter(context.TODO(), "cgrates.org", "Filter1",
false, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
@@ -1011,22 +1011,22 @@ func testOnStorITAttributeProfile(t *testing.T) {
},
Weight: 20,
}
if _, rcvErr := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if _, rcvErr := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
true, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
if err := onStor.SetAttributeProfile(attrProfile, false); err != nil {
if err := onStor.SetAttributeProfile(context.TODO(), attrProfile, false); err != nil {
t.Error(err)
}
//get from cache
if rcv, err := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if rcv, err := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
true, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(attrProfile, rcv)) {
t.Errorf("Expecting: %v, received: %v", attrProfile, rcv)
}
//get from database
if rcv, err := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if rcv, err := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(attrProfile, rcv)) {
@@ -1040,35 +1040,35 @@ func testOnStorITAttributeProfile(t *testing.T) {
}
//update
attrProfile.Contexts = []string{"con1", "con2", "con3"}
if err := onStor.SetAttributeProfile(attrProfile, false); err != nil {
if err := onStor.SetAttributeProfile(context.TODO(), attrProfile, false); err != nil {
t.Error(err)
}
//get from cache
if rcv, err := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if rcv, err := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
true, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(attrProfile, rcv)) {
t.Errorf("Expecting: %v, received: %v", attrProfile, rcv)
}
//get from database
if rcv, err := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if rcv, err := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(attrProfile, rcv)) {
t.Errorf("Expecting: %v, received: %v", attrProfile, rcv)
}
if err := onStor.RemoveAttributeProfile(attrProfile.Tenant,
if err := onStor.RemoveAttributeProfile(context.TODO(), attrProfile.Tenant,
attrProfile.ID, utils.NonTransactional, false); err != nil {
t.Error(err)
}
//check cache if removed
if _, rcvErr := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if _, rcvErr := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
true, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
//check database if removed
if _, rcvErr := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if _, rcvErr := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
false, true, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
@@ -1088,15 +1088,15 @@ func testOnStorITTestAttributeSubstituteIface(t *testing.T) {
},
Weight: 20,
}
if _, rcvErr := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if _, rcvErr := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
true, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
if err := onStor.SetAttributeProfile(attrProfile, false); err != nil {
if err := onStor.SetAttributeProfile(context.TODO(), attrProfile, false); err != nil {
t.Error(err)
}
//check database
if rcv, err := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if rcv, err := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(attrProfile, rcv)) {
@@ -1108,11 +1108,11 @@ func testOnStorITTestAttributeSubstituteIface(t *testing.T) {
Value: config.NewRSRParsersMustCompile("123.123", utils.InfieldSep),
},
}
if err := onStor.SetAttributeProfile(attrProfile, false); err != nil {
if err := onStor.SetAttributeProfile(context.TODO(), attrProfile, false); err != nil {
t.Error(err)
}
//check database
if rcv, err := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if rcv, err := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(attrProfile, rcv)) {
@@ -1124,11 +1124,11 @@ func testOnStorITTestAttributeSubstituteIface(t *testing.T) {
Value: config.NewRSRParsersMustCompile("true", utils.InfieldSep),
},
}
if err := onStor.SetAttributeProfile(attrProfile, false); err != nil {
if err := onStor.SetAttributeProfile(context.TODO(), attrProfile, false); err != nil {
t.Error(err)
}
//check database
if rcv, err := onStor.GetAttributeProfile("cgrates.org", "AttrPrf1",
if rcv, err := onStor.GetAttributeProfile(context.TODO(), "cgrates.org", "AttrPrf1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(attrProfile, rcv)) {
@@ -1282,18 +1282,18 @@ func testOnStorITRateProfile(t *testing.T) {
},
},
}
if _, rcvErr := onStor.GetRateProfile("cgrates.org", "RP1",
if _, rcvErr := onStor.GetRateProfile(context.TODO(), "cgrates.org", "RP1",
true, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}
if err := onStor.SetRateProfile(rPrf, false); err != nil {
if err := onStor.SetRateProfile(context.TODO(), rPrf, false); err != nil {
t.Error(err)
}
if err = rPrf.Compile(); err != nil {
t.Fatal(err)
}
//get from database
if rcv, err := onStor.GetRateProfile("cgrates.org", "RP1",
if rcv, err := onStor.GetRateProfile(context.TODO(), "cgrates.org", "RP1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(rPrf, rcv) {
@@ -1307,23 +1307,23 @@ func testOnStorITRateProfile(t *testing.T) {
}
//update
rPrf.FilterIDs = []string{"*string:~*req.Accout:1001", "*prefix:~*req.Destination:10"}
if err := onStor.SetRateProfile(rPrf, false); err != nil {
if err := onStor.SetRateProfile(context.TODO(), rPrf, false); err != nil {
t.Error(err)
}
//get from database
if rcv, err := onStor.GetRateProfile("cgrates.org", "RP1",
if rcv, err := onStor.GetRateProfile(context.TODO(), "cgrates.org", "RP1",
false, false, utils.NonTransactional); err != nil {
t.Error(err)
} else if !(reflect.DeepEqual(rPrf, rcv)) {
t.Errorf("Expecting: %v, received: %v", rPrf, rcv)
}
if err := onStor.RemoveRateProfile(rPrf.Tenant, rPrf.ID,
if err := onStor.RemoveRateProfile(context.TODO(), rPrf.Tenant, rPrf.ID,
utils.NonTransactional, false); err != nil {
t.Error(err)
}
//check database if removed
if _, rcvErr := onStor.GetRateProfile("cgrates.org", "RP1",
if _, rcvErr := onStor.GetRateProfile(context.TODO(), "cgrates.org", "RP1",
false, false, utils.NonTransactional); rcvErr != nil && rcvErr != utils.ErrNotFound {
t.Error(rcvErr)
}

27
engine/z_resources_test.go
View File

@@ -926,9 +926,6 @@ func TestResourceV1AuthorizeResourceMissingStruct(t *testing.T) {
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
resService := NewResourceService(dmRES, defaultCfg,
&FilterS{dm: dmRES, cfg: defaultCfg}, nil)
if err != nil {
t.Errorf("Error: %+v", err)
}
var reply *string
argsMissingTenant := utils.ArgRSv1ResourceUsage{
CGREvent: &utils.CGREvent{
@@ -1119,9 +1116,6 @@ func TestResourceMatchingResourcesForEvent(t *testing.T) {
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
resService := NewResourceService(dmRES, defaultCfg,
&FilterS{dm: dmRES, cfg: defaultCfg}, nil)
if err != nil {
t.Errorf("Error: %+v", err)
}
fltrRes1 := &Filter{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "FLTR_RES_1",
@@ -1447,9 +1441,6 @@ func TestResourceUsageTTLCase1(t *testing.T) {
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
resService := NewResourceService(dmRES, defaultCfg,
&FilterS{dm: dmRES, cfg: defaultCfg}, nil)
if err != nil {
t.Errorf("Error: %+v", err)
}
fltrRes1 := &Filter{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "FLTR_RES_1",
@@ -1652,9 +1643,6 @@ func TestResourceUsageTTLCase2(t *testing.T) {
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
resService := NewResourceService(dmRES, defaultCfg,
&FilterS{dm: dmRES, cfg: defaultCfg}, nil)
if err != nil {
t.Errorf("Error: %+v", err)
}
fltrRes1 := &Filter{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "FLTR_RES_1",
@@ -1857,9 +1845,6 @@ func TestResourceUsageTTLCase3(t *testing.T) {
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
resService := NewResourceService(dmRES, defaultCfg,
&FilterS{dm: dmRES, cfg: defaultCfg}, nil)
if err != nil {
t.Errorf("Error: %+v", err)
}
fltrRes1 := &Filter{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "FLTR_RES_1",
@@ -2062,9 +2047,6 @@ func TestResourceUsageTTLCase4(t *testing.T) {
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
resService := NewResourceService(dmRES, defaultCfg,
&FilterS{dm: dmRES, cfg: defaultCfg}, nil)
if err != nil {
t.Errorf("Error: %+v", err)
}
fltrRes1 := &Filter{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "FLTR_RES_1",
@@ -2391,9 +2373,6 @@ func TestResourceMatchWithIndexFalse(t *testing.T) {
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
resService := NewResourceService(dmRES, defaultCfg,
&FilterS{dm: dmRES, cfg: defaultCfg}, nil)
if err != nil {
t.Errorf("Error: %+v", err)
}
fltrRes1 := &Filter{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "FLTR_RES_1",
@@ -2616,9 +2595,6 @@ func TestResourceCaching(t *testing.T) {
defaultCfg.ResourceSCfg().StoreInterval = 1
defaultCfg.ResourceSCfg().StringIndexedFields = nil
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
if err != nil {
t.Errorf("Error: %+v", err)
}
fltrRes1 := &Filter{
Tenant: config.CgrConfig().GeneralCfg().DefaultTenant,
ID: "FLTR_RES_1",
@@ -2767,9 +2743,6 @@ func TestResourceCaching(t *testing.T) {
defaultCfg.ResourceSCfg().PrefixIndexedFields = nil
resService := NewResourceService(dmRES, defaultCfg,
&FilterS{dm: dmRES, cfg: defaultCfg}, nil)
if err != nil {
t.Errorf("Error: %+v", err)
}
resProf := &ResourceProfile{
Tenant: "cgrates.org",