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

Merge pull request #1819 from Trial97/master

Browse Source 
Updated integration tests
This commit is contained in:
Dan Christian Bogos
2019-12-12 17:21:24 +01:00
committed by GitHub
parent 83ea2175a4 bceed9102b
commit bb7f10fb02
17 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apier/v1/apier_it_test.go
View File

@@ -1358,9 +1358,10 @@ func TestApierResetDataAfterLoadFromFolder(t *testing.T) {
expStats := engine.GetDefaultEmptyCacheStats()
expStats[utils.CacheAccountActionPlans].Items = 13
expStats[utils.CacheActionPlans].Items = 7
expStats[utils.CacheActions].Items = 6
expStats[utils.CacheActions].Items = 5
expStats[utils.CacheDestinations].Items = 3
expStats[utils.CacheLoadIDs].Items = 14
expStats[utils.CacheRPCConnections].Items = 2
if err := rater.Call(utils.CacheSv1GetCacheStats, new(utils.AttrCacheIDsWithArgDispatcher), &rcvStats); err != nil {
t.Error("Got error on CacheSv1.GetCacheStats: ", err.Error())
} else if !reflect.DeepEqual(expStats, rcvStats) {
@@ -1403,8 +1404,8 @@ func TestApierGetAccountAfterLoad(t *testing.T) {
attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"}
if err := rater.Call(utils.ApierV2GetAccount, attrs, &reply); err != nil {
t.Error("Got error on ApierV1.GetAccount: ", err.Error())
} else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 11 {
t.Errorf("Calling ApierV1.GetBalance expected: 11, received: %v \n\n for:%s", reply.BalanceMap[utils.MONETARY].GetTotalValue(), utils.ToJSON(reply))
} else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 13 {
t.Errorf("Calling ApierV1.GetBalance expected: 13, received: %v \n\n for:%s", reply.BalanceMap[utils.MONETARY].GetTotalValue(), utils.ToJSON(reply))
}
}

3
apier/v1/caches_it_test.go
View File

@@ -126,9 +126,10 @@ func testCacheSAfterLoadFromFolder(t *testing.T) {
expStats := engine.GetDefaultEmptyCacheStats()
expStats[utils.CacheAccountActionPlans].Items = 13
expStats[utils.CacheActionPlans].Items = 7
expStats[utils.CacheActions].Items = 6
expStats[utils.CacheActions].Items = 5
expStats[utils.CacheDestinations].Items = 3
expStats[utils.CacheLoadIDs].Items = 14
expStats[utils.CacheRPCConnections].Items = 2
if err := chcRPC.Call(utils.CacheSv1GetCacheStats, &utils.AttrCacheIDsWithArgDispatcher{}, &rcvStats); err != nil {
t.Error("Got error on CacheSv1.GetCacheStats: ", err.Error())
} else if !reflect.DeepEqual(expStats, rcvStats) {

2
apier/v1/cdre_it_test.go
View File

@@ -214,7 +214,7 @@ func testCDReProcessExternalCdr(t *testing.T) {
} else {
for _, c := range cdrs {
if c.RunID == utils.MetaRaw && c.Cost != -1 {
t.Errorf("Expected for *raw cdr cost to be -1, recived: %v", c.Cost)
t.Errorf("Expected for %s cdr cost to be -1, recived: %v", utils.MetaRaw, c.Cost)
}
if c.RunID == utils.MetaDefault && c.Cost != 0.3 {
t.Errorf("Expected for *default cdr cost to be 0.3, recived: %v", c.Cost)

2
data/tariffplans/testtp/ActionPlans.csv
View File

@@ -1,6 +1,6 @@
#Tag,ActionsTag,TimingTag,Weight
PREPAID_10,PREPAID_10,ASAP,10
PREPAID_10,BONUS_1,ASAP,10
PREPAID_10,BONUS_3,ASAP,10
TEST_EXE,TOPUP_EXE,ALWAYS,10
TEST_DATA_r,TOPUP_DATA_r,ASAP,10
TEST_VOICE,TOPUP_VOICE,ASAP,10
1 #Tag ActionsTag TimingTag Weight
2 PREPAID_10 PREPAID_10 ASAP 10
3 PREPAID_10 BONUS_1 BONUS_3 ASAP 10
4 TEST_EXE TOPUP_EXE ALWAYS 10
5 TEST_DATA_r TOPUP_DATA_r ASAP 10
6 TEST_VOICE TOPUP_VOICE ASAP 10

4
data/tariffplans/testtp/Actions.csv
View File

@@ -1,6 +1,6 @@
#ActionsId[0],Action[1],ExtraParameters[2],Filter[3],BalanceId[4],BalanceType[5],Categories[6],DestinationIds[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingIds[11],Units[12],BalanceWeight[13],BalanceBlocker[14],BalanceDisabled[15],Weight[16]
PREPAID_10,*topup,,,,*monetary,,*any,,,*unlimited,,10,10,false,false,10
BONUS_1,*topup,,,,*monetary,,*any,,,*unlimited,,1,10,false,false,10
PREPAID_10,*topup,,,,*monetary,,*any,,,*unlimited,,10,10,false,false,20
BONUS_3,*topup,,,,*monetary,,*any,,,*unlimited,,3,10,false,false,10
LOG_BALANCE,*log,,,,,,,,,,,,,false,false,10
CDRST_WARN_HTTP,*call_url,http://localhost:8080,,,,,,,,,,,,false,false,10
CDRST_LOG,*log,,,,,,,,,,,,,false,false,10
1 #ActionsId[0] Action[1] ExtraParameters[2] Filter[3] BalanceId[4] BalanceType[5] Categories[6] DestinationIds[7] RatingSubject[8] SharedGroup[9] ExpiryTime[10] TimingIds[11] Units[12] BalanceWeight[13] BalanceBlocker[14] BalanceDisabled[15] Weight[16]
2 PREPAID_10 *topup *monetary *any *unlimited 10 10 false false 10 20
3 BONUS_1 BONUS_3 *topup *monetary *any *unlimited 1 3 10 false false 10
4 LOG_BALANCE *log false false 10
5 CDRST_WARN_HTTP *call_url http://localhost:8080 false false 10
6 CDRST_LOG *log false false 10

1
dispatchers/caches_it_test.go
View File

@@ -93,6 +93,7 @@ func testDspChcLoadAfterFolder(t *testing.T) {
expStats[utils.CacheActions].Items = 1
expStats[utils.CacheDestinations].Items = 4
expStats[utils.CacheLoadIDs].Items = 17
expStats[utils.CacheRPCConnections].Items = 2
args := utils.AttrCacheIDsWithArgDispatcher{
ArgDispatcher: &utils.ArgDispatcher{
APIKey: utils.StringPointer("chc12345"),

12
dispatchers/sessions_it_test.go
View File

@@ -342,6 +342,7 @@ func testDspSessionUpdate(t *testing.T) {
Tenant: "cgrates.org",
ID: "TestSSv1ItUpdateSession",
Event: map[string]interface{}{
utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
@@ -381,7 +382,7 @@ func testDspSessionUpdate(t *testing.T) {
utils.SetupTime: "2018-01-07T17:00:00Z",
utils.AnswerTime: "2018-01-07T17:00:10Z",
utils.Usage: float64(reqUsage),
"CGRID": "5668666d6b8e44eb949042f25ce0796ec3592ff9",
utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf",
},
},
}
@@ -480,6 +481,7 @@ func testDspSessionTerminate(t *testing.T) {
Tenant: "cgrates.org",
ID: "TestSSv1ItUpdateSession",
Event: map[string]interface{}{
utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
@@ -516,7 +518,7 @@ func testDspSessionProcessCDR(t *testing.T) {
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginID: "TestSSv1It1",
utils.RequestType: utils.META_PREPAID,
utils.RequestType: utils.META_POSTPAID,
utils.Account: "1001",
utils.Destination: "1002",
utils.SetupTime: time.Date(2018, time.January, 7, 16, 60, 0, 0, time.UTC),
@@ -549,10 +551,11 @@ func testDspSessionProcessEvent(t *testing.T) {
Tenant: "cgrates.org",
ID: "TestSSv1ItProcessEvent",
Event: map[string]interface{}{
utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf",
utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.OriginHost: "disp",
utils.OriginID: "TestSSv1It2",
utils.RequestType: utils.META_PREPAID,
utils.Account: "1001",
@@ -584,13 +587,14 @@ func testDspSessionProcessEvent(t *testing.T) {
Tenant: "cgrates.org",
ID: "TestSSv1ItProcessEvent",
Event: map[string]interface{}{
utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebaf",
utils.CGRID: "c87609aa1cb6e9529ab1836cfeeebaab7aa7ebac",
utils.Tenant: "cgrates.org",
utils.Category: "call",
utils.ToR: utils.VOICE,
utils.Account: "1001",
utils.Destination: "1002",
"OfficeGroup": "Marketing",
utils.OriginHost: "disp",
utils.OriginID: "TestSSv1It2",
utils.RequestType: utils.META_PREPAID,
utils.SetupTime: "2018-01-07T17:00:00Z",

1
engine/action.go
View File

@@ -1063,7 +1063,6 @@ func resetAccount(ub *Account, action *Action, acts Actions, _ interface{}) erro
}
account := ub.GetID()
filter := &utils.CDRsFilter{
NotRunIDs: []string{utils.MetaRaw},
Accounts: []string{account},
NotCosts: []float64{-1},
OrderBy: fmt.Sprintf("%s%sdesc", utils.OrderID, utils.INFIELD_SEP),

2
engine/cdr.go
View File

@@ -112,7 +112,7 @@ func (cdr *CDR) AddDefaults(cfg *config.CGRConfig) {
cdr.ComputeCGRID()
}
if cdr.RunID == utils.EmptyString {
cdr.RunID = utils.MetaRaw
cdr.RunID = utils.MetaDefault
}
if cdr.ToR == utils.EmptyString {
cdr.ToR = utils.VOICE

2
engine/cdr_test.go
View File

@@ -1093,7 +1093,7 @@ func TestCDRAddDefaults(t *testing.T) {
eCDR := &CDR{
CGRID: "bf736fb56ce586357ab2f286b777187a1612c6e6",
ToR: utils.VOICE,
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
Subject: "1001",
RequestType: utils.META_RATED,
Tenant: "cgrates.org",

2
engine/mapevent.go
View File

@@ -180,7 +180,7 @@ func (me MapEvent) AsMapString(ignoredFlds *utils.StringSet) (mp map[string]stri
return
}
// AsCDR exports the SafEvent as CDR
// AsCDR exports the MapEvent as CDR
func (me MapEvent) AsCDR(cfg *config.CGRConfig, tnt, tmz string) (cdr *CDR, err error) {
cdr = &CDR{Tenant: tnt, Cost: -1.0, ExtraFields: make(map[string]string)}
for k, v := range me {

6
engine/mapevent_test.go
View File

@@ -289,7 +289,7 @@ func TestMapEventAsCDR(t *testing.T) {
expected = &CDR{
CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709",
Cost: -1.0,
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Tenant: cfg.GeneralCfg().DefaultTenant,
@@ -362,7 +362,7 @@ func TestMapEventAsCDR(t *testing.T) {
"ExtraField1": "5",
"ExtraField2": "extra",
},
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Tenant: cfg.GeneralCfg().DefaultTenant,
@@ -618,7 +618,7 @@ func TestMapEventAsCDR(t *testing.T) {
"ExtraField1": "5",
"ExtraField2": "extra",
},
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Category: cfg.GeneralCfg().DefaultCategory,

6
engine/safevent_test.go
View File

@@ -647,7 +647,7 @@ func TestSafEventAsCDR(t *testing.T) {
expected = &CDR{
CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709",
Cost: -1.0,
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Tenant: cfg.GeneralCfg().DefaultTenant,
@@ -710,7 +710,7 @@ func TestSafEventAsCDR(t *testing.T) {
"ExtraField1": "5",
"ExtraField2": "extra",
},
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Tenant: cfg.GeneralCfg().DefaultTenant,
@@ -744,7 +744,7 @@ func TestSafEventAsCDR(t *testing.T) {
"ExtraField1": "5",
"ExtraField2": "extra",
},
RunID: utils.MetaRaw,
RunID: utils.MetaDefault,
ToR: utils.VOICE,
RequestType: cfg.GeneralCfg().DefaultReqType,
Category: cfg.GeneralCfg().DefaultCategory,

2
general_tests/cdrs_it_test.go
View File

@@ -338,7 +338,7 @@ func testV2CDRsGetCdrs3(t *testing.T) {
t.Error("Unexpected number of CDRs returned: ", cdrCnt)
}
var cdrs []*engine.ExternalCDR
args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, OriginIDs: []string{"testV2CDRsProcessCDR3"}}
args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaDefault}, OriginIDs: []string{"testV2CDRsProcessCDR3"}}
if err := cdrsRpc.Call(utils.ApierV2GetCDRs, args, &cdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(cdrs) != 1 {

4
general_tests/rpccaching_it_test.go
View File

@@ -548,7 +548,7 @@ func testRPCMethodsProcessCDR(t *testing.T) {
time.Sleep(100 * time.Millisecond)
//verify the CDR
var cdrs []*engine.CDR
argsCDR := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}}
argsCDR := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaDefault}}}
if err := rpcRpc.Call(utils.CDRsV1GetCDRs, argsCDR, &cdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(cdrs) != 1 {
@@ -714,7 +714,7 @@ func testRPCMethodsCdrsProcessCDR(t *testing.T) {
time.Sleep(time.Duration(150) * time.Millisecond) // Give time for CDR to be rated
//verify the CDR
var cdrs []*engine.CDR
argsCDR := utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}}
argsCDR := utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaDefault}}}
if err := rpcRpc.Call(utils.CDRsV1GetCDRs, argsCDR, &cdrs); err != nil {
t.Error("Unexpected error: ", err.Error())
} else if len(cdrs) != 1 {

1
utils/apitpdata.go
View File

@@ -525,7 +525,6 @@ func (aefc *AttrExpFileCdrs) AsCDRsFilter(timezone string) (*CDRsFilter, error)
cdrFltr := &CDRsFilter{
CGRIDs: aefc.CgrIds,
RunIDs: aefc.MediationRunIds,
NotRunIDs: []string{MetaRaw}, // In exportv1 automatically filter out *raw CDRs
ToRs: aefc.TORs,
OriginHosts: aefc.CdrHosts,
Sources: aefc.CdrSources,

1
utils/apitpdata_test.go
View File

@@ -374,7 +374,6 @@ func TestAttrExpFileCdrsAsCDRsFilter(t *testing.T) {
eOut := &CDRsFilter{
CGRIDs: attrExpFileCdrs.CgrIds,
RunIDs: attrExpFileCdrs.MediationRunIds,
NotRunIDs: []string{MetaRaw},
ToRs: attrExpFileCdrs.TORs,
OriginHosts: attrExpFileCdrs.CdrHosts,
Sources: attrExpFileCdrs.CdrSources,