From b27e5038be163b32d0aa7a258bcdc7819f1b43ab Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Wed, 27 Sep 2017 14:06:12 +0300
Subject: [PATCH] Update GetStatsAfterReset in stats_it_test.go

---
 apier/v1/stats_it_test.go | 72 +++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 29 deletions(-)

diff --git a/apier/v1/stats_it_test.go b/apier/v1/stats_it_test.go
index 7701ed179..a25483f9a 100644
--- a/apier/v1/stats_it_test.go
+++ b/apier/v1/stats_it_test.go
@@ -77,8 +77,8 @@ var sTestsStatSV1 = []func(t *testing.T){
 	testV1STSRpcConn,
 	testV1STSFromFolder,
 	testV1STSGetStats,
-	testV1STSGetStatsAfterRestart,
 	testV1STSProcessEvent,
+	testV1STSGetStatsAfterRestart,
 	testV1STSSetStatQueueProfile,
 	testV1STSUpdateStatQueueProfile,
 	testV1STSRemoveStatQueueProfile,
@@ -168,34 +168,6 @@ func testV1STSGetStats(t *testing.T) {
 	}
 }
 
-func testV1STSGetStatsAfterRestart(t *testing.T) {
-	var reply []string
-	expectedIDs := []string{"STATS_1"}
-	//get stats before restart
-	if err := stsV1Rpc.Call("StatSV1.GetQueueIDs", "cgrates.org", &reply); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(expectedIDs, reply) {
-		t.Errorf("expecting: %+v, received reply: %s", expectedIDs, reply)
-	}
-	if _, err := engine.StopStartEngine(stsV1CfgPath, statsDelay); err != nil {
-		t.Fatal(err)
-	}
-	var err error
-	stsV1Rpc, err = jsonrpc.Dial("tcp", stsV1Cfg.RPCJSONListen) // We connect over JSON so we can also troubleshoot if needed
-	if err != nil {
-		t.Fatal("Could not connect to rater: ", err.Error())
-	}
-	//get stats after restart
-	var reply2 []string
-	expectedIDs2 := []string{"STATS_1"}
-	if err := stsV1Rpc.Call("StatSV1.GetQueueIDs", "cgrates.org", &reply2); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(expectedIDs2, reply2) {
-		t.Errorf("expecting: %+v, received reply: %s", expectedIDs2, reply2)
-	}
-	time.Sleep(time.Duration(1 * time.Second))
-}
-
 func testV1STSProcessEvent(t *testing.T) {
 	var reply string
 	ev1 := engine.StatEvent{
@@ -252,6 +224,48 @@ func testV1STSProcessEvent(t *testing.T) {
 	}
 }
 
+func testV1STSGetStatsAfterRestart(t *testing.T) {
+	expectedMetrics := map[string]string{
+		utils.MetaASR: "66.66667%",
+		utils.MetaACD: "1m30s",
+		utils.MetaACC: "61.5",
+		utils.MetaTCD: "3m0s",
+		utils.MetaTCC: "123",
+		utils.MetaPDD: "4s",
+	}
+	var metrics map[string]string
+	//get stats metrics before restart
+	if err := stsV1Rpc.Call("StatSV1.GetQueueStringMetrics", &utils.TenantID{Tenant: "cgrates.org", ID: "STATS_1"}, &metrics); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(expectedMetrics, metrics) {
+		t.Errorf("expecting: %+v, received reply: %s", expectedMetrics, metrics)
+	}
+	if _, err := engine.StopStartEngine(stsV1CfgPath, statsDelay); err != nil {
+		t.Fatal(err)
+	}
+	var err error
+	stsV1Rpc, err = jsonrpc.Dial("tcp", stsV1Cfg.RPCJSONListen) // We connect over JSON so we can also troubleshoot if needed
+	if err != nil {
+		t.Fatal("Could not connect to rater: ", err.Error())
+	}
+	//get stats metrics after restart
+	expectedMetrics2 := map[string]string{
+		utils.MetaASR: "66.66667%",
+		utils.MetaACD: "1m30s",
+		utils.MetaACC: "61.5",
+		utils.MetaTCD: "3m0s",
+		utils.MetaTCC: "123",
+		utils.MetaPDD: "4s",
+	}
+	var metrics2 map[string]string
+	if err := stsV1Rpc.Call("StatSV1.GetQueueStringMetrics", &utils.TenantID{Tenant: "cgrates.org", ID: "STATS_1"}, &metrics2); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(expectedMetrics2, metrics2) {
+		t.Errorf("expecting: %+v, received reply: %s", expectedMetrics2, metrics2)
+	}
+	time.Sleep(time.Duration(1 * time.Second))
+}
+
 func testV1STSSetStatQueueProfile(t *testing.T) {
 	var reply *engine.StatQueueProfile
 	if err := stsV1Rpc.Call("ApierV1.GetStatQueueProfile",