X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=e2ap%2Fpkg%2Fe2ap%2Fe2ap_tests%2Fmsg_e2ap_subscriptiondelete.go;h=9eeccff6ef0d131ba8b563653aa1b1d552b1c0f7;hb=01a4c49324392003717106267c56126275b9058b;hp=aa206375fdc86b4c20dfe5cc32ad5cf10b753020;hpb=7e9c5e52615fef7cbc23de28505e1a7292cdf14f;p=ric-plt%2Fsubmgr.git

diff --git a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscriptiondelete.go b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscriptiondelete.go
index aa20637..9eeccff 100644
--- a/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscriptiondelete.go
+++ b/e2ap/pkg/e2ap/e2ap_tests/msg_e2ap_subscriptiondelete.go
@@ -42,30 +42,20 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteRequest(t *testing.T) {
 	areqenc.RequestId.Seq = 22
 	areqenc.FunctionId = 33
 
-	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)
 }
 
@@ -83,30 +73,20 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteResponse(t *testing.T) {
 	arespenc.RequestId.Seq = 22
 	arespenc.FunctionId = 33
 
-	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)
 }
 
@@ -141,30 +121,20 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteFailure(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)
 }
 
@@ -176,16 +146,11 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteRequestBuffers(t *testin
 			return
 		}
 		e2SubResp := testCtxt.packerif.NewPackerSubscriptionDeleteRequest()
-		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)
 	}
 
@@ -214,32 +179,16 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteResponseBuffers(t *testi
 			return
 		}
 		e2SubResp := testCtxt.packerif.NewPackerSubscriptionDeleteResponse()
-		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("SubDelRespBuffer")
 	testfunc("20ca4012000002ea7e000500000106e7ea6300020001")
-	testfunc("20ca4012000002ea7e000500000106e8ea6300020001")
-	testfunc("20ca4012000002ea7e000500000106e9ea6300020001")
-	testfunc("20ca4012000002ea7e000500000106eaea6300020001")
-	testfunc("20ca4012000002ea7e000500000106ebea6300020001")
-	testfunc("20ca4012000002ea7e000500000106ecea6300020001")
-	testfunc("20ca4012000002ea7e000500000106edea6300020001")
-	testfunc("20ca4012000002ea7e000500000106eeea6300020001")
-	testfunc("20ca4012000002ea7e000500000106efea6300020001")
-	testfunc("20ca4012000002ea7e000500000106f0ea6300020001")
-	testfunc("20ca4012000002ea7e000500000106f1ea6300020001")
-	testfunc("20ca4012000002ea7e000500000106f4ea6300020001")
 
 }
 
@@ -251,16 +200,11 @@ func (testCtxt *E2ApTests) E2ApTestMsgSubscriptionDeleteFailureBuffers(t *testin
 			return
 		}
 		e2SubResp := testCtxt.packerif.NewPackerSubscriptionDeleteFailure()
-		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)
 	}