Commit fb260775 authored by Elian Kraja's avatar Elian Kraja
Browse files

Resolving conflicts on mec-common between M1 and ubi branches

parent 62a2cc84

Test Purposes/mec-common.tplan2

+1 −6
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ Package MEC_Common { 
      STRING "application/json;charset=utf-8";

      string CONTENT_JSON containing s set to "application/json;charset=utf-8";

      

<<<<<<< HEAD

<<<<<<< HEAD

=======

      string HTTP_200_OK containing s set to "200 OK";

      STRING "200 OK";
@@ -112,9 +109,6 @@ Package MEC_Common { 
      STRING "406 NOT ACCEPTABLE";

      string HTTP_406_NOT_ACCEPTABLE containing s set to "406 NOT ACCEPTABLE";      



>>>>>>> Added negative tests on MEC012 and check ProblemDetails on mec010-2

=======

>>>>>>> Applied folder structure

      STRING VALID_TOKEN;

      

      STRING NOT_VALID_TOKEN;
@@ -199,6 +193,7 @@ Package MEC_Common { 
         connection between MEC_Platform_Manager.p and IUT.p

      ;





      Test Configuration Config_MEC_4 containing

         Tester component UE_App of type UeAppComponent

         SUT component IUT of type MecSystemComponent