From dca2c4b6a16f7bbb36b3656f442d6b30c66d79b5 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Tue, 23 Jan 2024 08:04:43 -0500 Subject: [PATCH] Revise unit tests following the blocker update --- engine/account_test.go | 11 ++++------- engine/calldesc_test.go | 16 ++++++++-------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/engine/account_test.go b/engine/account_test.go index 018ab0707..27dca9925 100644 --- a/engine/account_test.go +++ b/engine/account_test.go @@ -271,13 +271,10 @@ func TestDebitCreditBlocker(t *testing.T) { } rifsBalance := &Account{ID: "other", BalanceMap: map[string]Balances{utils.MetaMonetary: {b1, b2}}} - var err error - cc, err = rifsBalance.debitCreditBalance(cd, false, true, true, nil) - if err != nil { - t.Fatal("Error debiting balance: ", err) - } - if len(cc.Timespans) != 0 { - t.Error("Wrong call cost: ", utils.ToJSON(cc)) + expectedErr := "insufficient credit with balance Blocker" + _, err := rifsBalance.debitCreditBalance(cd, false, true, true, nil) + if err == nil || err.Error() != expectedErr { + t.Fatalf("expected %v, received %v", expectedErr, err) } if rifsBalance.BalanceMap[utils.MetaMonetary][0].GetValue() != 0.1152 || rifsBalance.BalanceMap[utils.MetaMonetary][1].GetValue() != 1.5 { diff --git a/engine/calldesc_test.go b/engine/calldesc_test.go index 9635970f3..f286e3ecb 100644 --- a/engine/calldesc_test.go +++ b/engine/calldesc_test.go @@ -764,10 +764,10 @@ func TestGetMaxSessiontWithBlocker(t *testing.T) { TimeEnd: time.Date(2016, 1, 13, 14, 30, 0, 0, time.UTC), MaxCostSoFar: 0, } + expectedErr := "insufficient credit with balance Blocker" result, err := cd.GetMaxSessionDuration(nil) - expected := 17 * time.Minute - if result != expected || err != nil { - t.Errorf("Expected %v was %v (%v)", expected, result, err) + if result != 0 || err == nil || err.Error() != expectedErr { + t.Errorf("expected %v, received %v", expectedErr, err) } cd = &CallDescriptor{ Category: "call", @@ -780,7 +780,7 @@ func TestGetMaxSessiontWithBlocker(t *testing.T) { MaxCostSoFar: 0, } result, err = cd.GetMaxSessionDuration(nil) - expected = 30 * time.Minute + expected := 30 * time.Minute if result != expected || err != nil { t.Errorf("Expected %v was %v (%v)", expected, result, err) } @@ -813,10 +813,10 @@ func TestGetMaxSessiontWithBlockerEmpty(t *testing.T) { TimeEnd: time.Date(2016, 1, 13, 14, 30, 0, 0, time.UTC), MaxCostSoFar: 0, } + expectedErr := "insufficient credit with balance Blocker" result, err := cd.GetMaxSessionDuration(nil) - expected := 0 * time.Minute - if result != expected || err != nil { - t.Errorf("Expected %v was %v (%v)", expected, result, err) + if result != 0 || err == nil || err.Error() != expectedErr { + t.Errorf("expected %v, received %v", expectedErr, err) } cd = &CallDescriptor{ Category: "call", @@ -829,7 +829,7 @@ func TestGetMaxSessiontWithBlockerEmpty(t *testing.T) { MaxCostSoFar: 0, } result, err = cd.GetMaxSessionDuration(nil) - expected = 30 * time.Minute + expected := 30 * time.Minute if result != expected || err != nil { t.Errorf("Expected %v was %v (%v)", expected, result, err) }