Fixed Unit Test Cases

Signed-off-by: wahidw <abdulwahid.w@nokia.com>
Change-Id: I3757275e08a50e79dd572b82a603b2216cbbe37f

diff --git a/pkg/nbi/httprestful_test.go b/pkg/nbi/httprestful_test.go
index a611573..13a90ea 100644 (file)
--- a/pkg/nbi/httprestful_test.go
+++ b/pkg/nbi/httprestful_test.go
@@ -78,6 +78,7 @@ var InvalidSubResp = []byte(`{"Version":0, "EventType":all}`)
 
 type Consumer struct{}
 
+
 func (m Consumer) Consume(params *xapp.RMRParams) (err error) {
        xapp.Sdl.Store("myKey", params.Payload)
        return nil
@@ -112,6 +113,7 @@ func TestValidateXappCallbackDataInvalid(t *testing.T) {
 
 func TestValidateXappSubscriptionsData(t *testing.T) {
 
+    rtmgr.RMRConnStatus = make(map[string]bool)
        ep := make(map[string]*rtmgr.Endpoint)
        ep["dummy"] = &rtmgr.Endpoint{Uuid: "10.0.0.1:0", Name: "E2TERM", XAppType: "app1", Ip: "", Port: 0, TxMessages: []string{"", ""}, RxMessages: []string{"", ""}, Socket: nil, IsReady: true, Keepalive: true}
        p := uint16(1234)
@@ -176,6 +178,7 @@ func TestValidateE2tDataEmpty(t *testing.T) {
 }
 
 func TestValidateE2tDataDNSLookUPfails(t *testing.T) {
+    rtmgr.RMRConnStatus = make(map[string]bool)
        data := models.E2tData{
                E2TAddress: swag.String("e2t.1com:1234"),
        }
@@ -184,6 +187,7 @@ func TestValidateE2tDataDNSLookUPfails(t *testing.T) {
 }
 
 func TestValidateE2tDataInvalid(t *testing.T) {
+    rtmgr.RMRConnStatus = make(map[string]bool)
        data := models.E2tData{
                E2TAddress: swag.String("10.101.01.1"),
        }
@@ -192,6 +196,7 @@ func TestValidateE2tDataInvalid(t *testing.T) {
 }
 
 func TestValidateE2tDatavalid(t *testing.T) {
+    rtmgr.RMRConnStatus = make(map[string]bool)
        data := models.E2tData{
                E2TAddress: swag.String("10.101.01.1:8098"),
        }
@@ -204,6 +209,7 @@ func TestValidateE2tDatavalid(t *testing.T) {
 }
 
 func TestValidateE2tDatavalidEndpointPresent(t *testing.T) {
+    rtmgr.RMRConnStatus = make(map[string]bool)
        data := models.E2tData{
                E2TAddress: swag.String("10.101.01.1:8098"),
        }
@@ -225,6 +231,7 @@ func TestValidateE2tDatavalidEndpointPresent(t *testing.T) {
 
 func TestValidateDeleteE2tData(t *testing.T) {
 
+    rtmgr.RMRConnStatus = make(map[string]bool)
        // test-1
        data := models.E2tDeleteData{
                E2TAddress: swag.String(""),
@@ -658,7 +665,7 @@ func TestRetrieveStartupData(t *testing.T) {
        ts.Start()
        defer ts.Close()
 
-       ts1 := createMockAppmgrWithData("127.0.0.1:8080", nil, nil, E2TListResp)
+       ts1 := createMockAppmgrWithData("127.0.0.1:8085", nil, nil, E2TListResp)
        ts1.Start()
        defer ts1.Close()
 

diff --git a/pkg/rpe/rmr_test.go b/pkg/rpe/rmr_test.go
index fe61356..59ed2df 100644 (file)
--- a/pkg/rpe/rmr_test.go
+++ b/pkg/rpe/rmr_test.go
@@ -56,6 +56,10 @@ func TestRmrPushGeneratePolicies(t *testing.T) {
        pcs = stub.ValidRicComponents
 
        rawrt := rmrpush.GeneratePolicies(rtmgr.Eps, &pcs)
+    rawrt = rmrpush.GeneratePartialPolicies(rtmgr.Eps,nil,1)
+    rawrt = rmrpush.GeneratePartialPolicies(rtmgr.Eps,nil,0)
+    rawrt = rmrpush.GeneratePartialPolicies(rtmgr.Eps,&stub.XappSubData,1)
+    rawrt = rmrpush.GeneratePartialPolicies(rtmgr.Eps,&stub.XappSubData,0)
        t.Log(rawrt)
 }
 

diff --git a/pkg/sbi/nngpush_test.go b/pkg/sbi/nngpush_test.go
index 519b26e..e53ac5c 100644 (file)
--- a/pkg/sbi/nngpush_test.go
+++ b/pkg/sbi/nngpush_test.go
@@ -56,6 +56,7 @@ func TestMain(m *testing.M) {
 Resets the EndpointList according to argumnets
 */
 func resetTestPushDataset(instance RmrPush, testdata []rtmgr.Endpoint) {
+    rtmgr.RMRConnStatus = make(map[string]bool)
        rtmgr.Eps = make(map[string]*rtmgr.Endpoint)
        for _, endpoint := range testdata {
                ep := endpoint

diff --git a/pkg/stub/stub.go b/pkg/stub/stub.go
index f5f3b72..a69f949 100644 (file)
--- a/pkg/stub/stub.go
+++ b/pkg/stub/stub.go
@@ -99,3 +99,10 @@ var Rane2tmap = models.RanE2tMap{
 var Rane2tmaponlyE2t = models.RanE2tMap{
        {E2TAddress: swag.String("10.10.10.10:100"), RanNamelist: []string{}},
 }
+
+var XappSubscriptionData_port = uint16(0)
+var XappSubscriptionData_subid = int32(1)
+
+var XappSubData = models.XappSubscriptionData {
+    Address: swag.String("10.0.0.1"), Port: &XappSubscriptionData_port, SubscriptionID: &XappSubscriptionData_subid,
+}