all tests passing

This commit is contained in:
Radu Ioan Fericean
2015-02-09 20:47:44 +02:00
parent 41cb3ab7d1
commit 65a5eaf78b
2 changed files with 7 additions and 8 deletions

View File

@@ -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...)

View File

@@ -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" {