Commit 63ad22e0 authored by urbant's avatar urbant
Browse files

Correction in tests for decoded content (correct encoding procedure)

parent 102caaf9
Loading
Loading
Loading
Loading
+28 −43
Original line number Original line Diff line number Diff line
@@ -16,11 +16,7 @@ module Sem_B010209_decoded_content_004 {
        charstring payload
        charstring payload
    }
    }
    
    
	type record Mymessage {
    type integer MyInt with { encode "32bit" }
	  integer field1,
	  bitstring field2 optional
    }
	


    type port loopbackPort message{inout MessageType};
    type port loopbackPort message{inout MessageType};
	
	
@@ -29,28 +25,18 @@ type component GeneralComp {
	      port loopbackPort messagePort
	      port loopbackPort messagePort
    }
    }
    
    
testcase TC_Sem_B010209_decoded_content_004() runs on GeneralComp {
    const MyInt c_input := 1633837665;
    var bitstring v_enc;
    var Mymessage v_testMessage;
    var MessageType Message;
    
    
    v_testMessage:=  {  
    template MessageType mw_matchingTemplate:= {  			
        field1 := 10,
        payload :=  decmatch MyInt:c_input
        field2 := '1001'B
    } 
    } 


      Message.payload := bit2str(encvalue(v_testMessage));		//encode message to payload, charstring
    testcase TC_Sem_B010209_decoded_content_004() runs on GeneralComp {
          
        var MessageType v_message;
    
    

 template MessageType mw_matchingTemplate:=
  {  			
  payload :=  decmatch Mymessage: {field1:= 10, field2 := '1001'B}
  } 
    
    
        v_message.payload := encvalue_unichar(c_input); //encode message to payload, charstring
              
              
  messagePort.send(Message);	//send message
        messagePort.send(v_message); //send message
    
    
        alt {
        alt {
            [] messagePort.receive(mw_matchingTemplate) {
            [] messagePort.receive(mw_matchingTemplate) {
@@ -60,7 +46,6 @@ testcase TC_Sem_B010209_decoded_content_004() runs on GeneralComp {
                setverdict(fail,mw_matchingTemplate);
                setverdict(fail,mw_matchingTemplate);
            }
            }
        }
        }
    
    }
    }
    
    
    control{
    control{
+29 −41
Original line number Original line Diff line number Diff line
@@ -16,45 +16,33 @@ module Sem_B010209_decoded_content_005 {
        universal charstring payload
        universal charstring payload
    }
    }
    
    
	type record Mymessage {
    type integer MyInt with { encode "32bit" }
	  integer field1,
	 universal charstring field2 optional
    }
	


    type port loopbackPort message{inout MessageType};
    type port loopbackPort message{inout MessageType};



    type component GeneralComp {	    	    
    type component GeneralComp {	    	    
	      port loopbackPort messagePort
	      port loopbackPort messagePort
    }	
    }	


testcase TC_Sem_B010209_decoded_content_005() runs on GeneralComp {
    const MyInt c_input := 1633837665;

    var Mymessage v_testMessage;
    var MessageType Message;
    
    v_testMessage:= {1,"A"} ;
    
    
      Message.payload :=any2unistr(v_testMessage);		//encode message to payload,universal charstring UTF-8
    template MessageType mw_matchingTemplate:= {  			
          
        payload :=  decmatch MyInt:c_input
    
    

 template MessageType mw_matchingTemplate:=
  {  			
  payload :=  decmatch("UTF-8") Mymessage: {1,"A"}
    } 
    } 
    
    
    testcase TC_Sem_B010209_decoded_content_005() runs on GeneralComp {
        var MessageType v_message;
    
        v_message.payload := encvalue_unichar(c_input); //encode message to payload, charstring
              
              
  messagePort.send(Message);	//send message
        messagePort.send(v_message); //send message
    
    
        alt {
        alt {
            [] messagePort.receive(mw_matchingTemplate) {
            [] messagePort.receive(mw_matchingTemplate) {
                setverdict(pass);
                setverdict(pass);
            }
            }
            [] messagePort.receive {
            [] messagePort.receive {
        setverdict(fail,mw_matchingTemplate.payload);
                setverdict(fail,mw_matchingTemplate);
            }
            }
        }
        }