Commit 68a05c95 authored by Mubeena Ishaq's avatar Mubeena Ishaq
Browse files

fix minor issues in mae_test.go

parent 07af824a

go-apps/meep-app-enablement/server/mae_test.go

+8 −14
Original line number Diff line number Diff line
@@ -6696,10 +6696,10 @@ func TestAppRegistrationPOST(t *testing.T) { 
	 ******************************/



	// POST

	subscriptionId, _ := testAppRegistrationPOST(t, appInstanceId, true)

	appInstanceId, _ := testAppRegistrationPOST(t, true)



	// Delete

	testAppRegistrationDelete(t, appInstanceId, subscriptionId, true)

	testAppRegistrationDelete(t, appInstanceId, true)



	deleteApp(appInstanceId)
@@ -6716,7 +6716,6 @@ func testAppRegistrationPOST(t *testing.T, appInstanceId string, expectSuccess b 
	/******************************

	 * expected response section

	 ******************************/

	expected_href := as.LinkType{Href: "/testScenario/mec_app_support/v2/registrations/" + appInstanceId} // Base resourceURI

	appDId := uuid.New().String()

	expectedAppInfo := as.AppInfo{

		AppName:       "MyAppName",
@@ -6759,7 +6758,7 @@ func testAppRegistrationPOST(t *testing.T, appInstanceId string, expectSuccess b 
	}

	fmt.Println("body: ", string(body))

	if expectSuccess {

		rr, err := sendRequest(http.MethodPost, "/mec_app_support/v2/registrations", bytes.NewBuffer(body), nil, nil, &expected_href.Href, http.StatusCreated, as.AppRegistrationPOST)

		rr, err := sendRequest(http.MethodPost, "/mec_app_support/v2/registrations", bytes.NewBuffer(body), nil, nil, nil, http.StatusCreated, as.AppRegistrationPOST)

		if err != nil {

			t.Fatalf(err.Error())

		}
@@ -6773,39 +6772,34 @@ func testAppRegistrationPOST(t *testing.T, appInstanceId string, expectSuccess b 
		if !validateAppInfo(respBody, expectedAppInfo) {

			t.Fatalf("Invalid delta seconds")

		}



		subscriptionId := strings.Split(expected_href.Href, "/")

		cleanSubscriptionId := subscriptionId[len(subscriptionId)-1]

		return cleanSubscriptionId, string(expectedResponseStr)

	} else {

		_, err := sendRequest(http.MethodPost, "/mec_app_support/v2/registrations", bytes.NewBuffer(body), nil, nil, nil, http.StatusNotFound, as.AppRegistrationPOST)

		if err != nil {

			t.Fatalf(err.Error())

		}

		fmt.Println("sendRequest done")

		return "", ""

	}

	return "", ""

}



func testAppRegistrationDelete(t *testing.T, appInstanceId string, subscriptionId string, expectSuccess bool) {

func testAppRegistrationDelete(t *testing.T, appInstanceId string, expectSuccess bool) {

	fmt.Println(">>> testAppRegistrationDelete")

	/******************************

	 * request vars section

	 ******************************/

	var vars = make(map[string]string)

	vars["appInstanceId"] = appInstanceId

	vars["subscriptionId"] = subscriptionId

	/******************************

	 * request execution section

	 ******************************/

	if expectSuccess {

		_, err := sendRequest(http.MethodDelete, "/mec_app_support/v2/registrations/"+subscriptionId, nil, vars, nil, nil, http.StatusNoContent, as.AppRegistrationDELETE)

		_, err := sendRequest(http.MethodDelete, "/mec_app_support/v2/registrations/"+appInstanceId, nil, vars, nil, nil, http.StatusNoContent, as.AppRegistrationDELETE)

		if err != nil {

			fmt.Println("testAppRegistrationDelete: ", err.Error())

			t.Fatalf("Failed to get expected response")

		}

	} else {

		_, err := sendRequest(http.MethodDelete, "/mec_app_support/v2/registrations/"+subscriptionId, nil, vars, nil, nil, http.StatusNotFound, as.AppRegistrationDELETE)

		_, err := sendRequest(http.MethodDelete, "/mec_app_support/v2/registrations/"+appInstanceId, nil, vars, nil, nil, http.StatusNotFound, as.AppRegistrationDELETE)

		if err != nil {

			fmt.Println("testAppRegistrationDelete: ", err.Error())

			t.Fatalf("Failed to get expected response")
@@ -6858,7 +6852,7 @@ func TestAppRegistrationGET(t *testing.T) { 
	 ******************************/



	// POST

	subscriptionId, expectedGetResponse := testAppRegistrationPOST(t, appInstanceId, true)

	appInstanceId, expectedGetResponse := testAppRegistrationPOST(t, true)

	var expectedAppInfo as.AppInfo

	err = json.Unmarshal([]byte(expectedGetResponse), &expectedAppInfo)

	if err != nil {