Commit 29876e1a116a74562c7c9373856ee0dc19c8dd6b

Authored by Miguel Angel Reina Ortega
1 parent f1014749

Fix #59

Signed-off-by: reinaortega <miguelangel.reinaortega@etsi.org>
... ... @@ -5831,17 +5831,17 @@ module OneM2M_PermutationFunctions {
5831 5831 mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
5832 5832 tc_ac.start;
5833 5833 alt {
5834   - [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
  5834 + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
5835 5835 tc_ac.stop;
5836   - setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
  5836 + setverdict(pass, __SCOPE__ & ": Operation performed successfully by using fanOutPoint in the Group resource");
5837 5837  
5838 5838 if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
5839   - setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
  5839 + setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse element not provided");
5840 5840 }
5841 5841 else {
5842 5842 for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
5843   - if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
5844   - setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
  5843 + if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitive(p_responseStatusCode))){
  5844 + setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse is not successful");
5845 5845 }
5846 5846 }
5847 5847 }
... ... @@ -5852,10 +5852,10 @@ module OneM2M_PermutationFunctions {
5852 5852 }
5853 5853 [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
5854 5854 tc_ac.stop;
5855   - setverdict(fail, __SCOPE__ & ": Error while creating resource");
  5855 + setverdict(fail, __SCOPE__ & ": Error while performing the operation");
5856 5856 }
5857 5857 [] tc_ac.timeout {
5858   - setverdict(fail, __SCOPE__ & ": No answer while creating resource");
  5858 + setverdict(fail, __SCOPE__ & ": No answer while performing the operation");
5859 5859 }
5860 5860 }
5861 5861  
... ... @@ -5975,17 +5975,17 @@ module OneM2M_PermutationFunctions {
5975 5975 mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
5976 5976 tc_ac.start;
5977 5977 alt {
5978   - [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
  5978 + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
5979 5979 tc_ac.stop;
5980   - setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
  5980 + setverdict(pass, __SCOPE__ & ": Operation performed successfully by using fanOutPoint in group resource");
5981 5981  
5982 5982 if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
5983   - setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
  5983 + setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse element not provided");
5984 5984 }
5985 5985 else {
5986 5986 for(i:=0; i<lengthof(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list); i := i+1){
5987   - if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitiveOK)){
5988   - setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse_list is not successful");
  5987 + if(not match(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list[i], mw_responsePrimitive(p_responseStatusCode))){
  5988 + setverdict(fail, __SCOPE__ & ": Error, one responsePrimitve of aggregatedResponse is not successful");
5989 5989 }
5990 5990 }
5991 5991 }
... ... @@ -5996,10 +5996,10 @@ module OneM2M_PermutationFunctions {
5996 5996 }
5997 5997 [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
5998 5998 tc_ac.stop;
5999   - setverdict(fail, __SCOPE__ & ": Error while creating resource");
  5999 + setverdict(fail, __SCOPE__ & ": Error while performing the operation");
6000 6000 }
6001 6001 [] tc_ac.timeout {
6002   - setverdict(fail, __SCOPE__ & ": No answer while creating resource");
  6002 + setverdict(fail, __SCOPE__ & ": No answer while performing the operation");
6003 6003 }
6004 6004 }
6005 6005  
... ... @@ -6077,7 +6077,7 @@ module OneM2M_PermutationFunctions {
6077 6077  
6078 6078 } // end f_CSE_GMG_004
6079 6079  
6080   - function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
  6080 + function f_CSE_GMG_005(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
6081 6081 //Local constants
6082 6082 const integer c_numberOfResponsePrimitive := 2;
6083 6083  
... ... @@ -6115,7 +6115,7 @@ module OneM2M_PermutationFunctions {
6115 6115 mcaPort.send(f_getMsgOutPrimitive(m_request(valueof(p_requestPrimitive))));
6116 6116 tc_ac.start;
6117 6117 alt {
6118   - [] mcaPort.receive(mw_response(mw_responsePrimitive(p_responseStatusCode))) -> value v_response {
  6118 + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
6119 6119 tc_ac.stop;
6120 6120 setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
6121 6121  
... ... @@ -6141,10 +6141,10 @@ module OneM2M_PermutationFunctions {
6141 6141 }
6142 6142 [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
6143 6143 tc_ac.stop;
6144   - setverdict(fail, __SCOPE__ & ": Error while creating resource");
  6144 + setverdict(fail, __SCOPE__ & ": Error while performing the operation");
6145 6145 }
6146 6146 [] tc_ac.timeout {
6147   - setverdict(fail, __SCOPE__ & ": No answer while creating resource");
  6147 + setverdict(fail, __SCOPE__ & ": No answer while performing the operation");
6148 6148 }
6149 6149 }
6150 6150  
... ... @@ -6156,7 +6156,7 @@ module OneM2M_PermutationFunctions {
6156 6156  
6157 6157 } // end f_CSE_GMG_005
6158 6158  
6159   - function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse, in ResponseStatusCode p_responseStatusCode) runs on AeSimu {
  6159 + function f_CSE_GMG_006(template RequestPrimitive p_requestPrimitive, template PrimitiveContent p_contentResponse) runs on AeSimu {
6160 6160 //Local constants
6161 6161 const integer c_numberOfResponsePrimitive := 2;
6162 6162  
... ... @@ -6202,9 +6202,9 @@ module OneM2M_PermutationFunctions {
6202 6202 mcaPort.send(f_getMsgOutPrimitive(m_request(v_createRequest)));
6203 6203 tc_ac.start;
6204 6204 alt {
6205   - [] mcaPort.receive(mw_response(mw_responsePrimitive(int2001))) -> value v_response {
  6205 + [] mcaPort.receive(mw_response(mw_responsePrimitive(int2000))) -> value v_response {
6206 6206 tc_ac.stop;
6207   - setverdict(pass, __SCOPE__ & ": creation successfull by using fanOutPoint in group resource");
  6207 + setverdict(pass, __SCOPE__ & ": Operation performed successfully by using fanOutPoint in group resource");
6208 6208  
6209 6209 if(not ispresent(v_response.primitive.responsePrimitive.primitiveContent.aggregatedResponse.responsePrimitive_list)){
6210 6210 setverdict(fail, __SCOPE__ & ": Error, aggregatedResponse attribute not provided");
... ... @@ -6228,10 +6228,10 @@ module OneM2M_PermutationFunctions {
6228 6228 }
6229 6229 [] mcaPort.receive(mw_response(mw_responsePrimitiveKO)) {
6230 6230 tc_ac.stop;
6231   - setverdict(fail, __SCOPE__ & ": Error while creating resource");
  6231 + setverdict(fail, __SCOPE__ & ": Error while performing the operation");
6232 6232 }
6233 6233 [] tc_ac.timeout {
6234   - setverdict(fail, __SCOPE__ & ": No answer while creating resource");
  6234 + setverdict(fail, __SCOPE__ & ": No answer while performing the operation");
6235 6235 }
6236 6236 }
6237 6237  
... ...
... ... @@ -12690,7 +12690,7 @@ module OneM2M_Testcases_CSE_Release_1 {
12690 12690 v_contentResponse.container := mw_contentContainer_rc1;
12691 12691 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
12692 12692 v_ae1.done;
12693   - v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse, int2001));
  12693 + v_ae1.start(f_CSE_GMG_005(m_createContainerBase, v_contentResponse));
12694 12694 v_ae1.done;
12695 12695 }//end TC_CSE_GMG_005_CRE
12696 12696  
... ... @@ -12706,7 +12706,7 @@ module OneM2M_Testcases_CSE_Release_1 {
12706 12706 v_contentResponse.container.labels := ?;
12707 12707 v_updateRequest.primitiveContent.container.labels := v_labels_1;
12708 12708  
12709   - v_ae1.start(f_CSE_GMG_005(v_updateRequest, v_contentResponse, int2004));
  12709 + v_ae1.start(f_CSE_GMG_005(v_updateRequest, v_contentResponse));
12710 12710 v_ae1.done;
12711 12711 }//end TC_CSE_GMG_005_UPD
12712 12712  
... ... @@ -12718,7 +12718,7 @@ module OneM2M_Testcases_CSE_Release_1 {
12718 12718 v_ae1.done;
12719 12719 v_contentResponse.container := mw_contentContainerBase;
12720 12720  
12721   - v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
  12721 + v_ae1.start(f_CSE_GMG_005(m_retrieve("Temporary", "Temporary"), v_contentResponse));
12722 12722 v_ae1.done;
12723 12723 }//end TC_CSE_GMG_005_RET
12724 12724  
... ... @@ -12728,7 +12728,7 @@ module OneM2M_Testcases_CSE_Release_1 {
12728 12728 v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
12729 12729 v_ae1.start(f_setProtocolBinding(PX_PROTOCOL_BINDING_AE1));
12730 12730 v_ae1.done;
12731   - v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));
  12731 + v_ae1.start(f_CSE_GMG_005(m_delete("Temporary", "Temporary"), v_contentResponse));
12732 12732 v_ae1.done;
12733 12733 }//end TC_CSE_GMG_005_DEL
12734 12734  
... ... @@ -12748,7 +12748,7 @@ module OneM2M_Testcases_CSE_Release_1 {
12748 12748 v_ae1.done;
12749 12749 v_contentResponse.container := mw_contentContainer_rc1;
12750 12750  
12751   - v_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse, int2001));
  12751 + v_ae1.start(f_CSE_GMG_006(m_createContainerBase, v_contentResponse));
12752 12752 v_ae1.done;
12753 12753 }//end TC_CSE_GMG_006_CRE
12754 12754  
... ... @@ -12763,7 +12763,7 @@ module OneM2M_Testcases_CSE_Release_1 {
12763 12763 v_contentResponse.container.labels := ?;
12764 12764 v_updateRequest.primitiveContent.container.labels := v_labels_1;
12765 12765  
12766   - v_ae1.start(f_CSE_GMG_006(v_updateRequest, v_contentResponse, int2004));
  12766 + v_ae1.start(f_CSE_GMG_006(v_updateRequest, v_contentResponse));
12767 12767 v_ae1.done;
12768 12768 }//end TC_CSE_GMG_006_UPD
12769 12769  
... ... @@ -12775,7 +12775,7 @@ module OneM2M_Testcases_CSE_Release_1 {
12775 12775 v_ae1.done;
12776 12776 v_contentResponse.container := mw_contentContainerBase;
12777 12777  
12778   - v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse, int2000));
  12778 + v_ae1.start(f_CSE_GMG_006(m_retrieve("Temporary", "Temporary"), v_contentResponse));
12779 12779 v_ae1.done;
12780 12780 }//end TC_CSE_GMG_006_RET
12781 12781  
... ... @@ -12787,7 +12787,7 @@ module OneM2M_Testcases_CSE_Release_1 {
12787 12787 v_ae1.done;
12788 12788 v_contentResponse.container := mw_contentContainerBase;// TODO see with wath should it be matched
12789 12789  
12790   - v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse, int2002));
  12790 + v_ae1.start(f_CSE_GMG_006(m_delete("Temporary", "Temporary"), v_contentResponse));
12791 12791 v_ae1.done;
12792 12792 }//end TC_CSE_GMG_006_DEL
12793 12793  
... ...