X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=e2ap%2Fpkg%2Fe2ap%2Fe2ap_tests%2Fmsg_e2ap_subscription.go;h=d8657035bfd592357d6130a7fb3d322e99655ce6;hb=01a4c49324392003717106267c56126275b9058b;hp=02153af826920ac9ae3db71303fd36ca57f4b1a9;hpb=4721d4e64a1abaf189b3acfc8fa259f1b9f10ced;p=ric-plt%2Fsubmgr.git

diff --git a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
index 02153af..d865703 100644
--- a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
+++ b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscription.go
@@ -34,30 +34,20 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionRequestWithData(t *testing.T,
 
 	testCtxt.testPrint("########## ##########")
 	testCtxt.testPrint("init")
-	seterr := e2SubsReq.Set(areqenc)
-	if seterr != nil {
-		testCtxt.testError(t, "set err: %s", seterr.Error())
-		return
-	}
-	testCtxt.testPrint("print:\n%s", e2SubsReq.String())
 	testCtxt.testPrint("pack")
-	err, packedMsg := e2SubsReq.Pack(nil)
+	err, packedMsg := e2SubsReq.Pack(areqenc)
 	if err != nil {
 		testCtxt.testError(t, "Pack failed: %s", err.Error())
 		return
 	}
+	testCtxt.testPrint("print:\n%s", e2SubsReq.String())
 	testCtxt.testPrint("unpack")
-	err = e2SubsReq.UnPack(packedMsg)
+	err, areqdec := e2SubsReq.UnPack(packedMsg)
 	if err != nil {
 		testCtxt.testError(t, "UnPack failed: %s", err.Error())
 		return
 	}
 	testCtxt.testPrint("print:\n%s", e2SubsReq.String())
-	geterr, areqdec := e2SubsReq.Get()
-	if geterr != nil {
-		testCtxt.testError(t, "get nil: %s", geterr.Error())
-		return
-	}
 	testCtxt.testValueEquality(t, "msg", areqenc, areqdec)
 	testCtxt.testValueEquality(t, "EventTriggerDefinition", &areqenc.EventTriggerDefinition, &areqdec.EventTriggerDefinition)
 }
@@ -142,30 +132,20 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionResponse(t *testing.T) {
 		arespenc.ActionNotAdmittedList.Items = append(arespenc.ActionNotAdmittedList.Items, item)
 	}
 
-	seterr := e2SubsResp.Set(&arespenc)
-	if seterr != nil {
-		testCtxt.testError(t, "set err: %s", seterr.Error())
-		return
-	}
-	testCtxt.testPrint("print:\n%s", e2SubsResp.String())
 	testCtxt.testPrint("pack")
-	err, packedMsg := e2SubsResp.Pack(nil)
+	err, packedMsg := e2SubsResp.Pack(&arespenc)
 	if err != nil {
 		testCtxt.testError(t, "Pack failed: %s", err.Error())
 		return
 	}
+	testCtxt.testPrint("print:\n%s", e2SubsResp.String())
 	testCtxt.testPrint("unpack")
-	err = e2SubsResp.UnPack(packedMsg)
+	err, arespdec := e2SubsResp.UnPack(packedMsg)
 	if err != nil {
 		testCtxt.testError(t, "UnPack failed: %s", err.Error())
 		return
 	}
 	testCtxt.testPrint("print:\n%s", e2SubsResp.String())
-	geterr, arespdec := e2SubsResp.Get()
-	if geterr != nil {
-		testCtxt.testError(t, "get nil: %s", geterr.Error())
-		return
-	}
 	testCtxt.testValueEquality(t, "msg", &arespenc, arespdec)
 }
 
