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

Update with consts in tests

Browse Source
This commit is contained in:
TeoV
2020-02-24 13:33:06 +02:00
committed by Dan Christian Bogos
parent 78754f8909
commit c88c687605
9 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apier/v1/filter_indexes_it_test.go
View File

@@ -158,7 +158,7 @@ func testV1FIdxSetThresholdProfile(t *testing.T) {
Tenant: tenant,
ID: "TestFilter",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
}},
@@ -252,7 +252,7 @@ func testV1FIdxSetSecondThresholdProfile(t *testing.T) {
Tenant: tenant,
ID: "TestFilter2",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1002"},
}},
@@ -417,7 +417,7 @@ func testV1FIdxSetStatQueueProfileIndexes(t *testing.T) {
Tenant: tenant,
ID: "FLTR_1",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
}},
@@ -451,10 +451,10 @@ func testV1FIdxSetStatQueueProfileIndexes(t *testing.T) {
TTL: time.Duration(10) * time.Second,
Metrics: []*engine.MetricWithFilters{
&engine.MetricWithFilters{
MetricID: "*sum",
MetricID: utils.MetaSum,
},
&engine.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
},
},
ThresholdIDs: []string{"Val1", "Val2"},
@@ -520,7 +520,7 @@ func testV1FIdxSetSecondStatQueueProfileIndexes(t *testing.T) {
Tenant: tenant,
ID: "FLTR_2",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
}},
@@ -557,7 +557,7 @@ func testV1FIdxSetSecondStatQueueProfileIndexes(t *testing.T) {
MetricID: "*sum",
},
&engine.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
},
},
ThresholdIDs: []string{"Val1", "Val2"},
@@ -666,7 +666,7 @@ func testV1FIdxSetResourceProfileIndexes(t *testing.T) {
Tenant: tenant,
ID: "FLTR_RES_RCFG1",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
}},
@@ -759,7 +759,7 @@ func testV1FIdxSetSecondResourceProfileIndexes(t *testing.T) {
Tenant: tenant,
ID: "FLTR_2",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
}},
@@ -895,7 +895,7 @@ func testV1FIdxSetSupplierProfileIndexes(t *testing.T) {
ID: "FLTR_1",
Rules: []*engine.FilterRule{
{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
},
@@ -994,7 +994,7 @@ func testV1FIdxSetSecondSupplierProfileIndexes(t *testing.T) {
Tenant: tenant,
ID: "FLTR_2",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
}},
@@ -1137,7 +1137,7 @@ func testV1FIdxSetAttributeProfileIndexes(t *testing.T) {
Tenant: tenant,
ID: "FLTR_1",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
}},
@@ -1245,7 +1245,7 @@ func testV1FIdxSetSecondAttributeProfileIndexes(t *testing.T) {
Tenant: tenant,
ID: "FLTR_2",
Rules: []*engine.FilterRule{{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
}},

6
apier/v1/remote_it_test.go
View File

@@ -470,7 +470,7 @@ func testInternalRemoteITGetFilter(t *testing.T) {
Rules: []*engine.FilterRule{
{
Type: utils.MetaString,
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Values: []string{"1001"},
},
},
@@ -1044,10 +1044,10 @@ func testInternalReplicateStats(t *testing.T) {
TTL: time.Duration(10) * time.Second,
Metrics: []*engine.MetricWithFilters{
&engine.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
},
&engine.MetricWithFilters{
MetricID: "*tcd",
MetricID: utils.MetaTCD,
},
},
ThresholdIDs: []string{"*none"},

28
apier/v1/stats_it_test.go
View File

@@ -340,7 +340,7 @@ func testV1STSSetStatQueueProfile(t *testing.T) {
ID: "FLTR_1",
Rules: []*engine.FilterRule{
{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
},
@@ -375,10 +375,10 @@ func testV1STSSetStatQueueProfile(t *testing.T) {
TTL: time.Duration(10) * time.Second,
Metrics: []*engine.MetricWithFilters{
&engine.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
},
&engine.MetricWithFilters{
MetricID: "*tcd",
MetricID: utils.MetaTCD,
},
},
ThresholdIDs: []string{"Val1", "Val2"},
@@ -420,7 +420,7 @@ func testV1STSUpdateStatQueueProfile(t *testing.T) {
ID: "FLTR_2",
Rules: []*engine.FilterRule{
{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001"},
},
@@ -483,15 +483,15 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
TTL: time.Duration(1) * time.Second,
Metrics: []*engine.MetricWithFilters{
&engine.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
FilterIDs: []string{"*rsr::~*req.Usage{*duration}(>10s)"},
},
&engine.MetricWithFilters{
MetricID: "*tcd",
MetricID: utils.MetaTCD,
FilterIDs: []string{"*gt:~*req.Usage:5s"},
},
&engine.MetricWithFilters{
MetricID: "*sum:~*req.CustomValue",
MetricID: utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"),
FilterIDs: []string{"*exists:~*req.CustomValue:", "*gte:~*req.CustomValue:10.0"},
},
},
@@ -523,7 +523,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
expectedMetrics := map[string]string{
utils.MetaACD: utils.NOT_AVAILABLE,
utils.MetaTCD: utils.NOT_AVAILABLE,
utils.ConcatenatedKey(utils.MetaSum, "~*req.CustomValue"): utils.NOT_AVAILABLE,
utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"): utils.NOT_AVAILABLE,
}
if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
&utils.TenantIDWithArgDispatcher{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: expectedIDs[0]}}, &metrics); err != nil {
@@ -551,7 +551,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
expectedMetrics = map[string]string{
utils.MetaACD: utils.NOT_AVAILABLE,
utils.MetaTCD: "6s",
utils.ConcatenatedKey(utils.MetaSum, "~*req.CustomValue"): utils.NOT_AVAILABLE,
utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"): utils.NOT_AVAILABLE,
}
if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
&utils.TenantIDWithArgDispatcher{
@@ -578,7 +578,7 @@ func testV1STSProcessMetricsWithFilter(t *testing.T) {
expectedMetrics = map[string]string{
utils.MetaACD: "12s",
utils.MetaTCD: "18s",
utils.ConcatenatedKey(utils.MetaSum, "~*req.CustomValue"): "10",
utils.ConcatenatedKey(utils.MetaSum, utils.DynamicDataPrefix+utils.MetaReq+utils.NestingSep+"CustomValue"): "10",
}
if err := stsV1Rpc.Call(utils.StatSv1GetQueueStringMetrics,
&utils.TenantIDWithArgDispatcher{
@@ -602,10 +602,10 @@ func testV1STSProcessStaticMetrics(t *testing.T) {
TTL: time.Duration(1) * time.Second,
Metrics: []*engine.MetricWithFilters{
&engine.MetricWithFilters{
MetricID: "*sum:1",
MetricID: utils.ConcatenatedKey(utils.MetaSum, "1"),
},
&engine.MetricWithFilters{
MetricID: "*average:2",
MetricID: utils.ConcatenatedKey(utils.MetaAverage, "2"),
},
},
ThresholdIDs: []string{"*none"},
@@ -707,10 +707,10 @@ func testV1STSProcessStatWithThreshold(t *testing.T) {
TTL: time.Duration(1) * time.Second,
Metrics: []*engine.MetricWithFilters{
&engine.MetricWithFilters{
MetricID: "*tcd",
MetricID: utils.MetaTCD,
},
&engine.MetricWithFilters{
MetricID: "*sum:2",
MetricID: utils.ConcatenatedKey(utils.MetaSum, "2"),
},
},
Stored: true,

4
engine/loader_csv_test.go
View File

@@ -1151,7 +1151,7 @@ func TestLoadFilters(t *testing.T) {
ID: "FLTR_1",
Filters: []*utils.TPFilter{
&utils.TPFilter{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"1001", "1002"},
},
@@ -1176,7 +1176,7 @@ func TestLoadFilters(t *testing.T) {
ID: "FLTR_ACNT_dan",
Filters: []*utils.TPFilter{
&utils.TPFilter{
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Type: utils.MetaString,
Values: []string{"dan"},
},

4
engine/stordb_it_test.go
View File

@@ -1122,7 +1122,7 @@ func testStorDBitCRUDTpStats(t *testing.T) {
MetricID: "*asr",
},
&utils.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
},
}
if err := storDB.SetTPStats(eTPs); err != nil {
@@ -1141,7 +1141,7 @@ func testStorDBitCRUDTpStats(t *testing.T) {
TTL: "1s",
Metrics: []*utils.MetricWithFilters{
&utils.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
},
&utils.MetricWithFilters{
MetricID: "*asr",

6
migrator/filters_it_test.go
View File

@@ -150,7 +150,7 @@ func testFltrITMigrateAndMove(t *testing.T) {
Rules: []*engine.FilterRule{
&engine.FilterRule{
Type: utils.MetaPrefix,
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Values: []string{"1001"},
},
},
@@ -307,7 +307,7 @@ func testFltrITMigratev2(t *testing.T) {
Rules: []*engine.FilterRule{
&engine.FilterRule{
Type: utils.MetaString,
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Values: []string{"1001"},
},
&engine.FilterRule{
@@ -445,7 +445,7 @@ func testFltrITMigratev3(t *testing.T) {
Rules: []*engine.FilterRule{
&engine.FilterRule{
Type: utils.MetaString,
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Values: []string{"1001"},
},
&engine.FilterRule{

6
migrator/filters_test.go
View File

@@ -80,7 +80,7 @@ func TestFiltersMigrate(t *testing.T) {
Rules: []*engine.FilterRule{
&engine.FilterRule{
Type: utils.MetaString,
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Values: []string{},
},
},
@@ -141,7 +141,7 @@ func TestFiltersMigrateV2(t *testing.T) {
Rules: []*engine.FilterRule{
&engine.FilterRule{
Type: utils.MetaString,
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Values: []string{},
},
},
@@ -165,7 +165,7 @@ func TestFiltersMigrateV2(t *testing.T) {
Rules: []*engine.FilterRule{
&engine.FilterRule{
Type: utils.MetaPrefix,
Element: "~*req.Account",
Element: utils.DynamicDataPrefix + utils.MetaReq + utils.NestingSep + utils.Account,
Values: []string{},
},
},

2
migrator/stats_it_test.go
View File

@@ -206,7 +206,7 @@ func testStsITMigrateAndMove(t *testing.T) {
MetricID: "*asr",
},
&engine.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
},
&engine.MetricWithFilters{
MetricID: "*acc",

2
migrator/stats_test.go
View File

@@ -96,7 +96,7 @@ func TestV1StatsAsStats(t *testing.T) {
MetricID: "*asr",
},
&engine.MetricWithFilters{
MetricID: "*acd",
MetricID: utils.MetaACD,
},
&engine.MetricWithFilters{
MetricID: "*acc",