test for *any timing

This commit is contained in:
Radu Ioan Fericean
2015-06-11 13:58:06 +03:00
parent 8bfa0997bd
commit f13cdab64d
2 changed files with 28 additions and 2 deletions

View File

@@ -114,6 +114,7 @@ RP_UK,DR_UK_Mobile_BIG5,ALWAYS,10
RP_DATA,DATA_RATE,ALWAYS,10
RP_MX,MX_DISC,WORKDAYS_00,10
RP_MX,MX_FREE,WORKDAYS_18,10
ANY_PLAN,DATA_RATE,*any,10
`
ratingProfiles = `
*out,CUSTOMER_1,0,rif:from:tm,2012-01-01T00:00:00Z,PREMIUM,danb,
@@ -576,7 +577,7 @@ func TestLoadDestinationRates(t *testing.T) {
}
func TestLoadRatingPlans(t *testing.T) {
if len(csvr.ratingPlans) != 11 {
if len(csvr.ratingPlans) != 12 {
t.Error("Failed to load rating plans: ", len(csvr.ratingPlans))
}
rplan := csvr.ratingPlans["STANDARD"]
@@ -731,6 +732,20 @@ func TestLoadRatingPlans(t *testing.T) {
log.Print(tag, key)
}*/
}
anyTiming := &RITiming{
Years: utils.Years{},
Months: utils.Months{},
MonthDays: utils.MonthDays{},
WeekDays: utils.WeekDays{},
StartTime: "00:00:00",
EndTime: "",
cronString: "",
tag: utils.ANY,
}
if !reflect.DeepEqual(csvr.ratingPlans["ANY_PLAN"].Timings["1323e132"], anyTiming) {
t.Errorf("Error using *any timing in rating plans: %+v : %+v", csvr.ratingPlans["ANY_PLAN"].Timings["1323e132"], anyTiming)
}
}
func TestLoadRatingProfiles(t *testing.T) {

View File

@@ -36,7 +36,7 @@ type TpReader struct {
}
func NewTpReader(rs RatingStorage, as AccountingStorage, lr LoadReader, tpid string) *TpReader {
return &TpReader{
tpr := &TpReader{
tpid: tpid,
ratingStorage: rs,
accountingStorage: as,
@@ -58,6 +58,17 @@ func NewTpReader(rs RatingStorage, as AccountingStorage, lr LoadReader, tpid str
cdrStats: make(map[string]*CdrStats),
derivedChargers: make(map[string]utils.DerivedChargers),
}
//add *any timing tag (in case of no timings file)
tpr.timings[utils.ANY] = &utils.TPTiming{
TimingId: utils.ANY,
Years: utils.Years{},
Months: utils.Months{},
MonthDays: utils.MonthDays{},
WeekDays: utils.WeekDays{},
StartTime: "00:00:00",
EndTime: "",
}
return tpr
}
func (tpr *TpReader) LoadDestinationsFiltered(tag string) (bool, error) {