From 65a5eaf78b1271cbcdf0822ef2bd9d6e4f81f975 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Mon, 9 Feb 2015 20:47:44 +0200 Subject: [PATCH] all tests passing --- engine/account.go | 5 ++--- engine/account_test.go | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/engine/account.go b/engine/account.go index e0f0bde38..4b01a213e 100644 --- a/engine/account.go +++ b/engine/account.go @@ -262,11 +262,10 @@ func (ub *Account) debitCreditBalance(cd *CallDescriptor, count bool, dryRun boo moneyBalanceChecker = false for _, balance := range usefulMoneyBalances { //log.Printf("Money balance: %+v", balance) - //log.Printf("CD BEFORE MONEY: %+v", cd.test_callcost) + //log.Printf("CD BEFORE MONEY: %+v", cd) partCC, _ := balance.DebitMoney(cd, count, balance.account) - //log.Printf("CD AFTER MONEY: %+v", cd.test_callcost) + //log.Printf("CD AFTER MONEY: %+v", cd) //log.Printf("partCC: %+v", partCC) - //log.Printf("CD: %+v", cd) if partCC != nil { initialLength = len(cc.Timespans) cc.Timespans = append(cc.Timespans, partCC.Timespans...) diff --git a/engine/account_test.go b/engine/account_test.go index 3c3ecf30e..a8809d8bb 100644 --- a/engine/account_test.go +++ b/engine/account_test.go @@ -1162,10 +1162,10 @@ func TestDebitShared(t *testing.T) { test_callcost: cc, } rif := &Account{Id: "rif", BalanceMap: map[string]BalanceChain{ - CREDIT + OUTBOUND: BalanceChain{&Balance{Uuid: "moneya", Value: 60, SharedGroup: "SG_TEST"}}, + CREDIT + OUTBOUND: BalanceChain{&Balance{Uuid: "moneya", Value: 0, SharedGroup: "SG_TEST"}}, }} groupie := &Account{Id: "groupie", BalanceMap: map[string]BalanceChain{ - CREDIT + OUTBOUND: BalanceChain{&Balance{Uuid: "moneyc", Value: 70, SharedGroup: "SG_TEST"}}, + CREDIT + OUTBOUND: BalanceChain{&Balance{Uuid: "moneyc", Value: 130, SharedGroup: "SG_TEST"}}, }} sg := &SharedGroup{Id: "SG_TEST", MemberIds: []string{rif.Id, groupie.Id}, AccountParameters: map[string]*SharingParameters{"*any": &SharingParameters{Strategy: STRATEGY_MINE_RANDOM}}} @@ -1194,9 +1194,9 @@ func TestDebitShared(t *testing.T) { t.Errorf("I%d: %+v (%+v)", index, incr, incr.BalanceInfo) } } - if cc.Timespans[0].Increments[0].BalanceInfo.AccountId != "rif" || - cc.Timespans[0].Increments[1].BalanceInfo.AccountId != "rif" || - cc.Timespans[0].Increments[2].BalanceInfo.AccountId != "rif" || + if cc.Timespans[0].Increments[0].BalanceInfo.AccountId != "groupie" || + cc.Timespans[0].Increments[1].BalanceInfo.AccountId != "groupie" || + cc.Timespans[0].Increments[2].BalanceInfo.AccountId != "groupie" || cc.Timespans[0].Increments[3].BalanceInfo.AccountId != "groupie" || cc.Timespans[0].Increments[4].BalanceInfo.AccountId != "groupie" || cc.Timespans[0].Increments[5].BalanceInfo.AccountId != "groupie" {