uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-21 23:28:44 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests after changing opts structure (incomplete)

Browse Source
This commit is contained in:
ionutboangiu
2021-10-12 18:58:18 +03:00
committed by Dan Christian Bogos
parent 4ba6c563c3
commit 77e805bee9
18 changed files with 399 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/resources.go
View File

@@ -673,7 +673,7 @@ func (rS *ResourceService) V1ResourcesForEvent(ctx *context.Context, args *utils
var usageID string
if usageID, err = GetStringOpts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.UsageID,
utils.OptsResourcesUsageID); err != nil {
config.ResourcesUsageIDDftOpt, utils.OptsResourcesUsageID); err != nil {
return
}
@@ -731,7 +731,7 @@ func (rS *ResourceService) V1AuthorizeResources(ctx *context.Context, args *util
var usageID string
if usageID, err = GetStringOpts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.UsageID,
utils.OptsResourcesUsageID); err != nil {
config.ResourcesUsageIDDftOpt, utils.OptsResourcesUsageID); err != nil {
return
}
@@ -807,7 +807,7 @@ func (rS *ResourceService) V1AllocateResources(ctx *context.Context, args *utils
var usageID string
if usageID, err = GetStringOpts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.UsageID,
utils.OptsResourcesUsageID); err != nil {
config.ResourcesUsageIDDftOpt, utils.OptsResourcesUsageID); err != nil {
return
}
@@ -887,7 +887,7 @@ func (rS *ResourceService) V1ReleaseResources(ctx *context.Context, args *utils.
var usageID string
if usageID, err = GetStringOpts(ctx, args.Tenant, args, rS.filterS, rS.cgrcfg.ResourceSCfg().Opts.UsageID,
utils.OptsResourcesUsageID); err != nil {
config.ResourcesUsageIDDftOpt, utils.OptsResourcesUsageID); err != nil {
return
}

23
engine/routes_test.go
View File

@@ -668,7 +668,7 @@ func TestRoutesSortedForEvent(t *testing.T) {
t.Errorf("Error: %+v", err)
}
if !reflect.DeepEqual(eFirstRouteProfile, sprf) {
t.Errorf("Expecting: %+v, received: %+v", eFirstRouteProfile, sprf)
t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eFirstRouteProfile), utils.ToJSON(sprf))
}
eFirstRouteProfile = SortedRoutesList{&SortedRoutes{
@@ -713,7 +713,7 @@ func TestRoutesSortedForEvent(t *testing.T) {
t.Errorf("Error: %+v", err)
}
if !reflect.DeepEqual(eFirstRouteProfile, sprf) {
t.Errorf("Expecting: %+v, received: %+v", eFirstRouteProfile, sprf)
t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eFirstRouteProfile), utils.ToJSON(sprf))
}
eFirstRouteProfile = SortedRoutesList{&SortedRoutes{
@@ -738,7 +738,7 @@ func TestRoutesSortedForEvent(t *testing.T) {
t.Errorf("Error: %+v", err)
}
if !reflect.DeepEqual(eFirstRouteProfile, sprf) {
t.Errorf("Expecting: %+v, received: %+v", eFirstRouteProfile, sprf)
t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eFirstRouteProfile), utils.ToJSON(sprf))
}
}
@@ -987,7 +987,7 @@ func TestRoutesSortedForEventWithLimit(t *testing.T) {
t.Errorf("Error: %+v", err)
}
if !reflect.DeepEqual(eFirstRouteProfile, sprf) {
t.Errorf("Expecting: %+v, received: %+v", eFirstRouteProfile, sprf)
t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(eFirstRouteProfile), utils.ToJSON(sprf))
}
}
@@ -1480,7 +1480,10 @@ func TestRoutesNewOptsGetRoutes(t *testing.T) {
spl := &optsGetRoutes{
ignoreErrors: true,
maxCost: 10.0,
paginator: &utils.Paginator{},
paginator: &utils.Paginator{
Limit: utils.IntPointer(1),
Offset: utils.IntPointer(1),
},
}
sprf, err := newOptsGetRoutes(context.Background(), ev, &FilterS{}, config.CgrConfig().RouteSCfg().Opts)
if err != nil {
@@ -1502,7 +1505,10 @@ func TestRoutesNewOptsGetRoutesFromCfg(t *testing.T) {
}
spl := &optsGetRoutes{
ignoreErrors: true,
paginator: &utils.Paginator{},
paginator: &utils.Paginator{
Limit: utils.IntPointer(1),
Offset: utils.IntPointer(1),
},
}
sprf, err := newOptsGetRoutes(context.Background(), ev, &FilterS{}, config.CgrConfig().RouteSCfg().Opts)
if err != nil {
@@ -1521,7 +1527,10 @@ func TestRoutesNewOptsGetRoutesIgnoreErrors(t *testing.T) {
}
spl := &optsGetRoutes{
ignoreErrors: true,
paginator: &utils.Paginator{},
paginator: &utils.Paginator{
Limit: utils.IntPointer(1),
Offset: utils.IntPointer(1),
},
}
sprf, err := newOptsGetRoutes(context.Background(), ev, &FilterS{}, config.CgrConfig().RouteSCfg().Opts)
if err != nil {