From 9ca69b5e7a68054dd59c2ff153aec16ba03f1c0c Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon@itsyscom.com>
Date: Fri, 20 Aug 2021 09:59:13 +0300
Subject: [PATCH] Updated engine tests

---
 engine/z_onstor_it_test.go | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go
index a4406403e..4a9cb4ae9 100644
--- a/engine/z_onstor_it_test.go
+++ b/engine/z_onstor_it_test.go
@@ -451,10 +451,8 @@ func testOnStorITRatingPlan(t *testing.T) {
 	}
 	if onStor.dataDB.GetStorageType() != utils.INTERNAL {
 		//get from cache
-		if rcv, err := onStor.GetRatingPlan(rp.Id, false, utils.NonTransactional); err != nil {
+		if _, err := onStor.GetRatingPlan(rp.Id, false, utils.NonTransactional); err != utils.ErrNotFound {
 			t.Error(err)
-		} else if !reflect.DeepEqual(rp, rcv) {
-			t.Errorf("Expecting: %v, received: %v", rp, rcv)
 		}
 	}
 	//get from database
@@ -463,6 +461,14 @@ func testOnStorITRatingPlan(t *testing.T) {
 	} else if !reflect.DeepEqual(rp, rcv) {
 		t.Errorf("Expecting: %v, received: %v", rp, rcv)
 	}
+	if onStor.dataDB.GetStorageType() != utils.INTERNAL {
+		//get from cache
+		if rcv, err := onStor.GetRatingPlan(rp.Id, false, utils.NonTransactional); err != nil {
+			t.Error(err)
+		} else if !reflect.DeepEqual(rp, rcv) {
+			t.Errorf("Expecting: %v, received: %v", rp, rcv)
+		}
+	}
 	expectedRP := []string{"rpl_HasData", "rpl_CRUDRatingPlan"}
 	if itm, err := onStor.DataDB().GetKeysForPrefix(utils.RatingPlanPrefix); err != nil {
 		t.Error(err)
@@ -489,14 +495,14 @@ func testOnStorITRatingPlan(t *testing.T) {
 	if err := onStor.SetRatingPlan(rp); err != nil {
 		t.Error(err)
 	}
-	//get from cache
-	if rcv, err := onStor.GetRatingPlan(rp.Id, false, utils.NonTransactional); err != nil {
+	//get from database
+	if rcv, err := onStor.GetRatingPlan(rp.Id, true, utils.NonTransactional); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(rp, rcv) {
 		t.Errorf("Expecting: %v, received: %v", rp, rcv)
 	}
-	//get from database
-	if rcv, err := onStor.GetRatingPlan(rp.Id, true, utils.NonTransactional); err != nil {
+	//get from cache
+	if rcv, err := onStor.GetRatingPlan(rp.Id, false, utils.NonTransactional); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(rp, rcv) {
 		t.Errorf("Expecting: %v, received: %v", rp, rcv)
@@ -504,13 +510,13 @@ func testOnStorITRatingPlan(t *testing.T) {
 	if err = onStor.RemoveRatingPlan(rp.Id, utils.NonTransactional); err != nil {
 		t.Error(err)
 	}
-	//check cache if removed
-	if _, rcvErr := onStor.GetRatingPlan(rp.Id, false,
+	//check database if removed
+	if _, rcvErr := onStor.GetRatingPlan(rp.Id, true,
 		utils.NonTransactional); rcvErr != utils.ErrNotFound {
 		t.Error(rcvErr)
 	}
-	//check database if removed
-	if _, rcvErr := onStor.GetRatingPlan(rp.Id, true,
+	//check cache if removed
+	if _, rcvErr := onStor.GetRatingPlan(rp.Id, false,
 		utils.NonTransactional); rcvErr != utils.ErrNotFound {
 		t.Error(rcvErr)
 	}
@@ -576,8 +582,8 @@ func testOnStorITRatingProfile(t *testing.T) {
 	if err := onStor.SetRatingProfile(rpf); err != nil {
 		t.Error(err)
 	}
-	//get from cache
-	if rcv, err := onStor.GetRatingProfile(rpf.Id, false,
+	//get from databse
+	if rcv, err := onStor.GetRatingProfile(rpf.Id, true,
 		utils.NonTransactional); err != nil {
 		t.Error(err)
 	} else if !reflect.DeepEqual(rpf, rcv) {