From 7040a0fab708ed4f0b337a9835a22381ea04586c Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Fri, 22 Mar 2019 19:55:23 +0200
Subject: [PATCH] Updated tests after latest changes

---
 apier/v1/accounts_it_test.go | 9 +++++++--
 apier/v1/cdrs.go             | 3 ++-
 apier/v1/precache_it_test.go | 4 ++++
 engine/action.go             | 1 +
 engine/libtest.go            | 4 ++++
 sessions/sessions_it_test.go | 9 ++++++---
 6 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/apier/v1/accounts_it_test.go b/apier/v1/accounts_it_test.go
index f968c4b91..9b72dd47e 100644
--- a/apier/v1/accounts_it_test.go
+++ b/apier/v1/accounts_it_test.go
@@ -179,8 +179,13 @@ func testAccITDebitBalance(t *testing.T) {
 
 func testAccITAddBalance(t *testing.T) {
 	var reply string
-	attrs := &AttrAddBalance{Tenant: "cgrates.org", Account: "testAccAddBalance",
-		BalanceType: "*monetary", Value: 1.5, Cdrlog: utils.BoolPointer(true)}
+	attrs := &AttrAddBalance{
+		Tenant:      "cgrates.org",
+		Account:     "testAccAddBalance",
+		BalanceType: "*monetary",
+		Value:       1.5,
+		Cdrlog:      utils.BoolPointer(true),
+	}
 	if err := accRPC.Call("ApierV1.AddBalance", attrs, &reply); err != nil {
 		t.Error("Got error on ApierV1.AddBalance: ", err.Error())
 	} else if reply != "OK" {
diff --git a/apier/v1/cdrs.go b/apier/v1/cdrs.go
index b6dbcb806..e41aa84c6 100644
--- a/apier/v1/cdrs.go
+++ b/apier/v1/cdrs.go
@@ -40,7 +40,8 @@ func (apier *ApierV1) GetEventCost(attrs utils.AttrGetCallCost, reply *engine.Ev
 			err = utils.NewErrServerError(err)
 		}
 		return err
-	} else if len(cdrs) == 0 {
+	} else if len(cdrs) == 0 ||
+		cdrs[0].CostDetails == nil { // to avoid nil pointer dereference
 		return utils.ErrNotFound
 	} else {
 		*reply = *cdrs[0].CostDetails
diff --git a/apier/v1/precache_it_test.go b/apier/v1/precache_it_test.go
index 60003f6e9..c0c154628 100644
--- a/apier/v1/precache_it_test.go
+++ b/apier/v1/precache_it_test.go
@@ -279,6 +279,10 @@ func testPrecacheGetCacheStatsAfterRestart(t *testing.T) {
 			Items:  0,
 			Groups: 0,
 		},
+		utils.CacheClosedSessions: {
+			Items:  0,
+			Groups: 0,
+		},
 	}
 	if err := precacheRPC.Call(utils.CacheSv1GetCacheStats, cacheIDs, &reply); err != nil {
 		t.Error(err.Error())
diff --git a/engine/action.go b/engine/action.go
index ed69ab31e..3e2bdccaa 100644
--- a/engine/action.go
+++ b/engine/action.go
@@ -184,6 +184,7 @@ func cdrLogAction(acc *Account, a *Action, acs Actions, extraData interface{}) (
 			OriginID:    utils.GenUUID(),
 			ExtraFields: make(map[string]string),
 			PreRated:    true,
+			CostDetails: NewBareEventCost(),
 		}
 		cdr.CGRID = utils.Sha1(cdr.OriginID, cdr.SetupTime.String())
 		cdr.Usage = time.Duration(1)
diff --git a/engine/libtest.go b/engine/libtest.go
index b6818c480..d755b5a01 100644
--- a/engine/libtest.go
+++ b/engine/libtest.go
@@ -364,5 +364,9 @@ func GetDefaultEmptyCacheStats() map[string]*ltcache.CacheStats {
 			Items:  0,
 			Groups: 0,
 		},
+		utils.CacheClosedSessions: {
+			Items:  0,
+			Groups: 0,
+		},
 	}
 }
diff --git a/sessions/sessions_it_test.go b/sessions/sessions_it_test.go
index d738aa2a1..ffd04b424 100644
--- a/sessions/sessions_it_test.go
+++ b/sessions/sessions_it_test.go
@@ -142,11 +142,14 @@ func TestSessionsItTerminatUnexist(t *testing.T) {
 	}
 
 	var cdrs []*engine.ExternalCDR
-	req := utils.RPCCDRsFilter{DestinationPrefixes: []string{"1002"}}
+	req := utils.RPCCDRsFilter{
+		DestinationPrefixes: []string{"1002"},
+		RunIDs:              []string{utils.MetaDefault},
+	}
 	if err := sItRPC.Call(utils.ApierV2GetCDRs, req, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
-		t.Error("Unexpected number of CDRs returned: ", len(cdrs))
+		t.Errorf("Unexpected number of CDRs returned: %v \n cdrs=%s", len(cdrs), utils.ToJSON(cdrs))
 	} else {
 		if cdrs[0].Usage != "2m0s" {
 			t.Errorf("Unexpected CDR Usage received, cdr: %v %+v ", cdrs[0].Usage, cdrs[0])
@@ -412,7 +415,7 @@ func TestSessionsItEventCostCompressing(t *testing.T) {
 	if err := sItRPC.Call(utils.ApierV1GetEventCost,
 		utils.AttrGetCallCost{CgrId: cgrID, RunId: utils.META_DEFAULT},
 		&ec); err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 	// make sure we only have one aggregated Charge
 	if len(ec.Charges) != 1 ||