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

Fixed chargers tests

Browse Source
This commit is contained in:
porosnicuadrian
2022-01-10 09:30:20 +02:00
committed by Dan Christian Bogos
parent 47d6d132a6
commit b2e84bfdf0
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apis/chargers_it_test.go
View File

@@ -486,7 +486,7 @@ func testChgrsProcessEvent(t *testing.T) {
expected := &[]*engine.ChrgSProcessEventReply{
{
ChargerSProfile: "TEST_CHARGERS_IT_TEST",
AlteredFields: []string{"*opts.*runID"},
AlteredFields: []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID},
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "eventCharger",
@@ -495,8 +495,9 @@ func testChgrsProcessEvent(t *testing.T) {
utils.Destination: "1002",
},
APIOpts: map[string]interface{}{
"*subsys": "*chargers",
utils.MetaRunID: utils.MetaDefault,
utils.MetaChargeID: utils.UUIDSha1Prefix(),
"*subsys": "*chargers",
utils.MetaRunID: utils.MetaDefault,
},
},
},
@@ -514,8 +515,11 @@ func testChgrsProcessEvent(t *testing.T) {
if err := chgrsSRPC.Call(context.Background(), utils.ChargerSv1ProcessEvent,
cgrEv, &reply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(reply, expected) {
t.Errorf("\nExpected %+v, \nreceived %+v", utils.ToJSON(expected), utils.ToJSON(reply))
} else {
(*reply)[0].CGREvent.APIOpts[utils.MetaChargeID] = (*expected)[0].CGREvent.APIOpts[utils.MetaChargeID]
if !reflect.DeepEqual(reply, expected) {
t.Errorf("\nExpected %+v, \nreceived %+v", utils.ToJSON(expected), utils.ToJSON(reply))
}
}
}

2
engine/chargers.go
View File

@@ -117,7 +117,7 @@ func (cS *ChargerS) processEvent(ctx *context.Context, tnt string, cgrEv *utils.
rply[i] = &ChrgSProcessEventReply{
ChargerSProfile: cP.ID,
CGREvent: clonedEv,
AlteredFields: []string{utils.MetaOptsRunID, utils.MetaChargeID},
AlteredFields: []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID},
}
if len(cP.AttributeIDs) == 1 && cP.AttributeIDs[0] == utils.MetaNone {
continue // AttributeS disabled

3
engine/chargers_test.go
View File

@@ -452,7 +452,7 @@ func TestChargerProcessEvent(t *testing.T) {
rpl := []*ChrgSProcessEventReply{
{
ChargerSProfile: "CPP_1",
AlteredFields: []string{utils.MetaOptsRunID},
AlteredFields: []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID},
CGREvent: chargerEvents[0],
},
}
@@ -461,6 +461,7 @@ func TestChargerProcessEvent(t *testing.T) {
if err != nil {
t.Fatalf("Error: %+v", err)
}
rpl[0].CGREvent.APIOpts[utils.MetaChargeID] = rcv[0].CGREvent.APIOpts[utils.MetaChargeID]
if !reflect.DeepEqual(rpl[0], rcv[0]) {
t.Errorf("Expecting: %+v, received: %+v ", utils.ToJSON(rpl[0]), utils.ToJSON(rcv[0]))
}

8
engine/z_chargers_test.go
View File

@@ -148,7 +148,7 @@ func TestChargersprocessEventCallNilErr(t *testing.T) {
exp := []*ChrgSProcessEventReply{
{
ChargerSProfile: "1001",
AlteredFields: []string{utils.MetaOptsRunID, utils.AccountField},
AlteredFields: []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID, utils.AccountField},
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "cgrEvID",
@@ -224,7 +224,7 @@ func TestChargersprocessEventCallErr(t *testing.T) {
exp := []*ChrgSProcessEventReply{
{
ChargerSProfile: "1001",
AlteredFields: []string{utils.MetaOptsRunID},
AlteredFields: []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID},
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "cgrEvID",
@@ -245,7 +245,7 @@ func TestChargersprocessEventCallErr(t *testing.T) {
if err != nil {
t.Errorf("\nexpected: <%+v>, \nreceived: <%+v>", nil, err)
}
exp[0].CGREvent.APIOpts[utils.MetaChargeID] = rcv[0].CGREvent.APIOpts[utils.MetaChargeID]
if !reflect.DeepEqual(exp, rcv) {
t.Errorf("\nexpected: <%+v>, \nreceived: <%+v>",
utils.ToJSON(exp), utils.ToJSON(rcv))
@@ -463,7 +463,7 @@ func TestChargersV1ProcessEvent(t *testing.T) {
exp := &[]*ChrgSProcessEventReply{
{
ChargerSProfile: "1001",
AlteredFields: []string{utils.MetaOptsRunID, utils.AccountField},
AlteredFields: []string{utils.MetaOptsRunID, utils.MetaOpts + utils.NestingSep + utils.MetaChargeID, utils.AccountField},
CGREvent: &utils.CGREvent{
Tenant: "cgrates.org",
ID: "cgrEvID",