Commit 3209c661 authored by berge's avatar berge
Browse files

Minor fixes

parent cfc92b1d

ttcn/LibSmartAppliances/SmartAppliances_Pics.ttcn

+58 −9
Original line number Original line Diff line number Diff line
@@ -10,21 +10,70 @@ module SmartAppliances_Pics { 




	import from XSD all;

	import from XSD all;





	/**

	 * @desc PICS Item A.5.1/1 

	 */

	modulepar boolean PICS_SAP_AE := true;

	modulepar boolean PICS_SAP_AE := true;

	modulepar boolean PICS_SAP_SERVICE := true;

	modulepar boolean PICS_SAP_DEVICE := true;

	modulepar boolean PICS_SAP_FUNCTION := true;

	modulepar boolean PICS_SAP_COMMAND := true;





	modulepar boolean PICS_SAP_OBJECT_PROPERTY := true;

	/**

	modulepar boolean PICS_SAP_DATA_PROPERTY := true;

	 * @desc PICS Item A.5.1/2 

	modulepar XSD.ID PICS_SAP_GENERIC_IWK_SERVICE := "NotInitialized";

	 */

	modulepar boolean PICS_SAP_CONTAINER := true;

	modulepar boolean PICS_SAP_CONTAINER := true;

	

	/**

	 * @desc PICS Item A.5.1/3 

	 */

	modulepar boolean PICS_SAP_FLEX_CONTAINER := true;

	modulepar boolean PICS_SAP_FLEX_CONTAINER := true;

	

	

	/**

	 * @desc PICS Item A.5.1/4 

	 */

	modulepar XSD.ID PICS_SAP_GENERIC_IWK_SERVICE := "NotInitialized";

	

	/**

	 * @desc PICS Item A.5.1/5 

	 */

	modulepar XSD.ID PICS_SAP_GENERIC_IWK_OP_INSTANCE := "NotInitialized";

	modulepar XSD.ID PICS_SAP_GENERIC_IWK_OP_INSTANCE := "NotInitialized";

	

	

	/**

	 * @desc PICS Item A.5.2/1 

	 */

	modulepar boolean PICS_SAP_DEVICE := true;

	

	/**

	 * @desc PICS Item A.5.3/1 

	 */

	modulepar boolean PICS_SAP_FUNCTION := true;



	/**

	 * @desc PICS Item A.5.4/1 

	 */

	modulepar boolean PICS_SAP_SERVICE := true;

	

	/**

	 * @desc PICS Item A.5.5/1 

	 */

	modulepar boolean PICS_SAP_PROPERTY := true;

	

	/**

	 * @desc PICS Item A.5.6/1 

	 */

	modulepar boolean PICS_SAP_COMMAND := true;

	

	/**

	 * @desc PICS Item A.5.18/1 

	 */	

	modulepar boolean PICS_SAP_OPERATION := true;		

	



	/**

	 * @desc PICS Item A.5.19/1 

	 */

	modulepar boolean PICS_SAP_THING := true;

	modulepar boolean PICS_SAP_THING := true;

	



	/**

	 * @desc PICS Item A.5.20/1 

	 */

	modulepar boolean PICS_SAP_ASPECT := true;

	modulepar boolean PICS_SAP_ASPECT := true;

	modulepar boolean PICS_SAP_OPERATION := true;

}
 
}
 
 No newline at end of file

ttcn/SmartAppliances_TestControl.ttcn

+45 −53
Original line number Original line Diff line number Diff line
@@ -96,7 +96,6 @@ module SmartAppliances_TestControl { 
			execute(TC_SAP_SAREF_BV_002_39());

			execute(TC_SAP_SAREF_BV_002_39());

			execute(TC_SAP_SAREF_BV_002_40());			

			execute(TC_SAP_SAREF_BV_002_40());			





			if(PICS_SAP_OBJECT_PROPERTY) {

			execute(TC_SAP_SAREF_BV_003_01());

			execute(TC_SAP_SAREF_BV_003_01());

            execute(TC_SAP_SAREF_BV_003_02());

            execute(TC_SAP_SAREF_BV_003_02());

            execute(TC_SAP_SAREF_BV_003_03());

            execute(TC_SAP_SAREF_BV_003_03());
@@ -140,7 +139,6 @@ module SmartAppliances_TestControl { 
			execute(TC_SAP_SAREF_BV_004_09());

			execute(TC_SAP_SAREF_BV_004_09());

			execute(TC_SAP_SAREF_BV_004_10());

			execute(TC_SAP_SAREF_BV_004_10());

			execute(TC_SAP_SAREF_BV_004_11());

			execute(TC_SAP_SAREF_BV_004_11());

			}

				

				

			//execute(TC_SAP_SAREF_BV_005_XX()); // Not implemented

			//execute(TC_SAP_SAREF_BV_005_XX()); // Not implemented
@@ -307,10 +305,7 @@ module SmartAppliances_TestControl { 
		}		  		

		}		  		

				  		

				  		

		if(PICS_SAP_DEVICE == true) {

		if(PICS_SAP_DEVICE == true) {

			

			if(PICS_SAP_DATA_PROPERTY == true) {

			execute(TC_SAP_SAREF_BV_028());

			execute(TC_SAP_SAREF_BV_028());

			}	

			

			

			if(PICS_SAP_FUNCTION == true) {

			if(PICS_SAP_FUNCTION == true) {

				execute(TC_SAP_SAREF_BV_029());

				execute(TC_SAP_SAREF_BV_029());
@@ -336,10 +331,7 @@ module SmartAppliances_TestControl { 
		}	

		}	

		

		

		if(PICS_SAP_SERVICE == true) {

		if(PICS_SAP_SERVICE == true) {

			

			if(PICS_SAP_OBJECT_PROPERTY == true) {

			execute(TC_SAP_SAREF_BV_033());

			execute(TC_SAP_SAREF_BV_033());

		}	

		}	

	}

	}

}
 
}
 
 No newline at end of file
 
}
 
 No newline at end of file

