From 5aef6595a2c8e947b55ae1895ff809aaa9890b34 Mon Sep 17 00:00:00 2001 From: DanB Date: Mon, 19 May 2014 18:03:40 +0200 Subject: [PATCH] Fixup local tests regarding AttrGetAccount --- apier/apier_local_test.go | 12 ++++++------ apier/tutfscsv_local_test.go | 4 ++-- apier/tutfsjson_local_test.go | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/apier/apier_local_test.go b/apier/apier_local_test.go index 7bccf922c..11adc4753 100644 --- a/apier/apier_local_test.go +++ b/apier/apier_local_test.go @@ -1168,32 +1168,32 @@ func TestApierGetAccount(t *testing.T) { return } var reply *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 11.5 { // We expect 11.5 since we have added in the previous test 1.5 t.Errorf("Calling ApierV1.GetBalance expected: 11.5, received: %f", reply) } - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan", Direction: "*out"} + attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 1.5 { t.Errorf("Calling ApierV1.GetAccount expected: 1.5, received: %f", reply) } // The one we have topped up though executeAction - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan2", Direction: "*out"} + attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan2", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 10 { t.Errorf("Calling ApierV1.GetAccount expected: 10, received: %f", reply) } - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan3", Direction: "*out"} + attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan3", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 3.6 { t.Errorf("Calling ApierV1.GetAccount expected: 3.6, received: %f", reply) } - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "dan6", Direction: "*out"} + attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "dan6", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 1 { @@ -1290,7 +1290,7 @@ func TestApierGetAccountAfterLoad(t *testing.T) { return } var reply *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 11 { diff --git a/apier/tutfscsv_local_test.go b/apier/tutfscsv_local_test.go index d862401b8..81316137f 100644 --- a/apier/tutfscsv_local_test.go +++ b/apier/tutfscsv_local_test.go @@ -182,7 +182,7 @@ func TestFsCsvGetAccount(t *testing.T) { return } var reply *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 10.0 { // We expect 11.5 since we have added in the previous test 1.5 @@ -222,7 +222,7 @@ func TestFsCsvCall1(t *testing.T) { } // Make sure the account was debited correctly for the first loop index (ConnectFee included) var reply *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else if reply.BalanceMap[engine.CREDIT+attrs.Direction].GetTotalValue() != 9.4 { // We expect 11.5 since we have added in the previous test 1.5 diff --git a/apier/tutfsjson_local_test.go b/apier/tutfsjson_local_test.go index 70ea86210..8bbb4c1f0 100644 --- a/apier/tutfsjson_local_test.go +++ b/apier/tutfsjson_local_test.go @@ -183,7 +183,7 @@ func TestFsJsonGetAccount1001(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } @@ -208,7 +208,7 @@ func TestFsJsonGetAccount1002(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1002", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1002", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } @@ -229,7 +229,7 @@ func TestFsJsonGetAccount1003(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1003", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1003", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } @@ -250,7 +250,7 @@ func TestFsJsonGetAccount1004(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1004", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1004", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } @@ -271,7 +271,7 @@ func TestFsJsonGetAccount1006(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1006", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1006", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err == nil { t.Error("Got no error when querying unexisting balance") } @@ -282,7 +282,7 @@ func TestFsJsonGetAccount1007(t *testing.T) { return } var acnt *engine.Account - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1007", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1007", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } @@ -403,7 +403,7 @@ func TestMaxDebit1001(t *testing.T) { } else if cc.GetDuration() > time.Duration(1)*time.Minute { t.Errorf("Unexpected call duration received: %v", cc.GetDuration()) } - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else { @@ -443,7 +443,7 @@ func TestMaxDebit1007(t *testing.T) { t.Errorf("Unexpected call duration received: %v", cc.GetDuration()) } // Debit out of shared balance should reflect in the 1001 instead of 1007 - attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} + attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) } else { @@ -460,7 +460,7 @@ func TestMaxDebit1007(t *testing.T) { } } // Make sure 1007 remains the same - attrs = &AttrGetAccount{Tenant: "cgrates.org", Account: "1007", Direction: "*out"} + attrs = &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1007", Direction: "*out"} if err := rater.Call("ApierV1.GetAccount", attrs, &acnt); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) }