@@ -205,30 +185,20 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionFailure(t *testing.T) {
 	//		afailenc.CriticalityDiagnostics.CriticalityDiagnosticsIEList.Items = append(afailenc.CriticalityDiagnostics.CriticalityDiagnosticsIEList.Items, ieitem)
 	//	}
 
-	seterr := e2SubsFail.Set(&afailenc)
-	if seterr != nil {
-		testCtxt.testError(t, "set err: %s", seterr.Error())
-		return
-	}
-	testCtxt.testPrint("print:\n%s", e2SubsFail.String())
 	testCtxt.testPrint("pack")
-	err, packedMsg := e2SubsFail.Pack(nil)
+	err, packedMsg := e2SubsFail.Pack(&afailenc)
 	if err != nil {
 		testCtxt.testError(t, "Pack failed: %s", err.Error())
 		return
 	}
+	testCtxt.testPrint("print:\n%s", e2SubsFail.String())
 	testCtxt.testPrint("unpack")
-	err = e2SubsFail.UnPack(packedMsg)
+	err, afaildec := e2SubsFail.UnPack(packedMsg)
 	if err != nil {
 		testCtxt.testError(t, "UnPack failed: %s", err.Error())
 		return
 	}
 	testCtxt.testPrint("print:\n%s", e2SubsFail.String())
-	geterr, afaildec := e2SubsFail.Get()
-	if geterr != nil {
-		testCtxt.testError(t, "get nil: %s", geterr.Error())
-		return
-	}
 	testCtxt.testValueEquality(t, "msg", &afailenc, afaildec)
 }
 
@@ -240,16 +210,11 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionRequestBuffers(t *testing.T) {
 			return
 		}
 		e2SubResp := testCtxt.packerif.NewPackerSubscriptionRequest()
-		err := e2SubResp.UnPack(packedData)
+		err, _ := e2SubResp.UnPack(packedData)
 		if err != nil {
 			testCtxt.testError(t, "UnPack() Failed: %s [%s]", err.Error(), buffer)
 			return
 		}
-		err, _ = e2SubResp.Get()
-		if err != nil {
-			testCtxt.testError(t, "Get() Failed: %s [%s]", err.Error(), buffer)
-			return
-		}
 		testCtxt.testPrint("OK [%s]", buffer)
 	}
 
@@ -265,34 +230,16 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionResponseBuffers(t *testing.T)
 			return
 		}
 		e2SubResp := testCtxt.packerif.NewPackerSubscriptionResponse()
-		err := e2SubResp.UnPack(packedData)
+		err, _ := e2SubResp.UnPack(packedData)
 		if err != nil {
 			testCtxt.testError(t, "UnPack() Failed: %s [%s]", err.Error(), buffer)
 			return
 		}
-		err, _ = e2SubResp.Get()
-		if err != nil {
-			testCtxt.testError(t, "Get() Failed: %s [%s]", err.Error(), buffer)
-			return
-		}
 		testCtxt.testPrint("OK [%s]", buffer)
 	}
 
 	testCtxt.SetDesc("SubRespBuffer")
 	testfunc("20c9402a000004ea7e00050000018009ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106e7ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106e8ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106e9ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106eaea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106ebea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106ecea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106edea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106eeea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106efea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106f0ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106f4ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106f5ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
-	testfunc("20c9402a000004ea7e000500000106f6ea6300020001ea6c000700ea6d00020000ea6e000908ea6f000400000040")
 	testfunc("20c9401d000003ea7e0005004eec0004ea6300020001ea6c000700ea6d40020000")
 
 }
@@ -305,16 +252,11 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionFailureBuffers(t *testing.T) {
 			return
 		}
 		e2SubResp := testCtxt.packerif.NewPackerSubscriptionFailure()
-		err := e2SubResp.UnPack(packedData)
+		err, _ := e2SubResp.UnPack(packedData)
 		if err != nil {
 			testCtxt.testError(t, "UnPack() Failed: %s [%s]", err.Error(), buffer)
 			return
 		}
-		err, _ = e2SubResp.Get()
-		if err != nil {
-			testCtxt.testError(t, "Get() Failed: %s [%s]", err.Error(), buffer)
-			return
-		}
 		testCtxt.testPrint("OK [%s]", buffer)
 	}