From e6eb2439f158fd6e1df44b71175798d67fdf3c45 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Thu, 31 Mar 2016 20:25:51 +0300 Subject: [PATCH] tests end session after no credit --- data/tariffplans/testtp/DerivedChargers.csv | 2 +- sessionmanager/data_it_test.go | 10 +++++----- sessionmanager/smgeneric.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/tariffplans/testtp/DerivedChargers.csv b/data/tariffplans/testtp/DerivedChargers.csv index ff24c376d..5493da35d 100644 --- a/data/tariffplans/testtp/DerivedChargers.csv +++ b/data/tariffplans/testtp/DerivedChargers.csv @@ -3,4 +3,4 @@ *out,cgrates.org,call,dan,dan,,extra2,,,,,,^ivo,^ivo,,,,,,*default,*default,*default,*default *out,cgrates.org,call,dan,dan,,extra3,~filterhdr1:s/(.+)/special_run3/,,,,,^runusr3,^runusr3,,,,,,*default,*default,*default,*default *out,cgrates.org,call,dan,*any,,extra1,,,,,,^rif2,^rif2,,,,,,*default,*default,*default,*default -*out,cgrates.org,call,1011,1011,GERMANY,extra1,,,+4915,,,,,,,,,,*default,*default,*default,*default \ No newline at end of file +*out,cgrates.org,call,1011,1011,GERMANY,extra1,,,,,,,,^+4915,,,,,*default,*default,*default,*default \ No newline at end of file diff --git a/sessionmanager/data_it_test.go b/sessionmanager/data_it_test.go index a31f1048d..08b701df8 100644 --- a/sessionmanager/data_it_test.go +++ b/sessionmanager/data_it_test.go @@ -349,10 +349,10 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) { } var acnt *engine.Account attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1011"} - eAcntVal := 50000.000000 + eAcntVal := 50000.0 if err := smgRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) } smgEv := SMGenericEvent{ @@ -374,13 +374,13 @@ func TestSMGDataDerivedChargingNoCredit(t *testing.T) { if err := smgRPC.Call("SMGenericV1.SessionStart", smgEv, &maxUsage); err != nil { t.Error(err) } - if maxUsage != 100 { + if maxUsage != 0 { t.Error("Bad max usage: ", maxUsage) } - eAcntVal = 50000.000000 + eAcntVal = 50000.0 if err := smgRPC.Call("ApierV2.GetAccount", attrs, &acnt); err != nil { t.Error(err) - } else if acnt.BalanceMap[utils.DATA].GetTotalValue() != eAcntVal { + } else if acnt.BalanceMap[utils.VOICE].GetTotalValue() != eAcntVal { t.Errorf("Expected: %f, received: %f", eAcntVal, acnt.BalanceMap[utils.VOICE].GetTotalValue()) } } diff --git a/sessionmanager/smgeneric.go b/sessionmanager/smgeneric.go index 3ebf05e63..64e839e75 100644 --- a/sessionmanager/smgeneric.go +++ b/sessionmanager/smgeneric.go @@ -245,7 +245,7 @@ func (self *SMGeneric) SessionStart(gev SMGenericEvent, clnt *rpc2.Client) (time return nilDuration, err } d, err := self.SessionUpdate(gev, clnt) - if err != nil { + if err != nil || d == 0 { self.sessionEnd(gev.GetUUID(), 0) } return d, err