X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=pkg%2Fcontrol%2Fut_ctrl_submgr_test.go;h=3a571772d14e4cd4524d553c938443bf24897b35;hb=aada64566a3a77cf9a20a98f9ddd7cd6f37529ae;hp=8403c9337716a52f68c62b8706c3ce724a9c3b7e;hpb=3944a22bb267f649fff113682a6ba4253007392d;p=ric-plt%2Fsubmgr.git

diff --git a/pkg/control/ut_ctrl_submgr_test.go b/pkg/control/ut_ctrl_submgr_test.go
index 8403c93..3a57177 100644
--- a/pkg/control/ut_ctrl_submgr_test.go
+++ b/pkg/control/ut_ctrl_submgr_test.go
@@ -20,6 +20,7 @@
 package control
 
 import (
+	"gerrit.o-ran-sc.org/r/ric-plt/submgr/pkg/teststub"
 	"gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
 	"testing"
 	"time"
@@ -29,17 +30,18 @@ import (
 //
 //-----------------------------------------------------------------------------
 type testingSubmgrControl struct {
-	testingRmrControl
+	teststub.RmrControl
 	c *Control
 }
 
-func createSubmgrControl(desc string, rtfile string, port string) *testingSubmgrControl {
+func createSubmgrControl(rtfile string, port uint16, rtport uint16) *testingSubmgrControl {
 	mainCtrl = &testingSubmgrControl{}
-	mainCtrl.testingRmrControl.init(desc, rtfile, port)
+	mainCtrl.RmrControl.Init("SUBMGRCTL", rtfile, port, rtport)
 	mainCtrl.c = NewControl()
 	xapp.SetReadyCB(mainCtrl.ReadyCB, nil)
 	go xapp.RunWithParams(mainCtrl.c, false)
 	mainCtrl.WaitCB()
+	mainCtrl.c.ReadyCB(nil)
 	return mainCtrl
 }
 
@@ -53,33 +55,33 @@ func (mc *testingSubmgrControl) wait_registry_empty(t *testing.T, secs int) bool
 		}
 		time.Sleep(500 * time.Millisecond)
 	}
-	testError(t, "(general) no registry empty within %d secs: %d", secs, cnt)
+	mc.TestError(t, "(submgr) no registry empty within %d secs: %d", secs, cnt)
 	return false
 }
 
-func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId int, secs int) bool {
+func (mc *testingSubmgrControl) wait_subs_clean(t *testing.T, e2SubsId uint32, secs int) bool {
 	var subs *Subscription
 	i := 1
 	for ; i <= secs*2; i++ {
-		subs = mc.c.registry.GetSubscription(uint16(e2SubsId))
+		subs = mc.c.registry.GetSubscription(e2SubsId)
 		if subs == nil {
 			return true
 		}
 		time.Sleep(500 * time.Millisecond)
 	}
 	if subs != nil {
-		testError(t, "(general) no clean within %d secs: %s", secs, subs.String())
+		mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, subs.String())
 	} else {
-		testError(t, "(general) no clean within %d secs: subs(N/A)", secs)
+		mc.TestError(t, "(submgr) no clean within %d secs: subs(N/A)", secs)
 	}
 	return false
 }
 
-func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId int, secs int) bool {
-	var trans *Transaction
+func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId uint32, secs int) bool {
+	var trans TransactionIf
 	i := 1
 	for ; i <= secs*2; i++ {
-		subs := mc.c.registry.GetSubscription(uint16(e2SubsId))
+		subs := mc.c.registry.GetSubscription(e2SubsId)
 		if subs == nil {
 			return true
 		}
@@ -90,20 +92,20 @@ func (mc *testingSubmgrControl) wait_subs_trans_clean(t *testing.T, e2SubsId int
 		time.Sleep(500 * time.Millisecond)
 	}
 	if trans != nil {
-		testError(t, "(general) no clean within %d secs: %s", secs, trans.String())
+		mc.TestError(t, "(submgr) no clean within %d secs: %s", secs, trans.String())
 	} else {
-		testError(t, "(general) no clean within %d secs: trans(N/A)", secs)
+		mc.TestError(t, "(submgr) no clean within %d secs: trans(N/A)", secs)
 	}
 	return false
 }
 
-func (mc *testingSubmgrControl) get_subid(t *testing.T) uint16 {
+func (mc *testingSubmgrControl) get_subid(t *testing.T) uint32 {
 	mc.c.registry.mutex.Lock()
 	defer mc.c.registry.mutex.Unlock()
 	return mc.c.registry.subIds[0]
 }
 
-func (mc *testingSubmgrControl) wait_subid_change(t *testing.T, origSubId uint16, secs int) (uint16, bool) {
+func (mc *testingSubmgrControl) wait_subid_change(t *testing.T, origSubId uint32, secs int) (uint32, bool) {
 	i := 1
 	for ; i <= secs*2; i++ {
 		mc.c.registry.mutex.Lock()
@@ -114,23 +116,23 @@ func (mc *testingSubmgrControl) wait_subid_change(t *testing.T, origSubId uint16
 		}
 		time.Sleep(500 * time.Millisecond)
 	}
-	testError(t, "(general) no subId change within %d secs", secs)
+	mc.TestError(t, "(submgr) no subId change within %d secs", secs)
 	return 0, false
 }
 
 func (mc *testingSubmgrControl) get_msgcounter(t *testing.T) uint64 {
-	return mc.c.msgCounter
+	return mc.c.CntRecvMsg
 }
 
 func (mc *testingSubmgrControl) wait_msgcounter_change(t *testing.T, orig uint64, secs int) (uint64, bool) {
 	i := 1
 	for ; i <= secs*2; i++ {
-		curr := mc.c.msgCounter
+		curr := mc.c.CntRecvMsg
 		if curr != orig {
 			return curr, true
 		}
 		time.Sleep(500 * time.Millisecond)
 	}
-	testError(t, "(general) no msg counter change within %d secs", secs)
+	mc.TestError(t, "(submgr) no msg counter change within %d secs", secs)
 	return 0, false
 }