ttcn/SmartAppliances_Testcases.ttcn

+11 −11
Original line number Original line Diff line number Diff line
@@ -1161,8 +1161,8 @@ module SmartAppliances_Testcases { 
				var RdfDocument v_decodedDescriptor;

				var RdfDocument v_decodedDescriptor;

					 							   

					 							   

    			// Test control

    			// Test control

    			if(not PICS_SAP_AE and PICS_SAP_OBJECT_PROPERTY) {

    			if(not PICS_SAP_AE) {

    				setverdict(none, testcasename() & ": ERROR: PICS_SAP_AE and PICS_SAP_OBJECT_PROPERTY required for executing the TC");

    				setverdict(none, testcasename() & ": ERROR: PICS_SAP_AE required for executing the TC");

    				stop;

    				stop;

    			}

    			}
@@ -1685,8 +1685,8 @@ module SmartAppliances_Testcases { 
				var RdfDocument v_decodedDescriptor;			

				var RdfDocument v_decodedDescriptor;			

    			    							   

    			    							   

    			// Test control

    			// Test control

    			if(not PICS_SAP_AE and PICS_SAP_OBJECT_PROPERTY) {

    			if(not PICS_SAP_AE) {

    				setverdict(none, testcasename() & ": ERROR: PICS_SAP_AE and PICS_SAP_OBJECT_PROPERTY required for executing the TC");

    				setverdict(none, testcasename() & ": ERROR: PICS_SAP_AE required for executing the TC");

    				stop;

    				stop;

    			}

    			}
@@ -1909,8 +1909,8 @@ module SmartAppliances_Testcases { 
				var RdfDocument v_decodedDescriptor;			

				var RdfDocument v_decodedDescriptor;			

    			    							   

    			    							   

    			// Test control

    			// Test control

    			if(not PICS_SAP_AE and PICS_SAP_OBJECT_PROPERTY) {

    			if(not PICS_SAP_AE) {

    				setverdict(none, testcasename() & ": ERROR: PICS_SAP_AE and PICS_SAP_OBJECT_PROPERTY required for executing the TC");

    				setverdict(none, testcasename() & ": ERROR: PICS_SAP_AE required for executing the TC");

    				stop;

    				stop;

    			}

    			}
@@ -4887,8 +4887,8 @@ module SmartAppliances_Testcases { 
    			); 		

    			); 		

    				    			    							   

    				    			    							   

    			// Test control

    			// Test control

    			if(not(PICS_SAP_DEVICE and PICS_SAP_DATA_PROPERTY)) {

    			if(not(PICS_SAP_DEVICE)) {

    				setverdict(none, testcasename() & ": ERROR: PICS_SAP_DEVICE and PICS_SAP_DATA_PROPERTY required for executing the TC");

    				setverdict(none, testcasename() & ": ERROR: PICS_SAP_DEVICE required for executing the TC");

    				stop;

    				stop;

    			}

    			}
@@ -5238,8 +5238,8 @@ module SmartAppliances_Testcases { 
				var integer i;	

				var integer i;	

    				    			    							   

    				    			    							   

				// Test control

				// Test control

				if(not(PICS_SAP_SERVICE and PICS_SAP_OBJECT_PROPERTY)) {

				if(not(PICS_SAP_SERVICE)) {

					setverdict(none, testcasename() & ": ERROR: PICS_SAP_DEVICE and PICS_SAP_FUNCTION required for executing the TC");

					setverdict(none, testcasename() & ": ERROR: PICS_SAP_SERVICE required for executing the TC");

					stop;

					stop;

				}

				}