X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fxapp%2Fxapp_test.go;h=9696e6eec4b75e3b928665bbaefe872edfaa7e85;hb=1307b2d8d34f48bf44267efc2d1e607823c8d06d;hp=c1a049f400538978595595768515faaa3eb3ff49;hpb=6464f1220ee8e99c61fd143b5b7698228d15b272;p=ric-plt%2Fxapp-frame.git

diff --git a/pkg/xapp/xapp_test.go b/pkg/xapp/xapp_test.go
index c1a049f..9696e6e 100755
--- a/pkg/xapp/xapp_test.go
+++ b/pkg/xapp/xapp_test.go
@@ -21,21 +21,21 @@ package xapp
 
 import (
 	"github.com/gorilla/mux"
+	"github.com/spf13/viper"
 	"net/http"
 	"net/http/httptest"
-	"github.com/spf13/viper"
 	"os"
 	"strings"
 	"testing"
 	"time"
 )
 
-var _ = func() bool {
-	testing.Init()
-	return true
-}()
+//var _ = func() bool {
+//	testing.Init()
+//	return true
+//}()
 
-type Consumer struct {}
+type Consumer struct{}
 
 func (m Consumer) Consume(params *RMRParams) (err error) {
 	Sdl.Store("myKey", params.Payload)
@@ -102,6 +102,7 @@ func TestInjectQueryFailures(t *testing.T) {
 }
 
 func TestMessagesReceivedSuccessfully(t *testing.T) {
+	time.Sleep(time.Duration(5) * time.Second)
 	for i := 0; i < 100; i++ {
 		params := &RMRParams{}
 		params.Mtype = 10004
@@ -118,11 +119,11 @@ func TestMessagesReceivedSuccessfully(t *testing.T) {
 	waitForSdl := viper.GetBool("db.waitForSdl")
 	stats := getMetrics(t)
 	if !strings.Contains(stats, "ricxapp_RMR_Transmitted 100") {
-		t.Errorf("Error: ricxapp_RMR_Transmitted value incorrect")
+		t.Errorf("Error: ricxapp_RMR_Transmitted value incorrect: %v", stats)
 	}
 
 	if !strings.Contains(stats, "ricxapp_RMR_Received 100") {
-		t.Errorf("Error: ricxapp_RMR_Received value incorrect")
+		t.Errorf("Error: ricxapp_RMR_Received value incorrect: %v", stats)
 	}
 
 	if !strings.Contains(stats, "ricxapp_RMR_TransmitError 0") {
@@ -142,6 +143,93 @@ func TestMessagesReceivedSuccessfully(t *testing.T) {
 	}
 }
 
+func TestMessagesReceivedSuccessfullyUsingWh(t *testing.T) {
+	time.Sleep(time.Duration(5) * time.Second)
+	whid := Rmr.Openwh("localhost:4560")
+	time.Sleep(time.Duration(1) * time.Second)
+	for i := 0; i < 100; i++ {
+		params := &RMRParams{}
+		params.Mtype = 10004
+		params.SubId = -1
+		params.Payload = []byte{1, 2, 3, 4, 5, 6}
+		params.Meid = &RMRMeid{PlmnID: "1234", EnbID: "7788", RanName: "RanName-1234"}
+		params.Xid = "TestXID"
+		params.Whid = int(whid)
+		Rmr.SendMsg(params)
+	}
+
+	// Allow time to process the messages
+	time.Sleep(time.Duration(2) * time.Second)
+
+	waitForSdl := viper.GetBool("db.waitForSdl")
+	stats := getMetrics(t)
+	if !strings.Contains(stats, "ricxapp_RMR_Transmitted 200") {
+		t.Errorf("Error: ricxapp_RMR_Transmitted value incorrect: %v", stats)
+	}
+
+	if !strings.Contains(stats, "ricxapp_RMR_Received 200") {
+		t.Errorf("Error: ricxapp_RMR_Received value incorrect: %v", stats)
+	}
+
+	if !strings.Contains(stats, "ricxapp_RMR_TransmitError 0") {
+		t.Errorf("Error: ricxapp_RMR_TransmitError value incorrect")
+	}
+
+	if !strings.Contains(stats, "ricxapp_RMR_ReceiveError 0") {
+		t.Errorf("Error: ricxapp_RMR_ReceiveError value incorrect")
+	}
+
+	if waitForSdl && !strings.Contains(stats, "ricxapp_SDL_Stored 200") {
+		t.Errorf("Error: ricxapp_SDL_Stored value incorrect")
+	}
+
+	if waitForSdl && !strings.Contains(stats, "ricxapp_SDL_StoreError 0") {
+		t.Errorf("Error: ricxapp_SDL_StoreError value incorrect")
+	}
+	Rmr.Closewh(int(whid))
+}
+
+func TestMessagesReceivedSuccessfullyUsingWhCall(t *testing.T) {
+	time.Sleep(time.Duration(5) * time.Second)
+	whid := Rmr.Openwh("localhost:4560")
+	params := &RMRParams{}
+	params.Payload = []byte("newrt|start\nnewrt|end\n")
+	params.Whid = int(whid)
+	params.Callid = 4
+	params.Timeout = 1000
+	Rmr.SendCallMsg(params)
+
+	// Allow time to process the messages
+	time.Sleep(time.Duration(2) * time.Second)
+
+	waitForSdl := viper.GetBool("db.waitForSdl")
+	stats := getMetrics(t)
+	if !strings.Contains(stats, "ricxapp_RMR_Transmitted 200") {
+		t.Errorf("Error: ricxapp_RMR_Transmitted value incorrect: %v", stats)
+	}
+
+	if !strings.Contains(stats, "ricxapp_RMR_Received 201") {
+		t.Errorf("Error: ricxapp_RMR_Received value incorrect: %v", stats)
+	}
+
+	if !strings.Contains(stats, "ricxapp_RMR_TransmitError 1") {
+		t.Errorf("Error: ricxapp_RMR_TransmitError value incorrect")
+	}
+
+	if !strings.Contains(stats, "ricxapp_RMR_ReceiveError 0") {
+		t.Errorf("Error: ricxapp_RMR_ReceiveError value incorrect")
+	}
+
+	if waitForSdl && !strings.Contains(stats, "ricxapp_SDL_Stored 201") {
+		t.Errorf("Error: ricxapp_SDL_Stored value incorrect")
+	}
+
+	if waitForSdl && !strings.Contains(stats, "ricxapp_SDL_StoreError 0") {
+		t.Errorf("Error: ricxapp_SDL_StoreError value incorrect")
+	}
+	Rmr.Closewh(int(whid))
+}
+
 func TestSubscribeChannels(t *testing.T) {
 	if !viper.GetBool("db.waitForSdl") {
 		return