Commit 8c063e82 authored by berge's avatar berge
Browse files

Implemented TC_SAP_SAREF_BV_028 

Implemented TC_SAP_SAREF_BV_029
Implemented TC_SAP_SAREF_BV_030
Implemented TC_SAP_SAREF_BV_031
Implemented TC_SAP_SAREF_BV_032
Implemented TC_SAP_SAREF_BV_033
parent 05c2c7cf

ttcn/LibSmartAppliances/SmartAppliances_Functions.ttcn

+17 −12
Original line number Diff line number Diff line
@@ -188,18 +188,24 @@ module SmartAppliances_Functions { 


	group rdfFunctions {

		

		function f_checkRdfDescriptor(in XSD.Base64Binary p_receivedDescriptor, in template RdfDocument p_expectedRdfDescriptor, out charstring p_verdictMsg) runs on SmartAppliancesTester return verdicttype {

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

			

			var bitstring v_encodedDescriptor;

			var RdfDocument v_decodedDescriptor;



			v_encodedDescriptor := fx_base64ToBitstring(p_receivedDescriptor);

			if(decvalue(v_encodedDescriptor, v_decodedDescriptor) > 0 ) {

			if(decvalue(v_encodedDescriptor, p_decodedDescriptor) > 0 ) {

				p_verdictMsg := "ERROR: unable to decode RDF data";

				return inconc;

			}

			else {

				if(match(v_decodedDescriptor, p_expectedRdfDescriptor)) {

				p_verdictMsg := "INFO: RDF data decoded";

				return pass;	

			}			

		}

		

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



			if(match(p_decodedDescriptor, p_expectedRdfDescriptor)) {

				p_verdictMsg := "INFO: Correct descriptor content";

				return pass;

			}
@@ -208,7 +214,6 @@ module SmartAppliances_Functions { 
				return fail;

			}

		}

		}

		

	} // end refFunctions

ttcn/LibSmartAppliances/SmartAppliances_Pics.ttcn

+3 −0
Original line number Diff line number Diff line
@@ -17,8 +17,11 @@ module SmartAppliances_Pics { 
	modulepar boolean PICS_SAP_COMMAND := true;

	

	modulepar boolean PICS_SAP_OBJECT_PROPERTY := true;

	modulepar boolean PICS_SAP_DATA_PROPERTY := true;

	modulepar XSD.ID PICS_SAP_GENERIC_IWK_SERVICE := "NotInitialized";

	modulepar boolean PICS_SAP_CONTAINER := true;

	modulepar boolean PICS_SAP_FLEX_CONTAINER := true;

	

	modulepar XSD.ID PICS_SAP_GENERIC_IWK_OP_INSTANCE := "NotInitialized";

	

}
 
 No newline at end of file

ttcn/LibSmartAppliances/SmartAppliances_Types.ttcn

+1 −11
Original line number Diff line number Diff line
@@ -67,17 +67,7 @@ module SmartAppliances_Types { 
		

		type XSD.AnyURI RdfPredicate;

		

		type union RdfObject {

			XSD.AnyURI iri_,

			XSD.String string_,	

			XSD.Boolean boolean_,

			XSD.Integer integer_,

			XSD.Decimal decimal_,

			XSD.Double double_,

			XSD.Date date_,

			XSD.DateTime dateTime_,

			XSD.Time time_

		}

		type XSD.AnyURI RdfObject;

		

	} // end rdf

}
 
 No newline at end of file

ttcn/SmartAppliances_TestControl.ttcn

+33 −24
Original line number Diff line number Diff line
@@ -263,33 +263,42 @@ module SmartAppliances_TestControl { 
    				execute(TC_SAP_SAREF_BV_013_20());

				}

			}

  		}

  		

		if(PICS_SAP_DEVICE == true) {

			

			if(PICS_SAP_DATA_PROPERTY == true) {

				execute(TC_SAP_SAREF_BV_028());

			}	

			

			/*

			if(PICS_SAP_FUNCTION == true) {

				execute(TC_SAP_SAREF_BV_009_01());

				execute(TC_SAP_SAREF_BV_009_02());

				execute(TC_SAP_SAREF_BV_009_03());

				execute(TC_SAP_SAREF_BV_009_04());

				execute(TC_SAP_SAREF_BV_009_05());

				execute(TC_SAP_SAREF_BV_009_06());

				execute(TC_SAP_SAREF_BV_009_07());

				execute(TC_SAP_SAREF_BV_009_08());

				execute(TC_SAP_SAREF_BV_009_09());

				execute(TC_SAP_SAREF_BV_009_10());

				execute(TC_SAP_SAREF_BV_009_11());

    			execute(TC_SAP_SAREF_BV_009_12());

    			execute(TC_SAP_SAREF_BV_009_13());

    			execute(TC_SAP_SAREF_BV_009_14());

    			execute(TC_SAP_SAREF_BV_009_15());

    			execute(TC_SAP_SAREF_BV_009_16());

    			execute(TC_SAP_SAREF_BV_009_17());

    			execute(TC_SAP_SAREF_BV_009_18());

    			execute(TC_SAP_SAREF_BV_009_19());

    			execute(TC_SAP_SAREF_BV_009_20());

				execute(TC_SAP_SAREF_BV_029());

			}

			*/

		}	

		

		if(PICS_SAP_FUNCTION == true) {

				

			if(PICS_SAP_COMMAND == true) {

				execute(TC_SAP_SAREF_BV_030());

			}

			

			if(PICS_SAP_SERVICE == true) {

				execute(TC_SAP_SAREF_BV_031());

			}

		}	

		

		if(PICS_SAP_DEVICE == true) {

			

			if(PICS_SAP_SERVICE == true) {

				execute(TC_SAP_SAREF_BV_032());

			}

		}	

		

		if(PICS_SAP_SERVICE == true) {

			

			if(PICS_SAP_OBJECT_PROPERTY == true) {

				execute(TC_SAP_SAREF_BV_033());

			}

		}	

	}

}
 
 No newline at end of file

ttcn/SmartAppliances_Testcases.ttcn

+560 −78

File changed.

Preview size limit exceeded, changes collapsed.