Commit e194e6c7 authored by berge's avatar berge
Browse files

Implemented TC_SAP_SAREF_BV_014 

Implemented TC_SAP_SAREF_BV_015
Implemented TC_SAP_SAREF_BV_016
Implemented TC_SAP_SAREF_BV_017
Implemented TC_SAP_SAREF_BV_018
parent 8c063e82

ttcn/LibSmartAppliances/SmartAppliances_Functions.ttcn

+24 −2
Original line number Original line Diff line number Diff line
@@ -148,6 +148,21 @@ module SmartAppliances_Functions { 
				return v_ret;

				return v_ret;

			}

			}

			

			

			/**

			 * @desc	Waits for GenericInterworkingOperationInstance CREATE request and process it

			 * @return 	Internal resource index of GenericInterworkingOperationInstance or -1 in case of failure		

			 * @verdict	inconc if no GenericInterworkingOperationInstance CREATE request is received 

			 */			

			 function f_ae_preamble_createGenericIwkOpInstance() runs on AeTester return integer {

			

				var integer v_ret := -1;

				

				// TODO

				log("not implemented");

				

				return v_ret;

			}

			

		} // end preambleFunctions

		} // end preambleFunctions

		

		

		group postambleFunctions {

		group postambleFunctions {
@@ -188,7 +203,7 @@ module SmartAppliances_Functions { 




	group rdfFunctions {

	group rdfFunctions {

		

		

		function f_parseRdfDescriptor(in XSD.Base64Binary p_receivedDescriptor, out RdfDocument p_decodedDescriptor, out charstring p_verdictMsg) return verdicttype {

		function f_rdfParseDescriptor(in XSD.Base64Binary p_receivedDescriptor, out RdfDocument p_decodedDescriptor, out charstring p_verdictMsg) return verdicttype {

			

			

			var bitstring v_encodedDescriptor;

			var bitstring v_encodedDescriptor;
@@ -203,7 +218,7 @@ module SmartAppliances_Functions { 
			}			

			}			

		}

		}

		

		

		function f_checkRdfDescriptor(in RdfDocument p_decodedDescriptor, in template RdfDocument p_expectedRdfDescriptor, out charstring p_verdictMsg) return verdicttype {

		function f_rdfCheckDescriptor(in RdfDocument p_decodedDescriptor, in template RdfDocument p_expectedRdfDescriptor, out charstring p_verdictMsg) return verdicttype {





			if(match(p_decodedDescriptor, p_expectedRdfDescriptor)) {

			if(match(p_decodedDescriptor, p_expectedRdfDescriptor)) {

				p_verdictMsg := "INFO: Correct descriptor content";

				p_verdictMsg := "INFO: Correct descriptor content";
@@ -215,6 +230,13 @@ module SmartAppliances_Functions { 
			}

			}

		}

		}

		

		

		function f_rdfFindTriple(in RdfDocument p_rdfDocument, in template RdfTriple p_search, out RdfTriple p_found) return boolean {

		

			//TODO

			log("Not implemented");	

			return true;

		}

		

	} // end refFunctions

	} // end refFunctions

	

	

	group externalFunctions {

	group externalFunctions {

ttcn/LibSmartAppliances/SmartAppliances_Pics.ttcn

+3 −0
Original line number Original line Diff line number Diff line
@@ -24,4 +24,7 @@ module SmartAppliances_Pics { 
	

	

	modulepar XSD.ID PICS_SAP_GENERIC_IWK_OP_INSTANCE := "NotInitialized";

	modulepar XSD.ID PICS_SAP_GENERIC_IWK_OP_INSTANCE := "NotInitialized";

	

	

	modulepar boolean PICS_SAP_THING := true;

	modulepar boolean PICS_SAP_ASPECT := true;

	modulepar boolean PICS_SAP_OPERATION := true;

}
 
}
 
 No newline at end of file

ttcn/SmartAppliances_TestControl.ttcn

+46 −1
Original line number Original line Diff line number Diff line
@@ -265,6 +265,51 @@ module SmartAppliances_TestControl { 
			}

			}

  		}

  		}





		if(PICS_SAP_OPERATION == true) {

			

			execute(TC_SAP_SAREF_BV_014());

			

			if(PICS_SAP_CONTAINER == true) {

				execute(TC_SAP_SAREF_BV_015());

				execute(TC_SAP_SAREF_BV_017());

			}

			

			if(PICS_SAP_FLEX_CONTAINER == true) {

				execute(TC_SAP_SAREF_BV_016());

				execute(TC_SAP_SAREF_BV_018());

			}

		}



		if(PICS_SAP_ASPECT == true) {

			

			if(PICS_SAP_CONTAINER == true) {

				execute(TC_SAP_SAREF_BV_022());

			}

			

			if(PICS_SAP_FLEX_CONTAINER == true) {

				execute(TC_SAP_SAREF_BV_023());

			}

		}



		if(PICS_SAP_THING == true) {

			

			if(PICS_SAP_CONTAINER == true) {

				execute(TC_SAP_SAREF_BV_024());

			}

			

			if(PICS_SAP_FLEX_CONTAINER == true) {

				execute(TC_SAP_SAREF_BV_025());

			}

		}		  		

		

		if(PICS_SAP_OBJECT_PROPERTY == true) {

			// execute(TC_SAP_SAREF_BV_026_XX()); // Not implemented

		}

		

		if(PICS_SAP_DATA_PROPERTY == true) {

			// execute(TC_SAP_SAREF_BV_027_XX()); // Not implemented

		}

				  		

		if(PICS_SAP_DEVICE == true) {

		if(PICS_SAP_DEVICE == true) {

			

			

			if(PICS_SAP_DATA_PROPERTY == true) {

			if(PICS_SAP_DATA_PROPERTY == true) {

ttcn/SmartAppliances_Testcases.ttcn

+784 −608

File changed.

Preview size limit exceeded, changes collapsed.