Index: firmware/App/Controllers/AirTrap.c =================================================================== diff -u -r61716bc97ecca8af1ec560333844a8cf602eccb0 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- firmware/App/Controllers/AirTrap.c (.../AirTrap.c) (revision 61716bc97ecca8af1ec560333844a8cf602eccb0) +++ firmware/App/Controllers/AirTrap.c (.../AirTrap.c) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -14,71 +14,71 @@ * @date (original) 16-Sep-2020 * ***************************************************************************/ - -#include "AirTrap.h" -#include "AlarmMgmt.h" + +#include "AirTrap.h" +#include "AlarmMgmt.h" #include "FPGA.h" -#include "ModeTreatmentParams.h" -#include "OperationModes.h" -#include "SystemCommMessages.h" +#include "ModeTreatmentParams.h" +#include "OperationModes.h" +#include "SystemCommMessages.h" #include "TaskGeneral.h" -#include "TaskPriority.h" -#include "Timers.h" - -/** - * @addtogroup AirTrap - * @{ - */ - -// ********** private definitions ********** +#include "TaskPriority.h" +#include "Timers.h" -/// Interval (ms/task time) at which the air trap data is published on the CAN bus. +/** + * @addtogroup AirTrap + * @{ + */ + +// ********** private definitions ********** + +/// Interval (ms/task time) at which the air trap data is published on the CAN bus. #define AIR_TRAP_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) /// Persistence period for illegal level sensors fault. static const U32 AIR_TRAP_ILLEGAL_LEVELS_PERSISTENCE = ( MS_PER_SECOND * 2 / TASK_PRIORITY_INTERVAL ); /// Volume (in mL) of venous portion of blood circuit line. TODO - get actual volume from Systems. -#define VENOUS_LINE_VOLUME_ML ( 200.0 ) - -/// Defined states for the air trap controller state machine. -typedef enum AirTrap_States -{ - AIR_TRAP_INIT_STATE = 0, ///< Initialization state +#define VENOUS_LINE_VOLUME_ML ( 200.0 ) + +/// Defined states for the air trap controller state machine. +typedef enum AirTrap_States +{ + AIR_TRAP_INIT_STATE = 0, ///< Initialization state AIR_TRAP_MANUAL_CONTROL_STATE, ///< Manually control air trap valve state AIR_TRAP_VALVE_CLOSED_STATE, ///< Valve closed state - until air detected at lower level - AIR_TRAP_VALVE_OPEN_STATE, ///< Valve open state - until fluid detected at upper level - NUM_OF_AIR_TRAP_STATES ///< Number of air trap controller states -} AIR_TRAP_STATE_T; - -// ********** private data ********** - -static AIR_TRAP_STATE_T airTrapControllerState; ///< Current state of air trap controller state machine. -static U32 airTrapDataPublicationTimerCounter = 0; ///< Used to schedule air trap data publication to CAN bus. - + AIR_TRAP_VALVE_OPEN_STATE, ///< Valve open state - until fluid detected at upper level + NUM_OF_AIR_TRAP_STATES ///< Number of air trap controller states +} AIR_TRAP_STATE_T; + +// ********** private data ********** + +static AIR_TRAP_STATE_T airTrapControllerState; ///< Current state of air trap controller state machine. +static U32 airTrapDataPublicationTimerCounter = 0; ///< Used to schedule air trap data publication to CAN bus. + /// Interval (in ms) at which to publish air trap data to CAN bus. -static OVERRIDE_U32_T airTrapDataPublishInterval = { AIR_TRAP_DATA_PUB_INTERVAL, AIR_TRAP_DATA_PUB_INTERVAL, 0, 0 }; -static OVERRIDE_U32_T airTrapLevels[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ]; ///< Detected air trap level for each level sensor. +static OVERRIDE_U32_T airTrapDataPublishInterval = { AIR_TRAP_DATA_PUB_INTERVAL, AIR_TRAP_DATA_PUB_INTERVAL, 0, 0 }; +static OVERRIDE_U32_T airTrapLevels[ NUM_OF_AIR_TRAP_LEVEL_SENSORS ]; ///< Detected air trap level for each level sensor. static BOOL pendingStartAirTrapController = FALSE; ///< Flag indicates an air trap controller start request is pending. static BOOL pendingStopAirTrapController = FALSE; ///< Flag indicates an air trap controller stop request is pending. static U32 fillStartTime = 0; ///< Time stamp for start of air trap fill. static U32 airTrapIllegalLevelSensorsCtr = 0; ///< Timer counter for illegal level sensor fault. - -// ********** private function prototypes ********** - -static AIR_TRAP_STATE_T handleAirTrapManualControlState( void ); -static AIR_TRAP_STATE_T handleAirTrapValveClosedState( void ); + +// ********** private function prototypes ********** + +static AIR_TRAP_STATE_T handleAirTrapManualControlState( void ); +static AIR_TRAP_STATE_T handleAirTrapValveClosedState( void ); static AIR_TRAP_STATE_T handleAirTrapValveOpenState( void ); -static void publishAirTrapData( void ); - -/*********************************************************************//** - * @brief - * The initAirTrap function initializes the Air Trap module. - * @details Inputs: none - * @details Outputs: Air Trap module initialized. - * @return none - *************************************************************************/ +static void publishAirTrapData( void ); + +/*********************************************************************//** + * @brief + * The initAirTrap function initializes the Air Trap module. + * @details Inputs: none + * @details Outputs: Air Trap module initialized. + * @return none + *************************************************************************/ void initAirTrap( void ) { U32 i; @@ -345,6 +345,7 @@ result = AIR_TRAP_VALVE_CLOSED_STATE; } + return result; } @@ -519,4 +520,4 @@ return result; } -/**@}*/ +/**@}*/ Index: vectorcast/Hercules_RM46_HD_Project/environment/ACCEL/ACCEL.tst =================================================================== diff -u -r517fed82f4ba6f16407bef6c4e548a0ef175fb9d -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/ACCEL/ACCEL.tst (.../ACCEL.tst) (revision 517fed82f4ba6f16407bef6c4e548a0ef175fb9d) +++ vectorcast/Hercules_RM46_HD_Project/environment/ACCEL/ACCEL.tst (.../ACCEL.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -35,55 +35,162 @@ TEST.SUBPROGRAM:checkForShockError TEST.NEW TEST.NAME:checkForShockError.001 -TEST.MCDC_BASIS_PATH:7 of 12 -TEST.NOTES: -This is an automatically generated test case. - Test Path 7 - (1) if (maxY > maxX || maxZ > maxX) ==> FALSE - (3) if (maxAll > (2.5)) ==> FALSE - (4) if ((1) == shockErrorDetected && maxAll > (1.0)) ==> TRUE - Row number 1 forms a pair with Row 3 for Condition #4, subcondition "a". - Condition a ==> TRUE - Condition b ==> TRUE - Test Case Generation Notes: - Cannot set local variable maxX in branch 1 - Cannot set local variable maxZ in branch 1 -TEST.END_NOTES: -TEST.VALUE:Accel.<>.shockErrorDetected:1 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:10.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:10.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:20.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:20.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:30.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:30.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:10.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:10.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:20.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:20.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:30.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:30.0 TEST.END -- Test Case: checkForShockError.002 TEST.UNIT:Accel TEST.SUBPROGRAM:checkForShockError TEST.NEW TEST.NAME:checkForShockError.002 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:10.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:10.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:2.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:2.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:2.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:2.5 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:10.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:10.0 +TEST.END + +-- Test Case: checkForShockError.003 +TEST.UNIT:Accel +TEST.SUBPROGRAM:checkForShockError +TEST.NEW +TEST.NAME:checkForShockError.003 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:2.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:2.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:2.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:2.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:2.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:2.5 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:2.5 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:2.5 +TEST.END + +-- Test Case: checkForShockError.004 +TEST.UNIT:Accel +TEST.SUBPROGRAM:checkForShockError +TEST.NEW +TEST.NAME:checkForShockError.004 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:1.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:1.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:1.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:1.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:1.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:1.5 +TEST.VALUE:Accel.<>.shockErrorDetected:1 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:1.5 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:1.5 +TEST.EXPECTED:Accel.<>.shockErrorDetected:1 +TEST.END + +-- Test Case: checkForShockError.005 +TEST.UNIT:Accel +TEST.SUBPROGRAM:checkForShockError +TEST.NEW +TEST.NAME:checkForShockError.005 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:0.9 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:0.9 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:1.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:1.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:1.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:1.5 +TEST.VALUE:Accel.<>.shockErrorDetected:1 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:0.9 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:0.9 +TEST.EXPECTED:Accel.<>.shockErrorDetected:1 +TEST.END + +-- Test Case: checkForShockError.006 +TEST.UNIT:Accel +TEST.SUBPROGRAM:checkForShockError +TEST.NEW +TEST.NAME:checkForShockError.006 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:1.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:1.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:0.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:0.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:0.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:0.5 +TEST.VALUE:Accel.<>.shockErrorDetected:0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:1.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:1.0 +TEST.EXPECTED:Accel.<>.shockErrorDetected:0 +TEST.END + +-- Test Case: checkForShockError.007 +TEST.UNIT:Accel +TEST.SUBPROGRAM:checkForShockError +TEST.NEW +TEST.NAME:checkForShockError.007 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:1.2 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:1.2 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:0.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:0.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:0.5 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:0.5 +TEST.VALUE:Accel.<>.shockErrorDetected:0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:1.2 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:1.2 +TEST.EXPECTED:Accel.<>.shockErrorDetected:0 +TEST.END + +-- Test Case: checkForShockError.008 +TEST.UNIT:Accel +TEST.SUBPROGRAM:checkForShockError +TEST.NEW +TEST.NAME:checkForShockError.008 +TEST.MCDC_BASIS_PATH:7 of 12 TEST.NOTES: This is an automatically generated test case. - Test Path 9 + Test Path 7 (1) if (maxY > maxX || maxZ > maxX) ==> FALSE (3) if (maxAll > (2.5)) ==> FALSE - (4) if ((1) == shockErrorDetected && maxAll > (1.0)) ==> FALSE - (5) if (maxAll <= (1.0)) ==> FALSE - Row number 2 forms a pair with Row 1 for Condition #5, subcondition "a". - Condition a ==> FALSE + (4) if ((1) == shockErrorDetected && maxAll > (1.0)) ==> TRUE + Row number 1 forms a pair with Row 3 for Condition #4, subcondition "a". + Condition a ==> TRUE + Condition b ==> TRUE Test Case Generation Notes: Cannot set local variable maxX in branch 1 Cannot set local variable maxZ in branch 1 TEST.END_NOTES: -TEST.STUB:Accel.getMaxAccelAxis +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_X]:2.4 +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_Y..ACCEL_AXIS_Z]:2.3 TEST.VALUE:Accel.<>.shockErrorDetected:1 -TEST.VALUE:Accel.getMaxAccelAxis.return:2.0 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_X]:2.4 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_Y..ACCEL_AXIS_Z]:2.3 TEST.END -- Test Case: checkForShockError_BelowLimit TEST.UNIT:Accel TEST.SUBPROGRAM:checkForShockError TEST.NEW TEST.NAME:checkForShockError_BelowLimit -TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:2.0 -TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:2.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:0.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:0.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:1.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:1.0 TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:2.0 +TEST.VALUE:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:2.0 TEST.VALUE:Accel.<>.shockErrorDetected:0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].data:0.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_X].ovData:0.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_Y].data:1.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_Y].ovData:1.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_Z].data:2.0 +TEST.EXPECTED:Accel.<>.accelMaxs[ACCEL_AXIS_Z].ovData:2.0 TEST.END -- Test Case: checkForShockError_XShock @@ -152,31 +259,64 @@ Cannot set return value of function fabs in branch 3 Cannot set return value of function fabs in branch 1 TEST.END_NOTES: +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_X..ACCEL_AXIS_Y]:6.0 TEST.VALUE:Accel.<>.tiltErrorDetected:1 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_X..ACCEL_AXIS_Y]:6.0 +TEST.EXPECTED:Accel.<>.tiltErrorDetected:1 TEST.END -- Test Case: checkForTiltError.002 TEST.UNIT:Accel TEST.SUBPROGRAM:checkForTiltError TEST.NEW TEST.NAME:checkForTiltError.002 -TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_X]:-6.0 -TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_Y]:-5.0 +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_X]:-5.0 +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_Y]:-6.0 TEST.VALUE:Accel.<>.accelTiltErrorTimerCounter:99 TEST.VALUE:Accel.<>.tiltErrorDetected:1 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_X]:-5.0 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_Y]:-6.0 +TEST.EXPECTED:Accel.<>.accelTiltErrorTimerCounter:99 +TEST.EXPECTED:Accel.<>.tiltErrorDetected:1 TEST.END -- Test Case: checkForTiltError.003 TEST.UNIT:Accel TEST.SUBPROGRAM:checkForTiltError TEST.NEW TEST.NAME:checkForTiltError.003 -TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_X]:-5.0 -TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_Y]:-6.0 -TEST.VALUE:Accel.<>.accelTiltErrorTimerCounter:99 +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_X]:5.2 +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_Y]:5.0 TEST.VALUE:Accel.<>.tiltErrorDetected:1 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_X]:5.2 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_Y]:5.0 +TEST.EXPECTED:Accel.<>.tiltErrorDetected:1 TEST.END +-- Test Case: checkForTiltError.004 +TEST.UNIT:Accel +TEST.SUBPROGRAM:checkForTiltError +TEST.NEW +TEST.NAME:checkForTiltError.004 +TEST.MCDC_BASIS_PATH:5 of 14 +TEST.NOTES: +This is an automatically generated test case. + Test Path 5 + (1) if (fabs(x) > (7.0) || fabs(y) > (7.0)) ==> FALSE + (3) if ((1) == tiltErrorDetected && (fabs(x) > (5.0) || fabs(y) > (5.0))) ==> TRUE + Row number 3 forms a pair with Row 7 for Condition #3, subcondition "a". + Condition a ==> TRUE + Condition b ==> FALSE + Condition c ==> TRUE + Test Case Generation Notes: + Cannot set return value of function fabs in branch 3 + Cannot set return value of function fabs in branch 1 +TEST.END_NOTES: +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_X..ACCEL_AXIS_Y]:0.0 +TEST.VALUE:Accel.<>.tiltErrorDetected:1 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_X..ACCEL_AXIS_Y]:0.0 +TEST.END + -- Test Case: checkForTiltError_TiltBad_Alarm TEST.UNIT:Accel TEST.SUBPROGRAM:checkForTiltError @@ -294,7 +434,9 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:Accel.<>.accelState:ACCELEROMETER_START_STATE TEST.VALUE:uut_prototype_stubs.isNewCalibrationRecordAvailable.return:1 +TEST.EXPECTED:Accel.<>.accelState:ACCELEROMETER_MONITOR_STATE TEST.END -- Test Case: execAccel_InvalidState @@ -1216,7 +1358,9 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:Accel.processCalibrationData.return:0 TEST.VALUE:uut_prototype_stubs.getHDAccelerometerSensorCalibrationRecord.return.calibrationTime:0 +TEST.EXPECTED:Accel.processCalibrationData.return:0 TEST.END -- Test Case: processCalibrationData.002 @@ -1233,7 +1377,9 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:Accel.processCalibrationData.return:1 TEST.VALUE:uut_prototype_stubs.getHDAccelerometerSensorCalibrationRecord.return.calibrationTime:1 +TEST.EXPECTED:Accel.processCalibrationData.return:1 TEST.END -- Subprogram: publishAccelData @@ -1335,6 +1481,13 @@ Test Case Generation Notes: Conflict: Unable to control expression-to-expression comparison in branch 1 TEST.END_NOTES: +TEST.VALUE:Accel.<>.accelReadingsTotal[ACCEL_AXIS_X..ACCEL_AXIS_Z]:0.0 +TEST.VALUE:Accel.<>.accelAvgVector[ACCEL_AXIS_X..ACCEL_AXIS_Z]:0.0 +TEST.VALUE:Accel.<>.accelTilt[ACCEL_AXIS_X..ACCEL_AXIS_Z]:0.0 +TEST.EXPECTED:Accel.<>.accelReadingsTotal[ACCEL_AXIS_X..ACCEL_AXIS_Z]:0.0 +TEST.EXPECTED:Accel.<>.accelAvgVector[ACCEL_AXIS_X..ACCEL_AXIS_Z]:0.0 +TEST.EXPECTED:Accel.<>.accelTilt[ACCEL_AXIS_X..ACCEL_AXIS_Z]:0.0 +TEST.ATTRIBUTES:Accel.<>.accelReadingsCount:DISPLAY_STATE=DISPLAY TEST.END -- Subprogram: testResetAccelAxisOverride Index: vectorcast/Hercules_RM46_HD_Project/environment/AIRTRAP/AIRTRAP.tst =================================================================== diff -u -r517fed82f4ba6f16407bef6c4e548a0ef175fb9d -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/AIRTRAP/AIRTRAP.tst (.../AIRTRAP.tst) (revision 517fed82f4ba6f16407bef6c4e548a0ef175fb9d) +++ vectorcast/Hercules_RM46_HD_Project/environment/AIRTRAP/AIRTRAP.tst (.../AIRTRAP.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -148,6 +148,7 @@ TEST.VALUE:AirTrap.<>.airTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].data:1 TEST.VALUE:AirTrap.<>.fillStartTime:1000000 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:AirTrap.<>.airTrapControllerState:AIR_TRAP_VALVE_OPEN_STATE TEST.END -- Subprogram: execAirTrapMonitor @@ -168,7 +169,9 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.STUB:AirTrap.getAirTrapLevel +TEST.VALUE:AirTrap.getAirTrapLevel.sensor:AIR_TRAP_LEVEL_SENSOR_LOWER TEST.VALUE:AirTrap.getAirTrapLevel.return:AIR_TRAP_LEVEL_FLUID +TEST.EXPECTED:AirTrap.getAirTrapLevel.sensor:AIR_TRAP_LEVEL_SENSOR_LOWER TEST.END -- Test Case: execAirTrapMonitor.002 @@ -328,6 +331,7 @@ TEST.SUBPROGRAM:execAirTrapTest TEST.NEW TEST.NAME:execAirTrapTest.001 +TEST.EXPECTED:AirTrap.execAirTrapTest.return:SELF_TEST_STATUS_PASSED TEST.END -- Subprogram: getAirTrapLevel @@ -358,6 +362,7 @@ TEST.VALUE:AirTrap.<>.airTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].ovData:0 TEST.VALUE:AirTrap.<>.airTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].override:0 TEST.VALUE:AirTrap.getAirTrapLevel.sensor:AIR_TRAP_LEVEL_SENSOR_UPPER +TEST.EXPECTED:AirTrap.getAirTrapLevel.return:AIR_TRAP_LEVEL_AIR TEST.END -- Test Case: getAirTrapLevel_Override @@ -414,10 +419,31 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.STUB:AirTrap.getAirTrapLevel -TEST.VALUE:AirTrap.<>.pendingStopAirTrapController:<> +TEST.VALUE:AirTrap.<>.pendingStopAirTrapController:1 TEST.VALUE:AirTrap.getAirTrapLevel.return:AIR_TRAP_LEVEL_FLUID +TEST.EXPECTED:AirTrap.<>.pendingStopAirTrapController:0 TEST.END +-- Test Case: handleAirTrapValveClosedState.002 +TEST.UNIT:AirTrap +TEST.SUBPROGRAM:handleAirTrapValveClosedState +TEST.NEW +TEST.NAME:handleAirTrapValveClosedState.002 +TEST.NOTES: +This is an automatically generated test case. + Test Path 3 + (1) if ((1) == pendingStopAirTrapController) ==> FALSE + (2) if ((AIR_TRAP_LEVEL_AIR) == getAirTrapLevel(AIR_TRAP_LEVEL_SENSOR_LOWER)) ==> FALSE + Row number 2 forms a pair with Row 1 for Condition #2, subcondition "a". + Condition a ==> FALSE + Test Case Generation Notes: +TEST.END_NOTES: +TEST.STUB:AirTrap.getAirTrapLevel +TEST.VALUE:AirTrap.<>.pendingStopAirTrapController:0 +TEST.VALUE:AirTrap.getAirTrapLevel.return:AIR_TRAP_LEVEL_FLUID +TEST.EXPECTED:AirTrap.handleAirTrapValveClosedState.return:AIR_TRAP_VALVE_CLOSED_STATE +TEST.END + -- Test Case: handleAirTrapValveClosedState_GoToOpen TEST.UNIT:AirTrap TEST.SUBPROGRAM:handleAirTrapValveClosedState @@ -445,6 +471,7 @@ TEST.VALUE:AirTrap.<>.airTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].data:0 TEST.VALUE:AirTrap.<>.pendingStartAirTrapController:0 TEST.VALUE:AirTrap.<>.pendingStopAirTrapController:0 +TEST.EXPECTED:AirTrap.handleAirTrapValveClosedState.return:AIR_TRAP_VALVE_OPEN_STATE TEST.END -- Test Case: handleAirTrapValveClosedState_StopControlRequested @@ -479,8 +506,9 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.STUB:AirTrap.getAirTrapLevel -TEST.VALUE:AirTrap.<>.pendingStopAirTrapController:<> +TEST.VALUE:AirTrap.<>.pendingStopAirTrapController:0 TEST.VALUE:AirTrap.getAirTrapLevel.return:AIR_TRAP_LEVEL_FLUID +TEST.EXPECTED:AirTrap.<>.pendingStopAirTrapController:0 TEST.END -- Test Case: handleAirTrapValveOpenState_GoToClosed @@ -492,7 +520,8 @@ TEST.VALUE:AirTrap.<>.airTrapLevels[AIR_TRAP_LEVEL_SENSOR_LOWER].data:1 TEST.VALUE:AirTrap.<>.airTrapLevels[AIR_TRAP_LEVEL_SENSOR_UPPER].data:1 TEST.VALUE:AirTrap.<>.pendingStartAirTrapController:0 -TEST.VALUE:AirTrap.<>.pendingStopAirTrapController:0 +TEST.VALUE:AirTrap.<>.pendingStopAirTrapController:1 +TEST.EXPECTED:AirTrap.<>.pendingStopAirTrapController:0 TEST.END -- Test Case: handleAirTrapValveOpenState_NominalPath @@ -585,6 +614,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<> +TEST.EXPECTED:AirTrap.<>.airTrapDataPublicationTimerCounter:1 TEST.END -- Test Case: publishAirTrapData_NotTimeToPublish @@ -594,6 +624,7 @@ TEST.NAME:publishAirTrapData_NotTimeToPublish TEST.VALUE:AirTrap.<>.airTrapDataPublicationTimerCounter:98 TEST.VALUE:AirTrap.<>.airTrapDataPublishInterval.data:100 +TEST.EXPECTED:AirTrap.<>.airTrapDataPublicationTimerCounter:0 TEST.END -- Test Case: publishAirTrapData_TimeToPublish Index: vectorcast/Hercules_RM46_HD_Project/environment/ALARMLAMP/ALARMLAMP_cba.cvr =================================================================== diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/ALARMLAMP/ALARMLAMP_cba.cvr (.../ALARMLAMP_cba.cvr) (revision c403f891689e120d6202a3f3fab85ac1054f8f45) +++ vectorcast/Hercules_RM46_HD_Project/environment/ALARMLAMP/ALARMLAMP_cba.cvr (.../ALARMLAMP_cba.cvr) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -1,46 +1 @@ --- Imported Coverage Results Script -IMPORT.BEGIN -IMPORT.SOURCE.BEGIN -IMPORT.SOURCE.UNIT:8 -IMPORT.SOURCE.ORIG_FILENAME:S0000008.c -IMPORT.SOURCE.COVERAGE_STATUS:FALSE -IMPORT.SOURCE.COVERAGE_TYPE:None -IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE -IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:TRUE -IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE -IMPORT.SOURCE.HAS_CATCH_STATEMENTS:TRUE -IMPORT.SOURCE.EDG_COVERAGE:TRUE -IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:TRUE -IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:TRUE -IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE -IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE -IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_UNKNOWN -IMPORT.SOURCE.HAS_CONSTANT_BRANCH:TRUE -IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE -IMPORT.SOURCE.END -IMPORT.SOURCE.BEGIN -IMPORT.SOURCE.UNIT:9 -IMPORT.SOURCE.ORIG_FILENAME:AlarmLamp.c -IMPORT.SOURCE.COVERAGE_STATUS:TRUE -IMPORT.SOURCE.COVERAGE_TYPE:Statement+MCDC -IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE -IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:FALSE -IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE -IMPORT.SOURCE.HAS_CATCH_STATEMENTS:FALSE -IMPORT.SOURCE.EDG_COVERAGE:TRUE -IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:TRUE -IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE -IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:FALSE -IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:FALSE -IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE -IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_INITIALIZATIONS -IMPORT.SOURCE.HAS_CONSTANT_BRANCH:FALSE -IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE -IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE -IMPORT.SOURCE.END -IMPORT.END Index: vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst =================================================================== diff -u -r517fed82f4ba6f16407bef6c4e548a0ef175fb9d -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst (.../ALARMMGMT.tst) (revision 517fed82f4ba6f16407bef6c4e548a0ef175fb9d) +++ vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst (.../ALARMMGMT.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -23,6 +23,7 @@ TEST.NEW TEST.NAME:activateAlarm.001 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_STUCK_BUTTON_TEST_FAILED +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 TEST.END -- Test Case: activateAlarm.002 @@ -32,6 +33,7 @@ TEST.NAME:activateAlarm.002 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_STUCK_BUTTON_TEST_FAILED TEST.VALUE:AlarmMgmt.activateAlarm.alarm:ALARM_ID_TREATMENT_STOPPED_BY_USER +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 TEST.END -- Test Case: activateAlarm.003 @@ -41,6 +43,7 @@ TEST.NAME:activateAlarm.003 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_STUCK_BUTTON_TEST_FAILED TEST.VALUE:AlarmMgmt.activateAlarm.alarm:ALARM_ID_HD_BLOOD_LEAK_DETECTED +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 TEST.END -- Test Case: activateAlarm.004 @@ -50,6 +53,7 @@ TEST.NAME:activateAlarm.004 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_STUCK_BUTTON_TEST_FAILED TEST.VALUE:AlarmMgmt.activateAlarm.alarm:ALARM_ID_PRIME_COMPLETED_MEDIUM +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 TEST.END -- Test Case: activateAlarm_AlreadyActive @@ -169,16 +173,20 @@ TEST.SUBPROGRAM:activateAlarm2Data TEST.NEW TEST.NAME:activateAlarm2Data.001 +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:0 TEST.VALUE:AlarmMgmt.activateAlarm2Data.alarm:ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:0 TEST.END -- Test Case: activateAlarm2Data.002 TEST.UNIT:AlarmMgmt TEST.SUBPROGRAM:activateAlarm2Data TEST.NEW TEST.NAME:activateAlarm2Data.002 +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:0 TEST.VALUE:AlarmMgmt.activateAlarm2Data.alarm:ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:0 TEST.END -- Test Case: activateAlarm2Data_AlreadyActive @@ -401,6 +409,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.clearAlarmCondition.alarm:ALARM_ID_STUCK_BUTTON_TEST_FAILED +TEST.EXPECTED:AlarmMgmt.<>.alarmIsDetected[ALARM_ID_NO_ALARM]:0 TEST.END -- Test Case: clearAlarmCondition.002 @@ -418,7 +427,9 @@ Condition b ==> FALSE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:AlarmMgmt.<>.alarmIsDetected[ALARM_ID_NO_ALARM]:1 TEST.VALUE:AlarmMgmt.clearAlarmCondition.alarm:<> +TEST.EXPECTED:AlarmMgmt.<>.alarmIsDetected[ALARM_ID_NO_ALARM]:1 TEST.END -- Test Case: clearAlarmCondition.003 @@ -437,6 +448,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.clearAlarmCondition.alarm:<> +TEST.EXPECTED:AlarmMgmt.<>.alarmIsDetected[ALARM_ID_NO_ALARM]:0 TEST.END -- Subprogram: clearAllRecoverableAlarms @@ -456,6 +468,7 @@ Test Case Generation Notes: Conflict: Unable to control expression-to-expression comparison in branch 1 TEST.END_NOTES: +TEST.STUB:AlarmMgmt.clearAlarm TEST.END -- Subprogram: doesAlarmStatusIndicateStop @@ -465,6 +478,8 @@ TEST.SUBPROGRAM:doesAlarmStatusIndicateStop TEST.NEW TEST.NAME:doesAlarmStatusIndicateStop.001 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.stop:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.stop:0 TEST.END -- Subprogram: execAlarmAudioSelfTest @@ -475,6 +490,7 @@ TEST.NEW TEST.NAME:execAlarmAudioSelfTest.001 TEST.VALUE:AlarmMgmt.<>.alarmAudioSelfTestState:ALARM_AUDIO_SELF_TEST_STATE_START +TEST.EXPECTED:AlarmMgmt.execAlarmAudioSelfTest.return:SELF_TEST_STATUS_IN_PROGRESS TEST.END -- Test Case: execAlarmAudioSelfTest.002 @@ -483,6 +499,7 @@ TEST.NEW TEST.NAME:execAlarmAudioSelfTest.002 TEST.VALUE:AlarmMgmt.<>.alarmAudioSelfTestState:ALARM_AUDIO_SELF_TEST_STATE_COMPLETE +TEST.EXPECTED:AlarmMgmt.execAlarmAudioSelfTest.return:SELF_TEST_STATUS_IN_PROGRESS TEST.END -- Test Case: execAlarmAudioSelfTest.003 @@ -491,6 +508,7 @@ TEST.NEW TEST.NAME:execAlarmAudioSelfTest.003 TEST.VALUE:AlarmMgmt.<>.alarmAudioSelfTestState:NUM_OF_ALARM_AUDIO_SELF_TEST_STATES +TEST.EXPECTED:AlarmMgmt.execAlarmAudioSelfTest.return:SELF_TEST_STATUS_IN_PROGRESS TEST.END -- Test Case: execAlarmAudioSelfTest.004 @@ -511,6 +529,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmAudioSelfTestState:ALARM_AUDIO_SELF_TEST_STATE_PRIMARY TEST.VALUE:uut_prototype_stubs.getIntADCVoltageConverted.return:<> +TEST.EXPECTED:AlarmMgmt.execAlarmAudioSelfTest.return:SELF_TEST_STATUS_PASSED TEST.END -- Test Case: execAlarmAudioSelfTest.005 @@ -531,6 +550,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmAudioSelfTestState:ALARM_AUDIO_SELF_TEST_STATE_PRIMARY TEST.VALUE:uut_prototype_stubs.getIntADCVoltageConverted.return:20.1 +TEST.EXPECTED:AlarmMgmt.execAlarmAudioSelfTest.return:SELF_TEST_STATUS_IN_PROGRESS TEST.END -- Test Case: execAlarmAudioSelfTest.006 @@ -552,6 +572,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmAudioSelfTestState:ALARM_AUDIO_SELF_TEST_STATE_PRIMARY TEST.VALUE:uut_prototype_stubs.getIntADCVoltageConverted.return:<> +TEST.EXPECTED:AlarmMgmt.execAlarmAudioSelfTest.return:SELF_TEST_STATUS_IN_PROGRESS TEST.END -- Test Case: execAlarmAudioSelfTest.007 @@ -573,6 +594,7 @@ TEST.VALUE:AlarmMgmt.<>.alarmAudioSelfTestState:ALARM_AUDIO_SELF_TEST_STATE_PRIMARY TEST.VALUE:uut_prototype_stubs.getIntADCVoltageConverted.return:<> TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:AlarmMgmt.execAlarmAudioSelfTest.return:SELF_TEST_STATUS_FAILED TEST.END -- Subprogram: execAlarmMgmt @@ -591,7 +613,12 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_STUCK_BUTTON_TEST_FAILED]:1 +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK]:1 +TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].data:1 +TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK].data:1 TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<> +TEST.EXPECTED:AlarmMgmt.<>.alarmStatusPublicationTimerCounter:1 TEST.END -- Test Case: execAlarmMgmt_NominalPath @@ -691,6 +718,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmBackupAudioCurrent.override:3435346995 +TEST.EXPECTED:AlarmMgmt.getAlarmAudioBackupCurrent.return:0.0 TEST.END -- Test Case: getAlarmAudioBackupCurrent.002 @@ -708,6 +736,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmBackupAudioCurrent.override:<> +TEST.EXPECTED:AlarmMgmt.getAlarmAudioBackupCurrent.return:0.0 TEST.END -- Subprogram: getAlarmAudioPrimaryHighGainCurrent @@ -727,6 +756,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmPrimaryAudioCurrentHG.override:3435346995 +TEST.EXPECTED:AlarmMgmt.getAlarmAudioPrimaryHighGainCurrent.return:0.0 TEST.END -- Test Case: getAlarmAudioPrimaryHighGainCurrent.002 @@ -744,6 +774,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmPrimaryAudioCurrentHG.override:<> +TEST.EXPECTED:AlarmMgmt.getAlarmAudioPrimaryHighGainCurrent.return:0.0 TEST.END -- Subprogram: getAlarmAudioPrimaryLowGainCurrent @@ -763,6 +794,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmPrimaryAudioCurrentLG.override:3435346995 +TEST.EXPECTED:AlarmMgmt.getAlarmAudioPrimaryLowGainCurrent.return:0.0 TEST.END -- Test Case: getAlarmAudioPrimaryLowGainCurrent.002 @@ -780,6 +812,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmPrimaryAudioCurrentLG.override:<> +TEST.EXPECTED:AlarmMgmt.getAlarmAudioPrimaryLowGainCurrent.return:0.0 TEST.END -- Subprogram: getAlarmAudioVolume @@ -799,6 +832,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmAudioVolumeLevel.override:3435346995 +TEST.EXPECTED:AlarmMgmt.getAlarmAudioVolume.return:0 TEST.END -- Test Case: getAlarmAudioVolume.002 @@ -816,6 +850,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmAudioVolumeLevel.override:<> +TEST.EXPECTED:AlarmMgmt.getAlarmAudioVolume.return:0 TEST.END -- Subprogram: getAlarmStartTime @@ -837,6 +872,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_NO_ALARM].override:3435346995 TEST.VALUE:AlarmMgmt.getAlarmStartTime.alarmID:ALARM_ID_NO_ALARM +TEST.EXPECTED:AlarmMgmt.getAlarmStartTime.alarmID:ALARM_ID_NO_ALARM TEST.END -- Test Case: getAlarmStartTime_InvalidAlarm @@ -855,6 +891,9 @@ TEST.NAME:getAlarmStartTime_NominalPath TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].data:456 TEST.VALUE:AlarmMgmt.getAlarmStartTime.alarmID:ALARM_ID_HD_FPGA_POST_TEST_FAILED +TEST.VALUE:AlarmMgmt.getAlarmStartTime.return:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].data:456 +TEST.EXPECTED:AlarmMgmt.getAlarmStartTime.return:0 TEST.END -- Test Case: getAlarmStartTime_Override @@ -866,6 +905,10 @@ TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].ovData:789 TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override:0xCCC33C33 TEST.VALUE:AlarmMgmt.getAlarmStartTime.alarmID:ALARM_ID_HD_FPGA_POST_TEST_FAILED +TEST.EXPECTED:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].data:456 +TEST.EXPECTED:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].ovData:789 +TEST.EXPECTED:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override:0xCCC33C33 +TEST.EXPECTED:AlarmMgmt.getAlarmStartTime.return:0 TEST.END -- Subprogram: getCurrentAlarmStatePriority @@ -886,6 +929,8 @@ TEST.SUBPROGRAM:getNoNewTreatmentStatus TEST.NEW TEST.NAME:getNoNewTreatmentStatus.001 +TEST.VALUE:AlarmMgmt.getNoNewTreatmentStatus.return:0 +TEST.EXPECTED:AlarmMgmt.getNoNewTreatmentStatus.return:0 TEST.END -- Subprogram: handleActiveAlarmListRequest @@ -905,6 +950,9 @@ Test Case Generation Notes: Conflict: Unable to control expression-to-expression comparison in branch 1 TEST.END_NOTES: +TEST.STUB:AlarmMgmt.isAnyAlarmActive +TEST.VALUE:AlarmMgmt.isAnyAlarmActive.return:0 +TEST.EXPECTED:uut_prototype_stubs.sendActiveAlarmsList.size:40 TEST.END -- Test Case: handleActiveAlarmListRequest.002 @@ -925,6 +973,8 @@ TEST.END_NOTES: TEST.STUB:AlarmMgmt.isAnyAlarmActive TEST.VALUE:AlarmMgmt.isAnyAlarmActive.return:1 +TEST.VALUE:uut_prototype_stubs.sendActiveAlarmsList.alarmList[0]:0,1,0 +TEST.EXPECTED:uut_prototype_stubs.sendActiveAlarmsList.alarmList[0]:0 TEST.END -- Test Case: handleActiveAlarmListRequest.003 @@ -950,10 +1000,41 @@ TEST.END_NOTES: TEST.STUB:AlarmMgmt.isAlarmActive TEST.STUB:AlarmMgmt.isAnyAlarmActive -TEST.VALUE:AlarmMgmt.isAlarmActive.return:1 +TEST.VALUE:AlarmMgmt.isAlarmActive.return:(2)0,1,0 TEST.VALUE:AlarmMgmt.isAnyAlarmActive.return:1 +TEST.EXPECTED:uut_prototype_stubs.sendActiveAlarmsList.accepted:1 +TEST.EXPECTED:uut_prototype_stubs.sendActiveAlarmsList.reason:0 +TEST.EXPECTED:uut_prototype_stubs.sendActiveAlarmsList.alarmList[0]:3 TEST.END +-- Test Case: handleActiveAlarmListRequest.004 +TEST.UNIT:AlarmMgmt +TEST.SUBPROGRAM:handleActiveAlarmListRequest +TEST.NEW +TEST.NAME:handleActiveAlarmListRequest.004 +TEST.NOTES: +This is an automatically generated test case. + Test Path 8 + (1) for (index < (10)) ==> FALSE + (2) if ((1) == isAnyAlarmActive()) ==> TRUE + (3) for (index < (NUM_OF_ALARM_IDS)) ==> TRUE + (4) if ((1) == isAlarmActive((ALARM_RANK_TABLE[index]).alarmID) && activeAlarmListIndex < (10)) ==> TRUE + Row number 1 forms a pair with Row 3 for Condition #4, subcondition "a". + Condition a ==> TRUE + Condition b ==> TRUE + Test Case Generation Notes: + Cannot set local variable activeAlarmListIndex in branch 4 + Conflict: Unable to control expression-to-expression comparison in branch 1 + Conflict: Unable to control expression-to-expression comparison in branch 3 +TEST.END_NOTES: +TEST.STUB:AlarmMgmt.isAlarmActive +TEST.STUB:AlarmMgmt.isAnyAlarmActive +TEST.VALUE:AlarmMgmt.isAlarmActive.return:(11)1,0 +TEST.VALUE:AlarmMgmt.isAnyAlarmActive.return:1 +TEST.EXPECTED:uut_prototype_stubs.sendActiveAlarmsList.accepted:1 +TEST.EXPECTED:uut_prototype_stubs.sendActiveAlarmsList.reason:0 +TEST.END + -- Subprogram: handleAlarmEscalations -- Test Case: handleAlarmEscalations_EscalationsPending @@ -969,8 +1050,25 @@ TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsToEscalate:31 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsEscalatesIn:0 TEST.VALUE:uut_prototype_stubs.calcTimeSince.return:60001,61001 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsEscalatesIn:0 TEST.END +-- Test Case: handleAlarmEscalations_EscalationsPending.001 +TEST.UNIT:AlarmMgmt +TEST.SUBPROGRAM:handleAlarmEscalations +TEST.NEW +TEST.NAME:handleAlarmEscalations_EscalationsPending.001 +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_EMPTY_SALINE_BAG]:1 +TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_EMPTY_SALINE_BAG].data:100 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_HIGH +TEST.VALUE:uut_prototype_stubs.calcTimeSince.return:60001,61001 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_EMPTY_SALINE_BAG]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_EMPTY_SALINE_BAG].data:100 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_HIGH +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsToEscalate:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsEscalatesIn:0 +TEST.END + -- Test Case: handleAlarmEscalations_EscalationsPending2 TEST.UNIT:AlarmMgmt TEST.SUBPROGRAM:handleAlarmEscalations @@ -984,6 +1082,7 @@ TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsToEscalate:31 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsEscalatesIn:0 TEST.VALUE:uut_prototype_stubs.calcTimeSince.return:59500,55000 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsEscalatesIn:0 TEST.END -- Test Case: handleAlarmEscalations_Fault @@ -1152,6 +1251,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_STUCK_BUTTON_TEST_FAILED +TEST.EXPECTED:AlarmMgmt.isAnyAlarmActive.return:1 TEST.END -- Test Case: isAnyAlarmActive.002 @@ -1169,6 +1269,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_NO_ALARM +TEST.EXPECTED:AlarmMgmt.isAnyAlarmActive.return:0 TEST.END -- Subprogram: isDialysateRecircBlocked @@ -1178,6 +1279,8 @@ TEST.SUBPROGRAM:isDialysateRecircBlocked TEST.NEW TEST.NAME:isDialysateRecircBlocked.001 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.noDialRecirc:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noDialRecirc:1 TEST.END -- Subprogram: monitorAlarms @@ -1187,6 +1290,12 @@ TEST.SUBPROGRAM:monitorAlarms TEST.NEW TEST.NAME:monitorAlarms.001 +TEST.STUB:AlarmMgmt.getAlarmAudioVolume +TEST.VALUE:AlarmMgmt.<>.alarmPrimaryAudioCurrentHG.data:0.0 +TEST.VALUE:AlarmMgmt.<>.alarmPrimaryAudioCurrentLG.data:0.0 +TEST.VALUE:AlarmMgmt.getAlarmAudioVolume.return:100 +TEST.EXPECTED:AlarmMgmt.<>.alarmPrimaryAudioCurrentHG.data:0.0 +TEST.EXPECTED:AlarmMgmt.<>.alarmPrimaryAudioCurrentLG.data:0.0 TEST.END -- Subprogram: publishAlarmInfo @@ -1279,6 +1388,7 @@ >>> >>> Command Ignored TEST.END_IMPORT_FAILURES: TEST.VALUE:AlarmMgmt.resetAlarmPriorityFIFO.priority:ALARM_PRIORITY_MEDIUM +TEST.EXPECTED:AlarmMgmt.resetAlarmPriorityFIFO.priority:ALARM_PRIORITY_MEDIUM TEST.END -- Subprogram: setAlarmAudio @@ -1298,6 +1408,8 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmAudioTestToneRequested:1 +TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_FAUL +TEST.EXPECTED:AlarmMgmt.<>.alarmAudioTestToneRequested:0 TEST.END -- Test Case: setAlarmAudio.002 @@ -1316,7 +1428,9 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmAudioTestToneRequested:1 +TEST.VALUE:uut_prototype_stubs.setAlarmAudioState.state:4 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_SERV +TEST.EXPECTED:uut_prototype_stubs.setAlarmAudioState.state:4 TEST.END -- Test Case: setAlarmAudio.003 @@ -1336,6 +1450,8 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:1 TEST.VALUE:AlarmMgmt.<>.alarmAudioTestToneRequested:<> +TEST.VALUE:uut_prototype_stubs.setAlarmAudioState.state:0 +TEST.EXPECTED:uut_prototype_stubs.setAlarmAudioState.state:0 TEST.END -- Test Case: setAlarmAudio.004 @@ -1355,6 +1471,8 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:<> TEST.VALUE:AlarmMgmt.<>.alarmAudioTestToneRequested:<> +TEST.VALUE:uut_prototype_stubs.setAlarmAudioState.state:0 +TEST.EXPECTED:uut_prototype_stubs.setAlarmAudioState.state:0 TEST.END -- Test Case: setAlarmAudio.005 @@ -1376,6 +1494,8 @@ TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:<> TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:<> TEST.VALUE:AlarmMgmt.<>.alarmAudioTestToneRequested:<> +TEST.VALUE:uut_prototype_stubs.setAlarmAudioState.state:3 +TEST.EXPECTED:uut_prototype_stubs.setAlarmAudioState.state:3 TEST.END -- Subprogram: setAlarmAudioVolume @@ -1395,7 +1515,9 @@ Condition b ==> TRUE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:AlarmMgmt.setAlarmAudioVolume.volumeLevel:1 +TEST.VALUE:AlarmMgmt.setAlarmAudioVolume.volumeLevel:4 +TEST.EXPECTED:AlarmMgmt.<>.alarmAudioVolumeLevel.data:1 +TEST.EXPECTED:uut_prototype_stubs.sendAlarmAudioVolumeSetResponse.accepted:1 TEST.END -- Test Case: setAlarmAudioVolume.002 @@ -1413,7 +1535,9 @@ Condition b ==> FALSE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:AlarmMgmt.setAlarmAudioVolume.volumeLevel:<> +TEST.VALUE:AlarmMgmt.setAlarmAudioVolume.volumeLevel:6 +TEST.EXPECTED:uut_prototype_stubs.sendAlarmAudioVolumeSetResponse.accepted:0 +TEST.EXPECTED:uut_prototype_stubs.sendAlarmAudioVolumeSetResponse.rejReason:17 TEST.END -- Test Case: setAlarmAudioVolume.003 @@ -1432,6 +1556,10 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.setAlarmAudioVolume.volumeLevel:<> +TEST.VALUE:uut_prototype_stubs.sendAlarmAudioVolumeSetResponse.accepted:0 +TEST.VALUE:uut_prototype_stubs.sendAlarmAudioVolumeSetResponse.rejReason:0 +TEST.EXPECTED:uut_prototype_stubs.sendAlarmAudioVolumeSetResponse.accepted:0 +TEST.EXPECTED:uut_prototype_stubs.sendAlarmAudioVolumeSetResponse.rejReason:17 TEST.END -- Subprogram: setAlarmLamp @@ -1443,6 +1571,7 @@ TEST.NAME:setAlarmLamp.001 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_LOW TEST.VALUE:uut_prototype_stubs.getCurrentAlarmLampPattern.return:LAMP_PATTERN_OK +TEST.EXPECTED:uut_prototype_stubs.requestAlarmLampPattern.lampPattern:LAMP_PATTERN_LOW_ALARM TEST.END -- Test Case: setAlarmLamp.002 @@ -1452,6 +1581,7 @@ TEST.NAME:setAlarmLamp.002 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_MEDIUM TEST.VALUE:uut_prototype_stubs.getCurrentAlarmLampPattern.return:LAMP_PATTERN_OK +TEST.EXPECTED:uut_prototype_stubs.requestAlarmLampPattern.lampPattern:LAMP_PATTERN_MED_ALARM TEST.END -- Test Case: setAlarmLamp.003 @@ -1462,6 +1592,7 @@ TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_HIGH TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_STUCK_BUTTON_TEST_FAILED TEST.VALUE:uut_prototype_stubs.getCurrentAlarmLampPattern.return:LAMP_PATTERN_OK +TEST.EXPECTED:uut_prototype_stubs.requestAlarmLampPattern.lampPattern:LAMP_PATTERN_FAULT TEST.END -- Test Case: setAlarmLamp.004 @@ -1471,6 +1602,7 @@ TEST.NAME:setAlarmLamp.004 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:NUM_OF_ALARM_PRIORITIES TEST.VALUE:uut_prototype_stubs.getCurrentAlarmLampPattern.return:LAMP_PATTERN_OK +TEST.EXPECTED:uut_prototype_stubs.requestAlarmLampPattern.lampPattern:LAMP_PATTERN_FAULT TEST.END -- Test Case: setAlarmLamp.005 @@ -1492,6 +1624,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_HIGH TEST.VALUE:uut_prototype_stubs.getCurrentAlarmLampPattern.return:LAMP_PATTERN_OFF +TEST.EXPECTED:uut_prototype_stubs.requestAlarmLampPattern.lampPattern:LAMP_PATTERN_HIGH_ALARM TEST.END -- Test Case: setAlarmLamp.006 @@ -1511,6 +1644,7 @@ Conflict: Trying to set variable uut_prototype_stubs.getCurrentAlarmLampPattern.return 'equal to' and 'not equal to' same value in branches 1/8 TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.getCurrentAlarmLampPattern.return:LAMP_PATTERN_OFF +TEST.EXPECTED:uut_prototype_stubs.requestAlarmLampPattern.lampPattern:LAMP_PATTERN_OK TEST.END -- Test Case: setAlarmLamp.007 @@ -1528,7 +1662,9 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:AlarmMgmt.<>.alarmStatus.lampOn:0 TEST.VALUE:uut_prototype_stubs.getCurrentAlarmLampPattern.return:LAMP_PATTERN_MANUAL +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.lampOn:0 TEST.END -- Subprogram: setAlarmUserActionEnabled @@ -1549,6 +1685,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.setAlarmUserActionEnabled.action:<> TEST.VALUE:AlarmMgmt.setAlarmUserActionEnabled.enabled:<> +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME]:0 TEST.END -- Test Case: setAlarmUserActionEnabled.002 @@ -1567,6 +1704,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.setAlarmUserActionEnabled.action:<> TEST.VALUE:AlarmMgmt.setAlarmUserActionEnabled.enabled:<> +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME]:0 TEST.END -- Subprogram: signalAlarmSilence @@ -1585,7 +1723,9 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 TEST.VALUE:AlarmMgmt.signalAlarmSilence.cmd:ALARM_SILENCE_CMD_START +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenced:1 TEST.END -- Test Case: signalAlarmSilence.002 @@ -1602,7 +1742,13 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:1 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenceStart:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenceExpiresIn:0 TEST.VALUE:AlarmMgmt.signalAlarmSilence.cmd:ALARM_SILENCE_CMD_CANCEL +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenceStart:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenceExpiresIn:0 TEST.END -- Test Case: signalAlarmSilence.003 @@ -1620,8 +1766,9 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:1 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 TEST.VALUE:AlarmMgmt.signalAlarmSilence.cmd:ALARM_SILENCE_CMD_START +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenced:1 TEST.END -- Test Case: signalAlarmSilence.004 @@ -1641,8 +1788,45 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:1 TEST.VALUE:AlarmMgmt.signalAlarmSilence.cmd:ALARM_SILENCE_CMD_CANCEL +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 TEST.END +-- Test Case: signalAlarmSilence.005 +TEST.UNIT:AlarmMgmt +TEST.SUBPROGRAM:signalAlarmSilence +TEST.NEW +TEST.NAME:signalAlarmSilence.005 +TEST.BASIS_PATH:1 of 4 +TEST.NOTES: +This is an automatically generated test case. + Test Path 1 + (1) if ((ALARM_SILENCE_CMD_START) == cmd) ==> FALSE + (3) if ((1) == alarmStatus.alarmsSilenced) ==> FALSE + Test Case Generation Notes: +TEST.END_NOTES: +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 +TEST.VALUE:AlarmMgmt.signalAlarmSilence.cmd:ALARM_SILENCE_CMD_CANCEL +TEST.EXPECTED:AlarmMgmt.signalAlarmSilence.cmd:ALARM_SILENCE_CMD_CANCEL +TEST.END + +-- Test Case: signalAlarmSilence.006 +TEST.UNIT:AlarmMgmt +TEST.SUBPROGRAM:signalAlarmSilence +TEST.NEW +TEST.NAME:signalAlarmSilence.006 +TEST.BASIS_PATH:3 of 4 +TEST.NOTES: +This is an automatically generated test case. + Test Path 3 + (1) if ((ALARM_SILENCE_CMD_START) == cmd) ==> TRUE + (2) if ((0) == alarmStatus.alarmsSilenced) ==> FALSE + Test Case Generation Notes: +TEST.END_NOTES: +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:1 +TEST.VALUE:AlarmMgmt.signalAlarmSilence.cmd:ALARM_SILENCE_CMD_START +TEST.EXPECTED:AlarmMgmt.signalAlarmSilence.cmd:ALARM_SILENCE_CMD_START +TEST.END + -- Subprogram: signalAlarmUserActionInitiated -- Test Case: signalAlarmUserActionInitiated.001 @@ -1652,6 +1836,8 @@ TEST.NAME:signalAlarmUserActionInitiated.001 TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE TEST.VALUE:AlarmMgmt.signalAlarmUserActionInitiated.action:ALARM_USER_ACTION_ACK +TEST.VALUE:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_ACK +TEST.EXPECTED:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_ACK TEST.END -- Test Case: signalAlarmUserActionInitiated.002 @@ -1660,6 +1846,8 @@ TEST.NEW TEST.NAME:signalAlarmUserActionInitiated.002 TEST.VALUE:AlarmMgmt.signalAlarmUserActionInitiated.action:ALARM_USER_ACTION_RINSEBACK +TEST.VALUE:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_RINSEBACK +TEST.EXPECTED:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_RINSEBACK TEST.END -- Test Case: signalAlarmUserActionInitiated.003 @@ -1668,6 +1856,8 @@ TEST.NEW TEST.NAME:signalAlarmUserActionInitiated.003 TEST.VALUE:AlarmMgmt.signalAlarmUserActionInitiated.action:ALARM_USER_ACTION_END_TREATMENT +TEST.VALUE:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_END_TREATMENT +TEST.EXPECTED:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_END_TREATMENT TEST.END -- Test Case: signalAlarmUserActionInitiated.004 @@ -1684,15 +1874,15 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:AlarmMgmt.signalAlarmUserActionInitiated.action:<> +TEST.VALUE:AlarmMgmt.signalAlarmUserActionInitiated.action:NUMBER_OF_ALARM_USER_ACTIONS +TEST.EXPECTED:AlarmMgmt.signalAlarmUserActionInitiated.action:NUMBER_OF_ALARM_USER_ACTIONS TEST.END -- Test Case: signalAlarmUserActionInitiated.005 TEST.UNIT:AlarmMgmt TEST.SUBPROGRAM:signalAlarmUserActionInitiated TEST.NEW TEST.NAME:signalAlarmUserActionInitiated.005 -TEST.MCDC_BASIS_PATH:4 of 6 TEST.NOTES: This is an automatically generated test case. Test Path 4 @@ -1703,6 +1893,8 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.signalAlarmUserActionInitiated.action:ALARM_USER_ACTION_ACK +TEST.VALUE:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_ACK +TEST.EXPECTED:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_ACK TEST.END -- Test Case: signalAlarmUserActionInitiated.006 @@ -1721,6 +1913,8 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:AlarmMgmt.signalAlarmUserActionInitiated.action:<> +TEST.VALUE:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_RESUME +TEST.EXPECTED:uut_prototype_stubs.initiateAlarmAction.action:ALARM_ACTION_RESUME TEST.END -- Subprogram: testClearAllAlarms @@ -1889,6 +2083,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testResetAlarmAudioVolumeLevelOverride.return:1 TEST.END -- Test Case: testResetAlarmAudioVolumeLevelOverride.002 @@ -1906,6 +2101,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testResetAlarmAudioVolumeLevelOverride.return:0 TEST.END -- Subprogram: testResetAlarmInfoPublishIntervalOverride @@ -1925,6 +2121,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testResetAlarmInfoPublishIntervalOverride.return:1 TEST.END -- Test Case: testResetAlarmInfoPublishIntervalOverride.002 @@ -1942,6 +2139,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testResetAlarmInfoPublishIntervalOverride.return:0 TEST.END -- Subprogram: testResetAlarmStartOverride @@ -2107,6 +2305,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testResetBackupAlarmAudioCurrentOverride.return:1 TEST.END -- Test Case: testResetBackupAlarmAudioCurrentOverride.002 @@ -2124,6 +2323,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testResetBackupAlarmAudioCurrentOverride.return:0 TEST.END -- Subprogram: testResetPrimaryAlarmAudioCurrentHGOverride @@ -2143,6 +2343,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testResetPrimaryAlarmAudioCurrentHGOverride.return:1 TEST.END -- Test Case: testResetPrimaryAlarmAudioCurrentHGOverride.002 @@ -2160,6 +2361,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testResetPrimaryAlarmAudioCurrentHGOverride.return:0 TEST.END -- Subprogram: testResetPrimaryAlarmAudioCurrentLGOverride @@ -2179,6 +2381,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testResetPrimaryAlarmAudioCurrentLGOverride.return:1 TEST.END -- Test Case: testResetPrimaryAlarmAudioCurrentLGOverride.002 @@ -2196,6 +2399,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testResetPrimaryAlarmAudioCurrentLGOverride.return:0 TEST.END -- Subprogram: testSetAlarmAudioVolumeLevelOverride @@ -2216,6 +2420,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetAlarmAudioVolumeLevelOverride.volume:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testSetAlarmAudioVolumeLevelOverride.return:1 TEST.END -- Test Case: testSetAlarmAudioVolumeLevelOverride.002 @@ -2234,6 +2439,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetAlarmAudioVolumeLevelOverride.volume:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testSetAlarmAudioVolumeLevelOverride.return:0 TEST.END -- Subprogram: testSetAlarmInfoPublishIntervalOverride @@ -2254,6 +2460,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetAlarmInfoPublishIntervalOverride.ms:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testSetAlarmInfoPublishIntervalOverride.return:1 TEST.END -- Test Case: testSetAlarmInfoPublishIntervalOverride.002 @@ -2272,6 +2479,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetAlarmInfoPublishIntervalOverride.ms:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testSetAlarmInfoPublishIntervalOverride.return:0 TEST.END -- Subprogram: testSetAlarmStartOverride @@ -2293,9 +2501,19 @@ TEST.NEW TEST.NAME:testSetAlarmStartOverride_NominalPath TEST.IMPORT_FAILURES: -(E) @LINE: 4370 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 +(E) @LINE: 2510 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 >>> Expected a field name from the record type CCAST_9_21 >>> Read: override::EXPECTED_BASE=16 +(E) Errors from previous script import(s) + >>> (E) @LINE: 2334 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 + >>> >>> Expected a field name from the record type CCAST_9_21 + >>> >>> Read: override::EXPECTED_BASE=16 + >>> (E) @LINE: 28 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 + >>> >>> Expected a field name from the record type CCAST_9_21 + >>> >>> Read: override::EXPECTED_BASE=16 + >>> (E) @LINE: 4370 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 + >>> >>> Expected a field name from the record type CCAST_9_21 + >>> >>> Read: override::EXPECTED_BASE=16 TEST.END_IMPORT_FAILURES: TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].data:2000 TEST.VALUE:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].ovInitData:0 @@ -2508,6 +2726,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetBackupAlarmAudioCurrentOverride.mA:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testSetBackupAlarmAudioCurrentOverride.return:1 TEST.END -- Test Case: testSetBackupAlarmAudioCurrentOverride.002 @@ -2526,6 +2745,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetBackupAlarmAudioCurrentOverride.mA:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testSetBackupAlarmAudioCurrentOverride.return:0 TEST.END -- Subprogram: testSetPrimaryAlarmAudioCurrentHGOverride @@ -2546,6 +2766,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetPrimaryAlarmAudioCurrentHGOverride.mA:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testSetPrimaryAlarmAudioCurrentHGOverride.return:1 TEST.END -- Test Case: testSetPrimaryAlarmAudioCurrentHGOverride.002 @@ -2564,6 +2785,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetPrimaryAlarmAudioCurrentHGOverride.mA:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testSetPrimaryAlarmAudioCurrentHGOverride.return:0 TEST.END -- Subprogram: testSetPrimaryAlarmAudioCurrentLGOverride @@ -2584,6 +2806,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetPrimaryAlarmAudioCurrentLGOverride.mA:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:AlarmMgmt.testSetPrimaryAlarmAudioCurrentLGOverride.return:1 TEST.END -- Test Case: testSetPrimaryAlarmAudioCurrentLGOverride.002 @@ -2602,6 +2825,7 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.testSetPrimaryAlarmAudioCurrentLGOverride.mA:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:AlarmMgmt.testSetPrimaryAlarmAudioCurrentLGOverride.return:0 TEST.END -- Subprogram: updateAlarmsFlags @@ -2630,6 +2854,10 @@ TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:1 TEST.VALUE:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME]:<> TEST.VALUE:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RINSEBACK]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noResume:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noEndTreatment:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME]:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RINSEBACK]:1 TEST.END -- Test Case: updateAlarmsFlags.002 @@ -2655,6 +2883,9 @@ TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:1 TEST.VALUE:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME..ALARM_USER_ACTION_RINSEBACK]:<> TEST.VALUE:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_END_TREATMENT]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME..ALARM_USER_ACTION_RINSEBACK]:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_END_TREATMENT]:1 TEST.END -- Test Case: updateAlarmsFlags.003 @@ -2682,6 +2913,9 @@ TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:1 TEST.VALUE:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME..ALARM_USER_ACTION_RINSEBACK]:<> TEST.VALUE:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_END_TREATMENT]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME..ALARM_USER_ACTION_RINSEBACK]:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_END_TREATMENT]:1 TEST.END -- Test Case: updateAlarmsFlags.004 @@ -2701,6 +2935,7 @@ Conflict: Unable to control expression-to-expression comparison in branch 1 TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.topAlarmConditionDetected:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.topAlarmConditionDetected:1 TEST.END -- Test Case: updateAlarmsFlags.005 @@ -2731,6 +2966,8 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.topAlarmConditionDetected:2 TEST.VALUE:AlarmMgmt.<>.alarmStatus.noClear:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.topAlarmConditionDetected:2 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noClear:0 TEST.END -- Test Case: updateAlarmsFlags.006 @@ -2761,6 +2998,8 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.topAlarmConditionDetected:0 TEST.VALUE:AlarmMgmt.<>.alarmStatus.noClear:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.topAlarmConditionDetected:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noClear:0 TEST.END -- Test Case: updateAlarmsFlags.007 @@ -2790,6 +3029,8 @@ TEST.VALUE:AlarmMgmt.<>.alarmStatus.noClear:1 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_STOP_STATE +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.topAlarmConditionDetected:2 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noClear:0 TEST.END -- Test Case: updateAlarmsFlags.008 @@ -2819,6 +3060,8 @@ TEST.VALUE:AlarmMgmt.<>.alarmStatus.noClear:1 TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA TEST.VALUE:uut_prototype_stubs.getTreatmentState.return:TREATMENT_START_STATE +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.topAlarmConditionDetected:2 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noClear:0 TEST.END -- Test Case: updateAlarmsFlags.009 @@ -2841,8 +3084,19 @@ TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:1 TEST.VALUE:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmUserRecoveryActionEnabled[ALARM_USER_ACTION_RESUME]:1 TEST.END +-- Test Case: updateAlarmsFlags.010 +TEST.UNIT:AlarmMgmt +TEST.SUBPROGRAM:updateAlarmsFlags +TEST.NEW +TEST.NAME:updateAlarmsFlags.010 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.noResume:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noResume:0 +TEST.END + -- Test Case: updateAlarmsFlags_Fault TEST.UNIT:AlarmMgmt TEST.SUBPROGRAM:updateAlarmsFlags @@ -2881,6 +3135,35 @@ TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noNewTreatment:1 TEST.END +-- Test Case: updateAlarmsFlags_Fault.001 +TEST.UNIT:AlarmMgmt +TEST.SUBPROGRAM:updateAlarmsFlags +TEST.NEW +TEST.NAME:updateAlarmsFlags_Fault.001 +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_HD_SOFTWARE_FAULT]:1 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_HIGH +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenced:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenceStart:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsSilenceExpiresIn:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsToEscalate:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsEscalatesIn:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_HD_SOFTWARE_FAULT +TEST.VALUE:AlarmMgmt.<>.alarmStatus.systemFault:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.stop:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.noClear:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.noResume:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.noRinseback:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.noEndTreatment:0 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.noNewTreatment:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.systemFault:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.stop:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noClear:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noResume:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noRinseback:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noEndTreatment:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.noNewTreatment:1 +TEST.END + -- Test Case: updateAlarmsFlags_Medium TEST.UNIT:AlarmMgmt TEST.SUBPROGRAM:updateAlarmsFlags @@ -3002,8 +3285,12 @@ TEST.SUBPROGRAM:updateAlarmsState TEST.NEW TEST.NAME:updateAlarmsState.001 +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:0 TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_HD_SOFTWARE_FAULT]:1 TEST.VALUE:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].subRank:3 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_HD_SOFTWARE_FAULT]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].subRank:3 TEST.END -- Test Case: updateAlarmsState.002 @@ -3012,8 +3299,13 @@ TEST.NEW TEST.NAME:updateAlarmsState.002 TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_HD_SOFTWARE_FAULT]:1 +TEST.VALUE:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].alarmID:ALARM_ID_NO_ALARM TEST.VALUE:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].subRank:3 +TEST.VALUE:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].timeSinceTriggeredMS:10 TEST.VALUE:uut_prototype_stubs.calcTimeSince.return:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].alarmID:ALARM_ID_NO_ALARM +TEST.EXPECTED:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].subRank:3 +TEST.EXPECTED:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].timeSinceTriggeredMS:10 TEST.END -- Test Case: updateAlarmsState.003 @@ -3026,15 +3318,20 @@ TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE]:0 TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE]:1 TEST.VALUE:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].subRank:3 +TEST.VALUE:uut_prototype_stubs.calcTimeSince.startMSCount:1 TEST.VALUE:uut_prototype_stubs.calcTimeSince.return:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_RTC_CONFIG_ERROR]:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_HD_SOFTWARE_FAULT]:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE]:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].subRank:3 TEST.END -- Test Case: updateAlarmsState.004 TEST.UNIT:AlarmMgmt TEST.SUBPROGRAM:updateAlarmsState TEST.NEW TEST.NAME:updateAlarmsState.004 -TEST.MCDC_BASIS_PATH:6 of 16 TEST.NOTES: This is an automatically generated test case. Test Path 6 @@ -3049,9 +3346,26 @@ Cannot set a due to assignment TEST.END_NOTES: TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:1 +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_HIGH +TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY TEST.VALUE:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_NONE].subRank:<> +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_NONE +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_NO_ALARM TEST.END +-- Test Case: updateAlarmsState.005 +TEST.UNIT:AlarmMgmt +TEST.SUBPROGRAM:updateAlarmsState +TEST.NEW +TEST.NAME:updateAlarmsState.005 +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:0 +TEST.VALUE:AlarmMgmt.<>.alarmIsActive[ALARM_ID_HD_SOFTWARE_FAULT]:1 +TEST.VALUE:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].subRank:3 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_NO_ALARM]:0 +TEST.EXPECTED:AlarmMgmt.<>.alarmIsActive[ALARM_ID_HD_SOFTWARE_FAULT]:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmPriorityFIFO[ALARM_PRIORITY_HIGH].subRank:3 +TEST.END + -- Test Case: updateAlarmsState_NoAlarmsActive TEST.UNIT:AlarmMgmt TEST.SUBPROGRAM:updateAlarmsState @@ -3133,4 +3447,6 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_MEDIUM TEST.VALUE:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmsState:ALARM_PRIORITY_NONE +TEST.EXPECTED:AlarmMgmt.<>.alarmStatus.alarmTop:ALARM_ID_NO_ALARM TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/BATTERY/BATTERY.tst =================================================================== diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/BATTERY/BATTERY.tst (.../BATTERY.tst) (revision c403f891689e120d6202a3f3fab85ac1054f8f45) +++ vectorcast/Hercules_RM46_HD_Project/environment/BATTERY/BATTERY.tst (.../BATTERY.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -26,6 +26,7 @@ TEST.VALUE:Battery.<>.lostACPowerPersistentCount:3 TEST.VALUE:Battery.getBatteryData.return:1 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:1 TEST.END -- Test Case: execBatteryMonitor.002 @@ -38,6 +39,7 @@ TEST.VALUE:Battery.<>.hasBatteryChargerStatus:1 TEST.VALUE:Battery.getBatteryData.return:0,1 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:0 TEST.END -- Test Case: execBatteryMonitor.003 @@ -57,6 +59,7 @@ TEST.STUB:Battery.getBatteryData TEST.VALUE:Battery.getBatteryData.return:0 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:1 TEST.END -- Test Case: execBatteryMonitor.004 @@ -74,6 +77,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.didTimeout.return:<> +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:0 TEST.END -- Test Case: execBatteryMonitor.005 @@ -95,6 +99,7 @@ TEST.VALUE:Battery.<>.hasBatteryChargerStatus:1 TEST.VALUE:Battery.getBatteryData.return:0 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:0 TEST.END -- Test Case: execBatteryMonitor.006 @@ -119,6 +124,7 @@ TEST.VALUE:Battery.<>.hasBatteryChargerStatus:0 TEST.VALUE:Battery.getBatteryData.return:1 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:1 TEST.END -- Test Case: execBatteryMonitor.007 @@ -143,6 +149,7 @@ TEST.VALUE:Battery.<>.hasBatteryChargerStatus:0 TEST.VALUE:Battery.getBatteryData.return:1 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:1 TEST.END -- Test Case: execBatteryMonitor.008 @@ -165,6 +172,7 @@ TEST.VALUE:Battery.<>.hasBatteryChargerStatus:1 TEST.VALUE:Battery.getBatteryData.return:1 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:0 TEST.END -- Test Case: execBatteryMonitor.009 @@ -190,6 +198,7 @@ TEST.VALUE:Battery.getBatteryRemainingPercent.return:<> TEST.VALUE:Battery.getBatteryData.return:1 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:0 TEST.END -- Subprogram: generateStopCondition @@ -200,6 +209,7 @@ TEST.NEW TEST.NAME:generateStopCondition.001 TEST.VALUE:uut_prototype_stubs.didTimeout.return:0,1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:0 TEST.END -- Test Case: generateStopCondition.002 @@ -219,6 +229,7 @@ Cannot set local variable timeout in branch 1 TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.i2cIsStopDetected.return:1 +TEST.EXPECTED:Battery.<>.hasBatteryChargerStatus:0 TEST.END -- Subprogram: getBatteryData @@ -238,10 +249,13 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.STUB:Battery.startCommTx +TEST.STUB:Battery.getData TEST.VALUE:Battery.getBatteryData.slaveAddr:<> TEST.VALUE:Battery.getBatteryData.command:<> TEST.VALUE:Battery.getBatteryData.dataPtr:<> TEST.VALUE:Battery.startCommTx.return:1 +TEST.VALUE:Battery.getData.return:1 +TEST.EXPECTED:Battery.getBatteryData.return:1 TEST.END -- Test Case: getBatteryData.002 @@ -263,6 +277,7 @@ TEST.VALUE:Battery.getBatteryData.command:<> TEST.VALUE:Battery.getBatteryData.dataPtr:<> TEST.VALUE:Battery.startCommTx.return:<> +TEST.EXPECTED:Battery.getBatteryData.return:0 TEST.END -- Test Case: getBatteryData.003 @@ -287,6 +302,7 @@ TEST.VALUE:Battery.getBatteryData.dataPtr:<> TEST.VALUE:Battery.startCommTx.return:1 TEST.VALUE:Battery.getData.return:1 +TEST.EXPECTED:Battery.getBatteryData.return:1 TEST.END -- Test Case: getBatteryData.004 @@ -311,6 +327,7 @@ TEST.VALUE:Battery.getBatteryData.dataPtr:<> TEST.VALUE:Battery.startCommTx.return:1 TEST.VALUE:Battery.getData.return:<> +TEST.EXPECTED:Battery.getBatteryData.return:0 TEST.END -- Subprogram: getBatteryRemainingPercent @@ -330,6 +347,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:Battery.<>.batteryRelStateOfCharge_pct.override:3435346995 +TEST.EXPECTED:Battery.getBatteryRemainingPercent.return:0 TEST.END -- Test Case: getBatteryRemainingPercent.002 @@ -347,6 +365,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:Battery.<>.batteryRelStateOfCharge_pct.override:<> +TEST.EXPECTED:Battery.getBatteryRemainingPercent.return:0 TEST.END -- Subprogram: getData @@ -366,9 +385,12 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.STUB:Battery.waitForTxReady +TEST.STUB:Battery.waitForRxReady TEST.VALUE:Battery.waitForTxReady.return:1 +TEST.VALUE:Battery.waitForRxReady.return:1 TEST.VALUE:Battery.getData.command:<> TEST.VALUE:Battery.getData.dataPtr:<> +TEST.EXPECTED:Battery.getData.return:1 TEST.END -- Test Case: getData.002 @@ -386,11 +408,58 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.STUB:Battery.waitForTxReady -TEST.VALUE:Battery.waitForTxReady.return:<> +TEST.STUB:Battery.waitForRxReady +TEST.VALUE:Battery.waitForTxReady.return:1 +TEST.VALUE:Battery.waitForRxReady.return:0 TEST.VALUE:Battery.getData.command:<> TEST.VALUE:Battery.getData.dataPtr:<> +TEST.EXPECTED:Battery.getData.return:0 TEST.END +-- Test Case: getData.003 +TEST.UNIT:Battery +TEST.SUBPROGRAM:getData +TEST.NEW +TEST.NAME:getData.003 +TEST.NOTES: +This is an automatically generated test case. + Test Path 2 + (1) if ((1) == waitForTxReady()) ==> TRUE + Row number 1 forms a pair with Row 2 for Condition #1, subcondition "a". + Condition a ==> TRUE + Test Case Generation Notes: +TEST.END_NOTES: +TEST.STUB:Battery.waitForTxReady +TEST.STUB:Battery.waitForRxReady +TEST.VALUE:Battery.waitForTxReady.return:0 +TEST.VALUE:Battery.waitForRxReady.return:1 +TEST.VALUE:Battery.getData.command:<> +TEST.VALUE:Battery.getData.dataPtr:<> +TEST.EXPECTED:Battery.getData.return:0 +TEST.END + +-- Test Case: getData.004 +TEST.UNIT:Battery +TEST.SUBPROGRAM:getData +TEST.NEW +TEST.NAME:getData.004 +TEST.NOTES: +This is an automatically generated test case. + Test Path 2 + (1) if ((1) == waitForTxReady()) ==> TRUE + Row number 1 forms a pair with Row 2 for Condition #1, subcondition "a". + Condition a ==> TRUE + Test Case Generation Notes: +TEST.END_NOTES: +TEST.STUB:Battery.waitForTxReady +TEST.STUB:Battery.waitForRxReady +TEST.VALUE:Battery.waitForTxReady.return:1 +TEST.VALUE:Battery.waitForRxReady.return:1 +TEST.VALUE:Battery.getData.command:<> +TEST.VALUE:Battery.getData.dataPtr:<> +TEST.EXPECTED:Battery.getData.return:1 +TEST.END + -- Subprogram: initBattery -- Test Case: initBattery.001 @@ -399,6 +468,7 @@ TEST.NEW TEST.NAME:initBattery.001 TEST.STUB:Battery.setupI2CDriver +TEST.EXPECTED:Battery.<>.batteryStatus:0 TEST.END -- Subprogram: isBatteryCharged @@ -419,6 +489,7 @@ TEST.END_NOTES: TEST.STUB:Battery.getBatteryRemainingPercent TEST.VALUE:Battery.getBatteryRemainingPercent.return:<> +TEST.EXPECTED:Battery.isBatteryCharged.return:1 TEST.END -- Test Case: isBatteryCharged.002 @@ -437,6 +508,7 @@ TEST.END_NOTES: TEST.STUB:Battery.getBatteryRemainingPercent TEST.VALUE:Battery.getBatteryRemainingPercent.return:<> +TEST.EXPECTED:Battery.isBatteryCharged.return:0 TEST.END -- Subprogram: testResetSetBatteryRemainingPercentOverride @@ -456,6 +528,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:Battery.testResetSetBatteryRemainingPercentOverride.return:1 TEST.END -- Test Case: testResetSetBatteryRemainingPercentOverride.002 @@ -473,6 +546,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:Battery.testResetSetBatteryRemainingPercentOverride.return:0 TEST.END -- Subprogram: testSetBatteryRemainingPercentOverride @@ -493,6 +567,7 @@ TEST.END_NOTES: TEST.VALUE:Battery.testSetBatteryRemainingPercentOverride.value:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:Battery.testSetBatteryRemainingPercentOverride.return:1 TEST.END -- Test Case: testSetBatteryRemainingPercentOverride.002 @@ -511,6 +586,7 @@ TEST.END_NOTES: TEST.VALUE:Battery.testSetBatteryRemainingPercentOverride.value:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:Battery.testSetBatteryRemainingPercentOverride.return:0 TEST.END -- Subprogram: waitForRxReady @@ -521,6 +597,7 @@ TEST.NEW TEST.NAME:waitForRxReady.001 TEST.VALUE:uut_prototype_stubs.didTimeout.return:0,1 +TEST.EXPECTED:Battery.waitForRxReady.return:0 TEST.END -- Test Case: waitForRxReady.002 @@ -540,6 +617,7 @@ Cannot set local variable timeout in branch 1 TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.i2cIsRxReady.return:1 +TEST.EXPECTED:Battery.waitForRxReady.return:1 TEST.END -- Subprogram: waitForTxReady @@ -550,6 +628,7 @@ TEST.NEW TEST.NAME:waitForTxReady.001 TEST.VALUE:uut_prototype_stubs.didTimeout.return:0,1 +TEST.EXPECTED:Battery.waitForTxReady.return:0 TEST.END -- Test Case: waitForTxReady.002 @@ -569,4 +648,5 @@ Cannot set local variable timeout in branch 1 TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.i2cIsTxReady.return:1 +TEST.EXPECTED:Battery.waitForTxReady.return:1 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst =================================================================== diff -u -r517fed82f4ba6f16407bef6c4e548a0ef175fb9d -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst (.../BLOODFLOW.tst) (revision 517fed82f4ba6f16407bef6c4e548a0ef175fb9d) +++ vectorcast/Hercules_RM46_HD_Project/environment/BLOODFLOW/BLOODFLOW.tst (.../BLOODFLOW.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -33,6 +33,7 @@ TEST.END_NOTES: TEST.STUB:BloodFlow.getBloodPumpRotorCount TEST.VALUE:BloodFlow.getBloodPumpRotorCount.return:<> +TEST.EXPECTED:BloodFlow.calcBloodFlow.return:0.0 TEST.END -- Test Case: calcBloodFlow.002 @@ -51,6 +52,7 @@ TEST.END_NOTES: TEST.STUB:BloodFlow.getBloodPumpRotorCount TEST.VALUE:BloodFlow.getBloodPumpRotorCount.return:<> +TEST.EXPECTED:BloodFlow.calcBloodFlow.return:0.0 TEST.END -- Subprogram: checkBloodPumpDirection @@ -62,6 +64,7 @@ TEST.NAME:checkBloodPumpDirection.001 TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.VALUE:BloodFlow.<>.lastBloodPumpDirectionCount:1 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpDirection.002 @@ -71,7 +74,9 @@ TEST.NAME:checkBloodPumpDirection.002 TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.VALUE:BloodFlow.<>.bloodPumpDirectionSet:MOTOR_DIR_REVERSE +TEST.VALUE:BloodFlow.<>.lastBloodPumpDirectionCount:0 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpDirection.003 @@ -94,6 +99,7 @@ TEST.END_NOTES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpDirection_FailHallSensors @@ -114,6 +120,7 @@ TEST.VALUE:BloodFlow.<>.bloodPumpDirectionSet:MOTOR_DIR_FORWARD TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:-800.0 TEST.VALUE:BloodFlow.<>.adcBloodPumpMCSpeedRPM.data:800.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpDirection_FailHallSensors_NoPersist @@ -134,6 +141,7 @@ TEST.VALUE:BloodFlow.<>.bloodPumpDirectionSet:MOTOR_DIR_FORWARD TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:-800.0 TEST.VALUE:BloodFlow.<>.adcBloodPumpMCSpeedRPM.data:800.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpDirection_FailMCSpd @@ -153,6 +161,7 @@ TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.VALUE:BloodFlow.<>.bloodPumpDirectionSet:MOTOR_DIR_FORWARD TEST.VALUE:BloodFlow.<>.adcBloodPumpMCSpeedRPM.data:-800.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpDirection_FailMCSpd_NoPersist @@ -172,6 +181,7 @@ TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.VALUE:BloodFlow.<>.bloodPumpDirectionSet:MOTOR_DIR_FORWARD TEST.VALUE:BloodFlow.<>.adcBloodPumpMCSpeedRPM.data:-800.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpDirection_NominalPath @@ -182,6 +192,7 @@ TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.VALUE:BloodFlow.<>.bloodPumpDirectionSet:MOTOR_DIR_FORWARD TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:800.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpDirection_NotControlling @@ -190,6 +201,7 @@ TEST.NEW TEST.NAME:checkBloodPumpDirection_NotControlling TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.END -- Subprogram: checkBloodPumpFlowRate @@ -201,7 +213,9 @@ TEST.NAME:checkBloodPumpFlowRate.001 TEST.STUB:BloodFlow.getMeasuredBloodFlowRate TEST.VALUE:BloodFlow.getMeasuredBloodFlowRate.return:2000.0 +TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE TEST.END -- Test Case: checkBloodPumpFlowRate.002 @@ -211,7 +225,9 @@ TEST.NAME:checkBloodPumpFlowRate.002 TEST.STUB:BloodFlow.getMeasuredBloodFlowRate TEST.VALUE:BloodFlow.getMeasuredBloodFlowRate.return:-2000.0 +TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE TEST.END -- Test Case: checkBloodPumpFlowRate.003 @@ -228,7 +244,9 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE TEST.END -- Test Case: checkBloodPumpFlowRate.004 @@ -245,7 +263,9 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:<> +TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE +TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE TEST.END -- Subprogram: checkBloodPumpMCCurrent @@ -265,6 +285,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK TEST.END -- Test Case: checkBloodPumpMCCurrent_OFFOk @@ -283,6 +304,7 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_OFF_STATE TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:149.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_OFF_STATE TEST.END -- Test Case: checkBloodPumpMCCurrent_OFFTooHighAlarm @@ -301,6 +323,7 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_OFF_STATE TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:-151.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_OFF_STATE TEST.END -- Test Case: checkBloodPumpMCCurrent_OFFTooHighShortTime @@ -319,6 +342,7 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_OFF_STATE TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:151.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_OFF_STATE TEST.END -- Test Case: checkBloodPumpMCCurrent_RunningOk @@ -337,6 +361,7 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:200.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.END -- Test Case: checkBloodPumpMCCurrent_RunningTooHighAlarm @@ -355,6 +380,7 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:2001.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.END -- Test Case: checkBloodPumpMCCurrent_RunningTooHighShortTime @@ -373,6 +399,7 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:2001.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.END -- Test Case: checkBloodPumpMCCurrent_RunningTooLowAlarm @@ -391,6 +418,7 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:-149.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.END -- Test Case: checkBloodPumpMCCurrent_RunningTooLowShortTime @@ -409,6 +437,7 @@ TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:149.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.END -- Subprogram: checkBloodPumpRotor @@ -431,6 +460,7 @@ TEST.VALUE:BloodFlow.<>.bpStopAtHomePosition:<> TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 TEST.VALUE:uut_prototype_stubs.didTimeout.return:<> +TEST.EXPECTED:BloodFlow.<>.bpStopAtHomePosition:0 TEST.END -- Test Case: checkBloodPumpRotor_Homing_NoTimeout @@ -546,6 +576,7 @@ TEST.VALUE:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.VALUE:BloodFlow.<>.bloodPumpPWMDutyCyclePctSet:0.1 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpSpeeds.002 @@ -558,6 +589,7 @@ TEST.VALUE:BloodFlow.<>.bloodPumpPWMDutyCyclePctSet:0.1 TEST.VALUE:BloodFlow.getMeasuredBloodPumpMCSpeed.return:400.0 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpSpeeds_Off_InRange @@ -577,6 +609,7 @@ TEST.VALUE:BloodFlow.<>.isBloodPumpOn:0 TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:0 TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:99.0 +TEST.EXPECTED:BloodFlow.<>.isBloodPumpOn:0 TEST.END -- Test Case: checkBloodPumpSpeeds_Off_OutOfRange_NoPersist @@ -596,6 +629,7 @@ TEST.VALUE:BloodFlow.<>.isBloodPumpOn:0 TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:0 TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:101.0 +TEST.EXPECTED:BloodFlow.<>.isBloodPumpOn:0 TEST.END -- Test Case: checkBloodPumpSpeeds_Off_OutOfRange_Persist @@ -615,6 +649,7 @@ TEST.VALUE:BloodFlow.<>.isBloodPumpOn:0 TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:0 TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:101.0 +TEST.EXPECTED:BloodFlow.<>.isBloodPumpOn:0 TEST.END -- Test Case: checkBloodPumpSpeeds_On_Controlling_NominalPath @@ -648,6 +683,7 @@ TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:300 TEST.VALUE:BloodFlow.<>.bloodPumpRotorSpeedRPM.data:50.0 TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:1600.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpSpeeds_On_Controlling_OutOfRange_NoPersist @@ -681,6 +717,7 @@ TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:300 TEST.VALUE:BloodFlow.<>.bloodPumpRotorSpeedRPM.data:45.0 TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:1850.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpSpeeds_On_Controlling_OutOfRange_Persist @@ -714,6 +751,7 @@ TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:300 TEST.VALUE:BloodFlow.<>.bloodPumpRotorSpeedRPM.data:45.0 TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:1120.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_CONTROL_TO_TARGET_STATE TEST.END -- Test Case: checkBloodPumpSpeeds_On_Ramping @@ -746,6 +784,7 @@ TEST.VALUE:BloodFlow.<>.isBloodPumpOn:1 TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:300 TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:99.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_RAMPING_UP_STATE TEST.END -- Subprogram: execBloodFlowController @@ -840,7 +879,13 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.STUB:BloodFlow.calcBloodFlow +TEST.STUB:BloodFlow.getMeasuredBloodPumpMCSpeed +TEST.STUB:BloodFlow.filterBloodPumpRPMReadings +TEST.VALUE:BloodFlow.getMeasuredBloodPumpMCSpeed.return:1.0 +TEST.VALUE:BloodFlow.filterBloodPumpRPMReadings.rpm:1.0 +TEST.VALUE:uut_prototype_stubs.getIntADCReading.channel:INT_ADC_BLOOD_PUMP_SPEED TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_FAUL +TEST.EXPECTED:BloodFlow.filterBloodPumpRPMReadings.rpm:1.0 TEST.END -- Test Case: execBloodFlowMonitor_InitPOST @@ -967,6 +1012,7 @@ >>> >>> Unknown parameter/object name bloodPumpSelfTestState >>> >>> Value Line Error - Command Ignored TEST.END_IMPORT_FAILURES: +TEST.EXPECTED:BloodFlow.execBloodFlowTest.return:SELF_TEST_STATUS_PASSED TEST.END -- Subprogram: filterBloodPumpRPMReadings @@ -978,6 +1024,8 @@ TEST.NAME:filterBloodPumpRPMReadings.001 TEST.VALUE:BloodFlow.<>.rpmReadingsIdx:99 TEST.VALUE:BloodFlow.<>.rpmReadingsCount:100 +TEST.VALUE:BloodFlow.filterBloodPumpRPMReadings.rpm:1.0 +TEST.EXPECTED:BloodFlow.filterBloodPumpRPMReadings.rpm:1.0 TEST.END -- Test Case: filterBloodPumpRPMReadings.002 @@ -995,7 +1043,8 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodFlow.<>.rpmReadingsCount:<> -TEST.VALUE:BloodFlow.filterBloodPumpRPMReadings.rpm:<> +TEST.VALUE:BloodFlow.filterBloodPumpRPMReadings.rpm:1.0 +TEST.EXPECTED:BloodFlow.filterBloodPumpRPMReadings.rpm:1.0 TEST.END -- Test Case: filterBloodPumpRPMReadings.003 @@ -1013,7 +1062,8 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodFlow.<>.rpmReadingsCount:<> -TEST.VALUE:BloodFlow.filterBloodPumpRPMReadings.rpm:<> +TEST.VALUE:BloodFlow.filterBloodPumpRPMReadings.rpm:1.0 +TEST.EXPECTED:BloodFlow.filterBloodPumpRPMReadings.rpm:1.0 TEST.END -- Subprogram: getBloodPumpMotorCount @@ -1024,6 +1074,8 @@ TEST.NEW TEST.NAME:getBloodPumpMotorCount_NominalPath TEST.VALUE:BloodFlow.<>.bloodPumpMotorEdgeCount:4800 +TEST.VALUE:BloodFlow.getBloodPumpMotorCount.return:1 +TEST.EXPECTED:BloodFlow.getBloodPumpMotorCount.return:4800 TEST.END -- Subprogram: getBloodPumpRotorCount @@ -1043,6 +1095,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodFlow.<>.bloodPumpRotorCounter.override:3435346995 +TEST.EXPECTED:BloodFlow.getBloodPumpRotorCount.return:0 TEST.END -- Test Case: getBloodPumpRotorCount_NominalPath @@ -1056,6 +1109,7 @@ >>> >>> Unexpected end of command - stopped at character 54 >>> >>> Command Ignored TEST.END_IMPORT_FAILURES: +TEST.EXPECTED:BloodFlow.getBloodPumpRotorCount.return:0 TEST.END -- Subprogram: getMeasuredBloodFlowRate @@ -1202,6 +1256,7 @@ >>> >>> Previous value 0 ignored TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:0 +TEST.EXPECTED:BloodFlow.getTargetBloodFlowRate.return:0 TEST.END -- Test Case: getTargetBloodFlowRate_Override @@ -1226,6 +1281,7 @@ >>> >>> Previous value 500 ignored TEST.END_IMPORT_FAILURES: TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:-2147483648 +TEST.EXPECTED:BloodFlow.getTargetBloodFlowRate.return:-2147483648 TEST.END -- Subprogram: handleBloodPumpControlToTargetState @@ -1541,6 +1597,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<> +TEST.EXPECTED:BloodFlow.<>.bloodFlowDataPublicationTimerCounter:1 TEST.END -- Test Case: publishBloodFlowData_NominalPath @@ -1583,6 +1640,7 @@ TEST.VALUE:BloodFlow.<>.measuredBloodFlowRate.data:199.0 TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:800.0 TEST.VALUE:BloodFlow.<>.adcBloodPumpMCCurrentmA.data:650.0 +TEST.EXPECTED:BloodFlow.<>.bloodFlowDataPublicationTimerCounter:0 TEST.END -- Subprogram: releaseBloodPumpStop @@ -1597,13 +1655,25 @@ TEST.EXPECTED:BloodFlow.<>.ptr_canREG3[0].TIOC:2 TEST.END +-- Subprogram: resetBloodPumpRPMMovingAverage + +-- Test Case: resetBloodPumpRPMMovingAverage.001 +TEST.UNIT:BloodFlow +TEST.SUBPROGRAM:resetBloodPumpRPMMovingAverage +TEST.NEW +TEST.NAME:resetBloodPumpRPMMovingAverage.001 +TEST.EXPECTED:BloodFlow.<>.rpmReadingsIdx:0 +TEST.END + -- Subprogram: resetBloodPumpRotorCount -- Test Case: resetBloodPumpRotorCount.001 TEST.UNIT:BloodFlow TEST.SUBPROGRAM:resetBloodPumpRotorCount TEST.NEW TEST.NAME:resetBloodPumpRotorCount.001 +TEST.VALUE:BloodFlow.<>.bloodPumpRotorCounter.data:0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpRotorCounter.data:0 TEST.END -- Subprogram: setBloodPumpControlSignalPWM @@ -1694,8 +1764,36 @@ TEST.VALUE:BloodFlow.setBloodPumpTargetFlowRate.flowRate:0 TEST.VALUE:BloodFlow.setBloodPumpTargetFlowRate.dir:MOTOR_DIR_FORWARD TEST.VALUE:BloodFlow.setBloodPumpTargetFlowRate.mode:<> +TEST.EXPECTED:BloodFlow.setBloodPumpTargetFlowRate.return:0 TEST.END +-- Test Case: setBloodPumpTargetFlowRate.002 +TEST.UNIT:BloodFlow +TEST.SUBPROGRAM:setBloodPumpTargetFlowRate +TEST.NEW +TEST.NAME:setBloodPumpTargetFlowRate.002 +TEST.NOTES: +This is an automatically generated test case. + Test Path 3 + (1) if (((0) == isBloodPumpOn || (0) == flowRate) || dir == bloodPumpDirectionSet) ==> TRUE + Row number 6 forms a pair with Row 8 for Condition #1, subcondition "b". + Condition a ==> FALSE + Condition b ==> TRUE + Condition c ==> FALSE + Test Case Generation Notes: +TEST.END_NOTES: +TEST.VALUE:BloodFlow.<>.isBloodPumpOn:1 +TEST.VALUE:BloodFlow.<>.bloodPumpDirectionSet:MOTOR_DIR_REVERSE +TEST.VALUE:BloodFlow.<>.bloodPumpControlMode:PUMP_CONTROL_MODE_OPEN_LOOP +TEST.VALUE:BloodFlow.<>.targetBloodFlowRate:0 +TEST.VALUE:BloodFlow.setBloodPumpTargetFlowRate.flowRate:0 +TEST.VALUE:BloodFlow.setBloodPumpTargetFlowRate.dir:MOTOR_DIR_FORWARD +TEST.VALUE:BloodFlow.setBloodPumpTargetFlowRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate:0 +TEST.EXPECTED:BloodFlow.setBloodPumpTargetFlowRate.flowRate:0 +TEST.EXPECTED:BloodFlow.setBloodPumpTargetFlowRate.return:1 +TEST.END + -- Test Case: setBloodPumpTargetFlowRate_DirChngWhilePumpIsRunning TEST.UNIT:BloodFlow TEST.SUBPROGRAM:setBloodPumpTargetFlowRate @@ -1950,7 +2048,7 @@ TEST.EXPECTED:BloodFlow.<>.ptr_canREG3[0].TIOC:0 TEST.EXPECTED:BloodFlow.<>.bloodPumpState:BLOOD_PUMP_OFF_STATE TEST.EXPECTED:BloodFlow.<>.isBloodPumpOn:0 -TEST.EXPECTED:BloodFlow.<>.bloodPumpPWMDutyCyclePct:0.0 +TEST.EXPECTED:BloodFlow.<>.bloodPumpPWMDutyCyclePct:0.1 TEST.EXPECTED:BloodFlow.<>.targetBloodFlowRate:0 TEST.EXPECTED:BloodFlow.<>.bpControlTimerCounter:0 TEST.EXPECTED:uut_prototype_stubs.etpwmSetCmpA.value:0 @@ -2067,6 +2165,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodFlow.testResetBloodPumpRotorCountOverride.return:1 TEST.END -- Test Case: testResetBloodPumpRotorCountOverride.002 @@ -2084,6 +2183,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodFlow.testResetBloodPumpRotorCountOverride.return:0 TEST.END -- Subprogram: testResetMeasuredBloodFlowRateOverride @@ -2322,6 +2422,7 @@ TEST.END_NOTES: TEST.VALUE:BloodFlow.testSetBloodPumpRotorCountOverride.value:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodFlow.testSetBloodPumpRotorCountOverride.return:1 TEST.END -- Test Case: testSetBloodPumpRotorCountOverride.002 @@ -2340,6 +2441,7 @@ TEST.END_NOTES: TEST.VALUE:BloodFlow.testSetBloodPumpRotorCountOverride.value:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodFlow.testSetBloodPumpRotorCountOverride.return:0 TEST.END -- Subprogram: testSetMeasuredBloodFlowRateOverride @@ -2551,6 +2653,7 @@ TEST.VALUE:BloodFlow.testSetTargetBloodFlowRateOverride.value:<> TEST.VALUE:BloodFlow.testSetTargetBloodFlowRateOverride.ctrlMode:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodFlow.testSetTargetBloodFlowRateOverride.ctrlMode:0 TEST.END -- Test Case: testSetTargetBloodFlowRateOverride_InvalidControlMode @@ -2701,6 +2804,45 @@ TEST.EXPECTED:BloodFlow.<>.bpMotorSpeedCalcTimerCtr:0 TEST.END +-- Test Case: updateBloodPumpSpeedAndDirectionFromHallSensors_Forward.001 +TEST.UNIT:BloodFlow +TEST.SUBPROGRAM:updateBloodPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:updateBloodPumpSpeedAndDirectionFromHallSensors_Forward.001 +TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:0.0 +TEST.VALUE:BloodFlow.<>.bpLastMotorHallSensorCounts[0]:0 +TEST.VALUE:BloodFlow.<>.bpLastMotorHallSensorCounts[2]:0 +TEST.VALUE:BloodFlow.<>.bpMotorSpeedCalcIdx:1 +TEST.VALUE:BloodFlow.<>.bpMotorSpeedCalcTimerCtr:99 +TEST.VALUE:uut_prototype_stubs.getFPGABloodPumpHallSensorCount.return:0 +TEST.VALUE:uut_prototype_stubs.getFPGABloodPumpHallSensorStatus.return:0 +TEST.VALUE:uut_prototype_stubs.u16DiffWithWrap.start:1 +TEST.VALUE:uut_prototype_stubs.u16DiffWithWrap.end:2 +TEST.VALUE:uut_prototype_stubs.u16DiffWithWrap.return:1 +TEST.EXPECTED:BloodFlow.<>.bpLastMotorHallSensorCounts[0]:0 +TEST.EXPECTED:BloodFlow.<>.bpLastMotorHallSensorCounts[2]:0 +TEST.EXPECTED:BloodFlow.<>.bpMotorSpeedCalcIdx:2 +TEST.EXPECTED:BloodFlow.<>.bpMotorSpeedCalcTimerCtr:0 +TEST.EXPECTED:uut_prototype_stubs.u16DiffWithWrap.start:0 +TEST.EXPECTED:uut_prototype_stubs.u16DiffWithWrap.end:0 +TEST.END + +-- Test Case: updateBloodPumpSpeedAndDirectionFromHallSensors_Forward.002 +TEST.UNIT:BloodFlow +TEST.SUBPROGRAM:updateBloodPumpSpeedAndDirectionFromHallSensors +TEST.NEW +TEST.NAME:updateBloodPumpSpeedAndDirectionFromHallSensors_Forward.002 +TEST.VALUE:BloodFlow.<>.bloodPumpSpeedRPM.data:0.0 +TEST.VALUE:BloodFlow.<>.bpLastMotorHallSensorCounts[2]:998 +TEST.VALUE:BloodFlow.<>.bpMotorSpeedCalcIdx:1 +TEST.VALUE:BloodFlow.<>.bpMotorSpeedCalcTimerCtr:99 +TEST.VALUE:uut_prototype_stubs.getFPGABloodPumpHallSensorCount.return:1000 +TEST.VALUE:uut_prototype_stubs.u16BiDiffWithWrap.return:-1 +TEST.EXPECTED:BloodFlow.<>.bpLastMotorHallSensorCounts[2]:1000 +TEST.EXPECTED:BloodFlow.<>.bpMotorSpeedCalcIdx:2 +TEST.EXPECTED:BloodFlow.<>.bpMotorSpeedCalcTimerCtr:0 +TEST.END + -- Test Case: updateBloodPumpSpeedAndDirectionFromHallSensors_ForwardWrap TEST.UNIT:BloodFlow TEST.SUBPROGRAM:updateBloodPumpSpeedAndDirectionFromHallSensors Index: vectorcast/Hercules_RM46_HD_Project/environment/BLOODLEAK/BLOODLEAK.tst =================================================================== diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/BLOODLEAK/BLOODLEAK.tst (.../BLOODLEAK.tst) (revision c403f891689e120d6202a3f3fab85ac1054f8f45) +++ vectorcast/Hercules_RM46_HD_Project/environment/BLOODLEAK/BLOODLEAK.tst (.../BLOODLEAK.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -23,6 +23,7 @@ TEST.NEW TEST.NAME:execBloodLeak.001 TEST.VALUE:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_ZERO_STATE +TEST.EXPECTED:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_ZERO_STATE TEST.END -- Test Case: execBloodLeak.002 @@ -31,6 +32,7 @@ TEST.NEW TEST.NAME:execBloodLeak.002 TEST.VALUE:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_SELF_TEST_STATE +TEST.EXPECTED:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_SELF_TEST_STATE TEST.END -- Test Case: execBloodLeak.003 @@ -39,6 +41,7 @@ TEST.NEW TEST.NAME:execBloodLeak.003 TEST.VALUE:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_NORMAL_STATE +TEST.EXPECTED:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_NORMAL_STATE TEST.END -- Test Case: execBloodLeak.004 @@ -47,6 +50,7 @@ TEST.NEW TEST.NAME:execBloodLeak.004 TEST.VALUE:BloodLeak.<>.bloodLeakState:NUM_OF_BLOOD_LEAK_STATES +TEST.EXPECTED:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_INIT_STATE TEST.END -- Test Case: execBloodLeak.005 @@ -64,6 +68,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_FAUL +TEST.EXPECTED:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_START_UP_STATE TEST.END -- Test Case: execBloodLeak.006 @@ -80,7 +85,9 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_SET_SET_POINT_STATE TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_INIT +TEST.EXPECTED:BloodLeak.<>.bloodLeakState:BLOOD_LEAK_SET_SET_POINT_STATE TEST.END -- Subprogram: getBloodLeakSelfTestStatus @@ -90,6 +97,7 @@ TEST.SUBPROGRAM:getBloodLeakSelfTestStatus TEST.NEW TEST.NAME:getBloodLeakSelfTestStatus.001 +TEST.EXPECTED:BloodLeak.getBloodLeakSelfTestStatus.return:SELF_TEST_STATUS_IN_PROGRESS TEST.END -- Subprogram: getBloodLeakStatus @@ -109,6 +117,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodLeak.<>.bloodLeakStatus.override:3435346995 +TEST.EXPECTED:BloodLeak.getBloodLeakStatus.return:BLOOD_LEAK_DETECTED TEST.END -- Test Case: getBloodLeakStatus.002 @@ -126,6 +135,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodLeak.<>.bloodLeakStatus.override:<> +TEST.EXPECTED:BloodLeak.getBloodLeakStatus.return:BLOOD_LEAK_DETECTED TEST.END -- Subprogram: handleBloodLeakInitState @@ -145,6 +155,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodLeak.<>.bloodLeakZeroRequested:1 +TEST.EXPECTED:BloodLeak.handleBloodLeakInitState.return:BLOOD_LEAK_ZERO_STATE TEST.END -- Test Case: handleBloodLeakInitState.002 @@ -162,6 +173,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodLeak.<>.bloodLeakZeroRequested:<> +TEST.EXPECTED:BloodLeak.handleBloodLeakInitState.return:BLOOD_LEAK_INIT_STATE TEST.END -- Subprogram: handleBloodLeakNormalState @@ -181,6 +193,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.noFPGABloodLeakDetected.return:1 +TEST.EXPECTED:BloodLeak.handleBloodLeakNormalState.return:BLOOD_LEAK_NORMAL_STATE TEST.END -- Test Case: handleBloodLeakNormalState.002 @@ -198,6 +211,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.noFPGABloodLeakDetected.return:<> +TEST.EXPECTED:BloodLeak.handleBloodLeakNormalState.return:BLOOD_LEAK_NORMAL_STATE TEST.END -- Test Case: handleBloodLeakNormalState.003 @@ -220,6 +234,7 @@ TEST.VALUE:BloodLeak.getBloodLeakStatus.return:BLOOD_LEAK_DETECTED TEST.VALUE:uut_prototype_stubs.noFPGABloodLeakDetected.return:<> TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:BloodLeak.handleBloodLeakNormalState.return:BLOOD_LEAK_NORMAL_STATE TEST.END -- Test Case: handleBloodLeakNormalState.004 @@ -242,6 +257,7 @@ TEST.VALUE:BloodLeak.<>.bloodLeakZeroRequested:1 TEST.VALUE:BloodLeak.getBloodLeakStatus.return:BLOOD_LEAK_NOT_DETECTED TEST.VALUE:uut_prototype_stubs.noFPGABloodLeakDetected.return:<> +TEST.EXPECTED:BloodLeak.handleBloodLeakNormalState.return:BLOOD_LEAK_ZERO_STATE TEST.END -- Subprogram: handleBloodLeakSelfTestState @@ -261,6 +277,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodLeak.<>.bloodLeakSelfTestStatus:SELF_TEST_STATUS_IN_PROGRESS +TEST.EXPECTED:BloodLeak.handleBloodLeakSelfTestState.return:BLOOD_LEAK_SELF_TEST_STATE TEST.END -- Test Case: handleBloodLeakSelfTestState.002 @@ -278,6 +295,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodLeak.<>.bloodLeakSelfTestStatus:SELF_TEST_STATUS_PASSED +TEST.EXPECTED:BloodLeak.handleBloodLeakSelfTestState.return:BLOOD_LEAK_SELF_TEST_STATE TEST.END -- Test Case: handleBloodLeakSelfTestState.003 @@ -297,6 +315,7 @@ TEST.END_NOTES: TEST.VALUE:BloodLeak.<>.bloodLeakSelfTestStatus:SELF_TEST_STATUS_IN_PROGRESS TEST.VALUE:uut_prototype_stubs.noFPGABloodLeakDetected.return:1 +TEST.EXPECTED:BloodLeak.handleBloodLeakSelfTestState.return:BLOOD_LEAK_SELF_TEST_STATE TEST.END -- Test Case: handleBloodLeakSelfTestState.004 @@ -318,6 +337,7 @@ TEST.VALUE:BloodLeak.<>.bloodLeakSelfTestStatus:SELF_TEST_STATUS_IN_PROGRESS TEST.VALUE:uut_prototype_stubs.noFPGABloodLeakDetected.return:1 TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:BloodLeak.handleBloodLeakSelfTestState.return:BLOOD_LEAK_SELF_TEST_STATE TEST.END -- Test Case: handleBloodLeakSelfTestState.005 @@ -337,6 +357,7 @@ TEST.END_NOTES: TEST.VALUE:BloodLeak.<>.bloodLeakSelfTestStatus:SELF_TEST_STATUS_PASSED TEST.VALUE:uut_prototype_stubs.noFPGABloodLeakDetected.return:1 +TEST.EXPECTED:BloodLeak.handleBloodLeakSelfTestState.return:BLOOD_LEAK_NORMAL_STATE TEST.END -- Subprogram: handleBloodLeakZeroState @@ -356,6 +377,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.FPGABloodLeakZeroDetected.return:1 +TEST.EXPECTED:BloodLeak.handleBloodLeakZeroState.return:BLOOD_LEAK_SELF_TEST_STATE TEST.END -- Test Case: handleBloodLeakZeroState.002 @@ -373,6 +395,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.FPGABloodLeakZeroDetected.return:<> +TEST.EXPECTED:BloodLeak.handleBloodLeakZeroState.return:BLOOD_LEAK_ZERO_STATE TEST.END -- Test Case: handleBloodLeakZeroState.003 @@ -392,6 +415,7 @@ TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.FPGABloodLeakZeroDetected.return:<> TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:BloodLeak.handleBloodLeakZeroState.return:BLOOD_LEAK_ZERO_STATE TEST.END -- Subprogram: initBloodLeak @@ -401,6 +425,8 @@ TEST.SUBPROGRAM:initBloodLeak TEST.NEW TEST.NAME:initBloodLeak.001 +TEST.VALUE:BloodLeak.<>.bloodLeakSelfTestStatus:SELF_TEST_STATUS_IN_PROGRESS +TEST.EXPECTED:BloodLeak.<>.bloodLeakSelfTestStatus:SELF_TEST_STATUS_IN_PROGRESS TEST.END -- Subprogram: publishBloodLeakData @@ -420,6 +446,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<> +TEST.EXPECTED:BloodLeak.<>.bloodLeakDataPublicationTimerCounter:0 TEST.END -- Test Case: publishBloodLeakData.002 @@ -436,7 +463,9 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:BloodLeak.<>.bloodLeakDataPublicationTimerCounter:0 TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<> +TEST.EXPECTED:BloodLeak.<>.bloodLeakDataPublicationTimerCounter:1 TEST.END -- Subprogram: testResetBloodLeakDataPublishIntervalOverride @@ -456,6 +485,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodLeak.testResetBloodLeakDataPublishIntervalOverride.return:1 TEST.END -- Test Case: testResetBloodLeakDataPublishIntervalOverride.002 @@ -473,6 +503,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodLeak.testResetBloodLeakDataPublishIntervalOverride.return:0 TEST.END -- Subprogram: testResetBloodLeakStatusOverride @@ -492,6 +523,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodLeak.testResetBloodLeakStatusOverride.return:1 TEST.END -- Test Case: testResetBloodLeakStatusOverride.002 @@ -509,6 +541,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodLeak.testResetBloodLeakStatusOverride.return:0 TEST.END -- Subprogram: testSetBloodLeakDataPublishIntervalOverride @@ -529,6 +562,7 @@ TEST.END_NOTES: TEST.VALUE:BloodLeak.testSetBloodLeakDataPublishIntervalOverride.value:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodLeak.testSetBloodLeakDataPublishIntervalOverride.return:1 TEST.END -- Test Case: testSetBloodLeakDataPublishIntervalOverride.002 @@ -547,6 +581,7 @@ TEST.END_NOTES: TEST.VALUE:BloodLeak.testSetBloodLeakDataPublishIntervalOverride.value:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodLeak.testSetBloodLeakDataPublishIntervalOverride.value:0 TEST.END -- Subprogram: testSetBloodLeakStatusOverride @@ -566,6 +601,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodLeak.testSetBloodLeakStatusOverride.status:<> +TEST.EXPECTED:BloodLeak.testSetBloodLeakStatusOverride.return:0 TEST.END -- Test Case: testSetBloodLeakStatusOverride.002 @@ -583,6 +619,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodLeak.testSetBloodLeakStatusOverride.status:<> +TEST.EXPECTED:BloodLeak.testSetBloodLeakStatusOverride.return:0 TEST.END -- Test Case: testSetBloodLeakStatusOverride.003 @@ -602,6 +639,7 @@ TEST.END_NOTES: TEST.VALUE:BloodLeak.testSetBloodLeakStatusOverride.status:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodLeak.testSetBloodLeakStatusOverride.return:1 TEST.END -- Test Case: testSetBloodLeakStatusOverride.004 @@ -621,6 +659,7 @@ TEST.END_NOTES: TEST.VALUE:BloodLeak.testSetBloodLeakStatusOverride.status:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodLeak.testSetBloodLeakStatusOverride.return:0 TEST.END -- Subprogram: zeroBloodLeak @@ -630,4 +669,5 @@ TEST.SUBPROGRAM:zeroBloodLeak TEST.NEW TEST.NAME:zeroBloodLeak.001 +TEST.EXPECTED:BloodLeak.<>.bloodLeakZeroRequested:1 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/BLOODPRIME/BLOODPRIME.tst =================================================================== diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/BLOODPRIME/BLOODPRIME.tst (.../BLOODPRIME.tst) (revision c403f891689e120d6202a3f3fab85ac1054f8f45) +++ vectorcast/Hercules_RM46_HD_Project/environment/BLOODPRIME/BLOODPRIME.tst (.../BLOODPRIME.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -22,6 +22,7 @@ TEST.SUBPROGRAM:execBloodPrime TEST.NEW TEST.NAME:execBloodPrime.001 +TEST.EXPECTED:BloodPrime.<>.bloodPrimeState:BLOOD_PRIME_RAMP_STATE TEST.END -- Test Case: execBloodPrime.002 @@ -30,6 +31,7 @@ TEST.NEW TEST.NAME:execBloodPrime.002 TEST.VALUE:BloodPrime.<>.bloodPrimeState:NUM_OF_BLOOD_PRIME_STATES +TEST.EXPECTED:BloodPrime.<>.bloodPrimeState:NUM_OF_BLOOD_PRIME_STATES TEST.END -- Subprogram: getBloodPrimeVolume @@ -49,6 +51,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodPrime.<>.cumulativeBloodPrimeVolume_mL.override:3435346995 +TEST.EXPECTED:BloodPrime.getBloodPrimeVolume.return:0.0 TEST.END -- Test Case: getBloodPrimeVolume.002 @@ -66,6 +69,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:BloodPrime.<>.cumulativeBloodPrimeVolume_mL.override:<> +TEST.EXPECTED:BloodPrime.getBloodPrimeVolume.return:0.0 TEST.END -- Subprogram: getCurrentBloodPrimeState @@ -75,6 +79,7 @@ TEST.SUBPROGRAM:getCurrentBloodPrimeState TEST.NEW TEST.NAME:getCurrentBloodPrimeState.001 +TEST.EXPECTED:BloodPrime.getCurrentBloodPrimeState.return:BLOOD_PRIME_RAMP_STATE TEST.END -- Subprogram: handleBloodPrimeRampState @@ -86,6 +91,7 @@ TEST.NAME:handleBloodPrimeRampState.001 TEST.STUB:BloodPrime.getBloodPrimeVolume TEST.VALUE:BloodPrime.getBloodPrimeVolume.return:0.0 +TEST.EXPECTED:BloodPrime.handleBloodPrimeRampState.return:BLOOD_PRIME_RAMP_STATE TEST.END -- Test Case: handleBloodPrimeRampState.002 @@ -96,6 +102,7 @@ TEST.STUB:BloodPrime.getBloodPrimeVolume TEST.VALUE:BloodPrime.<>.bloodPrimeRampControlTimerCtr:100 TEST.VALUE:BloodPrime.getBloodPrimeVolume.return:0.0 +TEST.EXPECTED:BloodPrime.handleBloodPrimeRampState.return:BLOOD_PRIME_RAMP_STATE TEST.END -- Test Case: handleBloodPrimeRampState.003 @@ -107,6 +114,7 @@ TEST.VALUE:BloodPrime.<>.bloodPrimeRampControlTimerCtr:100 TEST.VALUE:BloodPrime.getBloodPrimeVolume.return:0.0 TEST.VALUE:uut_prototype_stubs.getTreatmentParameterU32.return:1 +TEST.EXPECTED:BloodPrime.handleBloodPrimeRampState.return:BLOOD_PRIME_RAMP_STATE TEST.END -- Test Case: handleBloodPrimeRampState.004 @@ -125,6 +133,7 @@ TEST.END_NOTES: TEST.STUB:BloodPrime.getBloodPrimeVolume TEST.VALUE:BloodPrime.getBloodPrimeVolume.return:<> +TEST.EXPECTED:BloodPrime.handleBloodPrimeRampState.return:BLOOD_PRIME_RAMP_STATE TEST.END -- Test Case: handleBloodPrimeRampState.005 @@ -143,6 +152,7 @@ TEST.END_NOTES: TEST.STUB:BloodPrime.getBloodPrimeVolume TEST.VALUE:BloodPrime.getBloodPrimeVolume.return:<> +TEST.EXPECTED:BloodPrime.handleBloodPrimeRampState.return:BLOOD_PRIME_RAMP_STATE TEST.END -- Subprogram: initBloodPrime @@ -153,6 +163,7 @@ TEST.NEW TEST.NAME:initBloodPrime.001 TEST.VALUE:uut_prototype_stubs.getTreatmentParameterU32.return:200 +TEST.EXPECTED:BloodPrime.<>.bloodPrimeState:BLOOD_PRIME_RAMP_STATE TEST.END -- Test Case: initBloodPrime.002 @@ -161,6 +172,7 @@ TEST.NEW TEST.NAME:initBloodPrime.002 TEST.VALUE:uut_prototype_stubs.getTreatmentParameterU32.return:1000 +TEST.EXPECTED:BloodPrime.<>.bloodPrimeState:BLOOD_PRIME_RAMP_STATE TEST.END -- Test Case: initBloodPrime.003 @@ -178,6 +190,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.getTreatmentParameterU32.return:<> +TEST.EXPECTED:BloodPrime.<>.bloodPrimeState:BLOOD_PRIME_RAMP_STATE TEST.END -- Subprogram: publishBloodPrimeData @@ -197,6 +210,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<> +TEST.EXPECTED:BloodPrime.<>.bloodPrimeRampControlTimerCtr:0 TEST.END -- Test Case: publishBloodPrimeData.002 @@ -214,6 +228,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<> +TEST.EXPECTED:BloodPrime.<>.bloodPrimeRampControlTimerCtr:0 TEST.END -- Subprogram: resetBloodPrimeFlags @@ -223,6 +238,7 @@ TEST.SUBPROGRAM:resetBloodPrimeFlags TEST.NEW TEST.NAME:resetBloodPrimeFlags.001 +TEST.EXPECTED:BloodPrime.<>.bloodPrimeRampControlTimerCtr:0 TEST.END -- Subprogram: testResetBloodPrimePublishIntervalOverride @@ -242,6 +258,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodPrime.testResetBloodPrimePublishIntervalOverride.return:1 TEST.END -- Test Case: testResetBloodPrimePublishIntervalOverride.002 @@ -259,6 +276,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodPrime.testResetBloodPrimePublishIntervalOverride.return:0 TEST.END -- Subprogram: testResetBloodPrimeVolumeOverride @@ -278,6 +296,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodPrime.testResetBloodPrimeVolumeOverride.return:1 TEST.END -- Test Case: testResetBloodPrimeVolumeOverride.002 @@ -295,6 +314,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodPrime.testResetBloodPrimeVolumeOverride.return:0 TEST.END -- Subprogram: testSetBloodPrimePublishIntervalOverride @@ -315,6 +335,7 @@ TEST.END_NOTES: TEST.VALUE:BloodPrime.testSetBloodPrimePublishIntervalOverride.ms:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodPrime.testSetBloodPrimePublishIntervalOverride.return:1 TEST.END -- Test Case: testSetBloodPrimePublishIntervalOverride.002 @@ -333,6 +354,7 @@ TEST.END_NOTES: TEST.VALUE:BloodPrime.testSetBloodPrimePublishIntervalOverride.ms:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodPrime.testSetBloodPrimePublishIntervalOverride.return:0 TEST.END -- Subprogram: testSetBloodPrimeVolumeOverride @@ -353,6 +375,7 @@ TEST.END_NOTES: TEST.VALUE:BloodPrime.testSetBloodPrimeVolumeOverride.vol:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:BloodPrime.testSetBloodPrimeVolumeOverride.return:1 TEST.END -- Test Case: testSetBloodPrimeVolumeOverride.002 @@ -371,6 +394,7 @@ TEST.END_NOTES: TEST.VALUE:BloodPrime.testSetBloodPrimeVolumeOverride.vol:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:<> +TEST.EXPECTED:BloodPrime.testSetBloodPrimeVolumeOverride.return:0 TEST.END -- Subprogram: transitionToBloodPrime @@ -380,4 +404,5 @@ TEST.SUBPROGRAM:transitionToBloodPrime TEST.NEW TEST.NAME:transitionToBloodPrime.001 +TEST.EXPECTED:BloodPrime.<>.bloodPrimeState:BLOOD_PRIME_RAMP_STATE TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE.tst =================================================================== diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE.tst (.../DGINTERFACE.tst) (revision c403f891689e120d6202a3f3fab85ac1054f8f45) +++ vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE.tst (.../DGINTERFACE.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -24,6 +24,7 @@ TEST.NAME:checkDGRestart.001 TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_FILL TEST.VALUE:DGInterface.<>.dgStarted:1 +TEST.EXPECTED:DGInterface.<>.dgStarted:1 TEST.END -- Test Case: checkDGRestart.002 @@ -33,6 +34,7 @@ TEST.NAME:checkDGRestart.002 TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_DRAI TEST.VALUE:DGInterface.<>.dgStarted:1 +TEST.EXPECTED:DGInterface.<>.dgStartCommandSent:0 TEST.END -- Test Case: checkDGRestart.003 @@ -52,6 +54,7 @@ TEST.END_NOTES: TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_GENE TEST.VALUE:DGInterface.<>.dgStartCommandSent:1 +TEST.EXPECTED:DGInterface.<>.dgStartCommandSent:0 TEST.END -- Test Case: checkDGRestart.004 @@ -71,6 +74,7 @@ TEST.END_NOTES: TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_FAUL TEST.VALUE:DGInterface.<>.dgStartCommandSent:1 +TEST.EXPECTED:DGInterface.<>.dgStartCommandSent:1 TEST.END -- Test Case: checkDGRestart.005 @@ -91,6 +95,7 @@ TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_FAUL TEST.VALUE:DGInterface.<>.dgStartCommandSent:<> TEST.VALUE:DGInterface.<>.dgStarted:1 +TEST.EXPECTED:DGInterface.<>.dgCurrentOpMode:DG_MODE_FAUL TEST.END -- Test Case: checkDGRestart.006 @@ -115,6 +120,7 @@ TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV TEST.VALUE:DGInterface.<>.dgStartCommandSent:<> TEST.VALUE:DGInterface.<>.dgStarted:1 +TEST.EXPECTED:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV TEST.END -- Subprogram: checkDialysateTemperature @@ -126,6 +132,7 @@ TEST.NAME:checkDialysateTemperature.001 TEST.VALUE:DGInterface.<>.dgDialysateTemp:43.0 TEST.VALUE:DGInterface.<>.dgTrimmerTempSet:42.0 +TEST.EXPECTED:DGInterface.<>.dgDialysateTemp:43.0 TEST.END -- Test Case: checkDialysateTemperature.002 @@ -145,6 +152,7 @@ Conflict: Unable to control expression-to-expression comparison in branch 1 TEST.END_NOTES: TEST.VALUE:DGInterface.<>.dgDialysateTemp:<> +TEST.EXPECTED:DGInterface.<>.dgDialysateTemp:-3.40282E+38 TEST.END -- Test Case: checkDialysateTemperature.003 @@ -164,41 +172,14 @@ Conflict: Unable to control expression-to-expression comparison in branch 1 TEST.END_NOTES: TEST.VALUE:DGInterface.<>.dgDialysateTemp:<> +TEST.EXPECTED:DGInterface.<>.dgDialysateTemp:3.40282E+38 TEST.END -- Test Case: checkDialysateTemperature.004 TEST.UNIT:DGInterface TEST.SUBPROGRAM:checkDialysateTemperature TEST.NEW TEST.NAME:checkDialysateTemperature.004 -TEST.IMPORT_FAILURES: -(E) Errors from previous script import(s) - >>> (E) @LINE: 408 TEST.STUB:DGInterface.fabs - >>> >>> Could not find function fabs - >>> >>> in unit DGInterface. - >>> >>> Value Line Error - Command Ignored - >>> (E) @LINE: 408 - >>> >>> Could not stub DGInterface.fabs - >>> (E) @LINE: 409 TEST.VALUE:DGInterface.fabs.return:<> - >>> >>> Subprogram 'fabs' is invalid - >>> >>> Command Ignored -TEST.END_IMPORT_FAILURES: -TEST.MCDC_BASIS_PATH:9 of 18 -TEST.NOTES: -This is an automatically generated test case. - Test Path 9 - (3) (fabs(dgDialysateTemp - dgTrimmerTempSet) < (2.0)) ==> TRUE - Row number 1 forms a pair with Row 2 for Condition #3, subcondition "a". - Condition a ==> TRUE - Test Case Generation Notes: -TEST.END_NOTES: -TEST.END - --- Test Case: checkDialysateTemperature.005 -TEST.UNIT:DGInterface -TEST.SUBPROGRAM:checkDialysateTemperature -TEST.NEW -TEST.NAME:checkDialysateTemperature.005 TEST.MCDC_BASIS_PATH:12 of 18 TEST.NOTES: This is an automatically generated test case. @@ -208,14 +189,17 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_DIALYSATE_TEMPERATURE_HIGH +TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_F32 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:1 +TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_F32 TEST.END --- Test Case: checkDialysateTemperature.006 +-- Test Case: checkDialysateTemperature.005 TEST.UNIT:DGInterface TEST.SUBPROGRAM:checkDialysateTemperature TEST.NEW -TEST.NAME:checkDialysateTemperature.006 +TEST.NAME:checkDialysateTemperature.005 TEST.MCDC_BASIS_PATH:16 of 18 TEST.NOTES: This is an automatically generated test case. @@ -227,8 +211,12 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:DGInterface.<>.dgDialysateTemp:1.0 +TEST.VALUE:DGInterface.<>.dgPrimaryTemp:1.0 TEST.VALUE:uut_prototype_stubs.isPersistentAlarmTriggered.return:<> TEST.VALUE:uut_prototype_stubs.isPersistentAlarmConditionCleared.return:1 +TEST.EXPECTED:DGInterface.<>.dgDialysateTemp:1.0 +TEST.EXPECTED:DGInterface.<>.dgPrimaryTemp:1.0 TEST.END -- Subprogram: cmdChangeDGValveSetting @@ -248,6 +236,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:DGInterface.cmdChangeDGValveSetting.valveSettingID:<> +TEST.EXPECTED:DGInterface.cmdChangeDGValveSetting.valveSettingID:DG_VALVE_SETTING_R1_TO_R2 TEST.END -- Test Case: cmdChangeDGValveSetting.002 @@ -265,6 +254,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:DGInterface.cmdChangeDGValveSetting.valveSettingID:<> +TEST.EXPECTED:DGInterface.cmdChangeDGValveSetting.valveSettingID:NUM_OF_DG_VALVE_SETTTINGS TEST.END -- Subprogram: cmdDGSampleWater @@ -283,9 +273,22 @@ >>> >>> Unknown parameter/object name dgWaterSampled >>> >>> Value Line Error - Command Ignored TEST.END_IMPORT_FAILURES: +TEST.VALUE:uut_prototype_stubs.sendDGSampleWaterCommand.cmd:SAMPLE_WATER_CMD_STOP TEST.VALUE:uut_prototype_stubs.sendDGSampleWaterCommand.return:1 +TEST.EXPECTED:uut_prototype_stubs.sendDGSampleWaterCommand.cmd:SAMPLE_WATER_CMD_STOP TEST.END +-- Subprogram: cmdRequestDGMixingRatios + +-- Test Case: cmdRequestDGMixingRatios.001 +TEST.UNIT:DGInterface +TEST.SUBPROGRAM:cmdRequestDGMixingRatios +TEST.NEW +TEST.NAME:cmdRequestDGMixingRatios.001 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_REQUEST_CONC_MIXING_RATIOS].commandID:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_REQUEST_CONC_MIXING_RATIOS].commandID:0 +TEST.END + -- Subprogram: cmdSetDGActiveReservoir -- Test Case: cmdSetDGActiveReservoir_InvalidRes @@ -310,6 +313,20 @@ TEST.EXPECTED:uut_prototype_stubs.sendDGSwitchReservoirCommand.activeReservoir:1 TEST.END +-- Subprogram: cmdSetDGDialysateHeatingParams + +-- Test Case: cmdSetDGDialysateHeatingParams.001 +TEST.UNIT:DGInterface +TEST.SUBPROGRAM:cmdSetDGDialysateHeatingParams +TEST.NEW +TEST.NAME:cmdSetDGDialysateHeatingParams.001 +TEST.EXPECTED:DGInterface.cmdSetDGDialysateHeatingParams.heatingParams.trimmerTargetTemperature:0.0 +TEST.EXPECTED:DGInterface.cmdSetDGDialysateHeatingParams.heatingParams.timeReservoirCycleMS:0 +TEST.EXPECTED:DGInterface.cmdSetDGDialysateHeatingParams.heatingParams.timeReservoirFillMS:0.0 +TEST.EXPECTED:DGInterface.cmdSetDGDialysateHeatingParams.heatingParams.timeReservoirWait2SwitchMS:0 +TEST.EXPECTED:DGInterface.cmdSetDGDialysateHeatingParams.heatingParams.dialysateFlowLPM:0.0 +TEST.END + -- Subprogram: cmdStartDG -- Test Case: cmdStartDG_NominalPath @@ -329,6 +346,8 @@ TEST.SUBPROGRAM:cmdStartDGChemicalDisinfect TEST.NEW TEST.NAME:cmdStartDGChemicalDisinfect.001 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_START_CHEM_DISINFECT].commandID:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_START_CHEM_DISINFECT].commandID:0 TEST.END -- Subprogram: cmdStartDGDrain @@ -371,6 +390,8 @@ TEST.SUBPROGRAM:cmdStartDGFlush TEST.NEW TEST.NAME:cmdStartDGFlush.001 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_START_FLUSH].commandID:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_START_FLUSH].commandID:0 TEST.END -- Subprogram: cmdStartDGHeatDisinfect @@ -380,6 +401,8 @@ TEST.SUBPROGRAM:cmdStartDGHeatDisinfect TEST.NEW TEST.NAME:cmdStartDGHeatDisinfect.001 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_START_HEAT_DISINFECT].commandID:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_START_HEAT_DISINFECT].commandID:0 TEST.END -- Subprogram: cmdStartDGTrimmerHeater @@ -415,6 +438,8 @@ TEST.SUBPROGRAM:cmdStopDGChemicalDisinfect TEST.NEW TEST.NAME:cmdStopDGChemicalDisinfect.001 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_STOP_CHEM_DISINFECT].commandID:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_STOP_CHEM_DISINFECT].commandID:0 TEST.END -- Subprogram: cmdStopDGFill @@ -424,6 +449,8 @@ TEST.SUBPROGRAM:cmdStopDGFill TEST.NEW TEST.NAME:cmdStopDGFill.001 +TEST.VALUE:DGInterface.<>.dgReservoirFillVolumeTargetSet:0 +TEST.EXPECTED:DGInterface.<>.dgReservoirFillVolumeTargetSet:0 TEST.END -- Subprogram: cmdStopDGFlush @@ -433,6 +460,8 @@ TEST.SUBPROGRAM:cmdStopDGFlush TEST.NEW TEST.NAME:cmdStopDGFlush.001 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_STOP_FLUSH].commandID:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_STOP_FLUSH].commandID:0 TEST.END -- Subprogram: cmdStopDGHeatDisinfect @@ -442,6 +471,8 @@ TEST.SUBPROGRAM:cmdStopDGHeatDisinfect TEST.NEW TEST.NAME:cmdStopDGHeatDisinfect.001 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_STOP_HEAT_DISINFECT].commandID:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_STOP_HEAT_DISINFECT].commandID:0 TEST.END -- Subprogram: cmdStopDGTrimmerHeater @@ -464,6 +495,8 @@ TEST.SUBPROGRAM:dialysisResumed TEST.NEW TEST.NAME:dialysisResumed.001 +TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:1 +TEST.EXPECTED:DGInterface.<>.timeStartMS:1 TEST.END -- Subprogram: execDGInterfaceMonitor @@ -473,6 +506,7 @@ TEST.SUBPROGRAM:execDGInterfaceMonitor TEST.NEW TEST.NAME:execDGInterfaceMonitor.001 +TEST.EXPECTED:DGInterface.<>.dgStarted:0 TEST.END -- Subprogram: getDGActiveReservoir @@ -505,6 +539,7 @@ TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_NONE].commandID:<> TEST.VALUE:DGInterface.getDGCommandResponse.commandID:<> TEST.VALUE:DGInterface.getDGCommandResponse.cmdRespPtr:<> +TEST.EXPECTED:DGInterface.getDGCommandResponse.return:1 TEST.END -- Test Case: getDGCommandResponse.002 @@ -524,6 +559,7 @@ TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_NONE].commandID:1 TEST.VALUE:DGInterface.getDGCommandResponse.commandID:<> TEST.VALUE:DGInterface.getDGCommandResponse.cmdRespPtr:<> +TEST.EXPECTED:DGInterface.getDGCommandResponse.return:0 TEST.END -- Subprogram: getDGDialysateFlowRateLMin @@ -533,6 +569,8 @@ TEST.SUBPROGRAM:getDGDialysateFlowRateLMin TEST.NEW TEST.NAME:getDGDialysateFlowRateLMin.001 +TEST.VALUE:DGInterface.<>.dgDialysateFlowRateMlMin:1.0 +TEST.EXPECTED:DGInterface.getDGDialysateFlowRateLMin.return:1.0 TEST.END -- Subprogram: getDGDisinfectsStates @@ -542,6 +580,9 @@ TEST.SUBPROGRAM:getDGDisinfectsStates TEST.NEW TEST.NAME:getDGDisinfectsStates.001 +TEST.EXPECTED:DGInterface.getDGDisinfectsStates.return.chemDisinfectUIState:0 +TEST.EXPECTED:DGInterface.getDGDisinfectsStates.return.heatDisinfectUIState:0 +TEST.EXPECTED:DGInterface.getDGDisinfectsStates.return.flushUIState:0 TEST.END -- Subprogram: getDGInactiveReservoir @@ -561,6 +602,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:DGInterface.<>.dgActiveReservoirSet:DG_RESERVOIR_2 +TEST.EXPECTED:DGInterface.getDGInactiveReservoir.return:DG_RESERVOIR_1 TEST.END -- Test Case: getDGInactiveReservoir.002 @@ -578,8 +620,21 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:DGInterface.<>.dgActiveReservoirSet:DG_RESERVOIR_1 +TEST.EXPECTED:DGInterface.getDGInactiveReservoir.return:DG_RESERVOIR_2 TEST.END +-- Subprogram: getDGMixingRatios + +-- Test Case: getDGMixingRatios.001 +TEST.UNIT:DGInterface +TEST.SUBPROGRAM:getDGMixingRatios +TEST.NEW +TEST.NAME:getDGMixingRatios.001 +TEST.EXPECTED:DGInterface.getDGMixingRatios.return.acidMixingRatio:0.0 +TEST.EXPECTED:DGInterface.getDGMixingRatios.return.bicarbMixingRatio:0.0 +TEST.EXPECTED:DGInterface.getDGMixingRatios.return.timeFillPrepMS:0 +TEST.END + -- Subprogram: getDGOpMode -- Test Case: getDGOpMode_NominalPath @@ -609,6 +664,8 @@ TEST.SUBPROGRAM:getDialysateFlowDataFreshFlag TEST.NEW TEST.NAME:getDialysateFlowDataFreshFlag.001 +TEST.EXPECTED:DGInterface.<>.dgDialysateFlowDataFreshFlag:0 +TEST.EXPECTED:DGInterface.getDialysateFlowDataFreshFlag.return:0 TEST.END -- Subprogram: getDialysateTemperature @@ -618,6 +675,8 @@ TEST.SUBPROGRAM:getDialysateTemperature TEST.NEW TEST.NAME:getDialysateTemperature.001 +TEST.VALUE:DGInterface.<>.dgDialysateTemp:1.0 +TEST.EXPECTED:DGInterface.getDialysateTemperature.return:1.0 TEST.END -- Subprogram: getLoadCellWeight @@ -636,7 +695,9 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:DGInterface.getLoadCellWeight.loadCellID:<> +TEST.VALUE:DGInterface.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_1_PRIMARY].data:1.0 +TEST.VALUE:DGInterface.getLoadCellWeight.loadCellID:LOAD_CELL_RESERVOIR_1_PRIMARY +TEST.EXPECTED:DGInterface.getLoadCellWeight.return:1.0 TEST.END -- Test Case: getLoadCellWeight.002 @@ -654,6 +715,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:DGInterface.getLoadCellWeight.loadCellID:<> +TEST.EXPECTED:DGInterface.getLoadCellWeight.return:0.0 TEST.END -- Test Case: getLoadCellWeight.003 @@ -671,8 +733,10 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:DGInterface.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_1_PRIMARY].ovData:1.0 TEST.VALUE:DGInterface.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_1_PRIMARY].override:3435346995 TEST.VALUE:DGInterface.getLoadCellWeight.loadCellID:LOAD_CELL_RESERVOIR_1_PRIMARY +TEST.EXPECTED:DGInterface.getLoadCellWeight.return:1.0 TEST.END -- Subprogram: getReservoirWeight @@ -691,7 +755,12 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.STUB:DGInterface.getLoadCellWeight +TEST.VALUE:DGInterface.getLoadCellWeight.loadCellID:LOAD_CELL_RESERVOIR_1_PRIMARY +TEST.VALUE:DGInterface.getLoadCellWeight.return:1.0 TEST.VALUE:DGInterface.getReservoirWeight.resID:DG_RESERVOIR_1 +TEST.EXPECTED:DGInterface.getReservoirWeight.resID:DG_RESERVOIR_1 +TEST.EXPECTED:DGInterface.getReservoirWeight.return:1.0 TEST.END -- Test Case: getReservoirWeight.002 @@ -727,7 +796,9 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:DGInterface.<>.lgFilteredReservoirWeightInGrams[DG_RESERVOIR_1]:1.0 TEST.VALUE:DGInterface.getReservoirWeightLargeFilter.resID:<> +TEST.EXPECTED:DGInterface.getReservoirWeightLargeFilter.return:1.0 TEST.END -- Test Case: getReservoirWeightLargeFilter.002 @@ -745,6 +816,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:DGInterface.getReservoirWeightLargeFilter.resID:<> +TEST.EXPECTED:DGInterface.getReservoirWeightLargeFilter.return:0.0 TEST.END -- Subprogram: handleDGCommandResponse @@ -754,38 +826,46 @@ TEST.SUBPROGRAM:handleDGCommandResponse TEST.NEW TEST.NAME:handleDGCommandResponse.001 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_NONE].commandID:1 TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr:<> TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].commandID:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_NONE].commandID:1 TEST.END -- Test Case: handleDGCommandResponse.002 TEST.UNIT:DGInterface TEST.SUBPROGRAM:handleDGCommandResponse TEST.NEW TEST.NAME:handleDGCommandResponse.002 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejectCode:2 TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr:<> TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].rejected:1 TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].rejectCode:2 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejectCode:2 TEST.END -- Test Case: handleDGCommandResponse.003 TEST.UNIT:DGInterface TEST.SUBPROGRAM:handleDGCommandResponse TEST.NEW TEST.NAME:handleDGCommandResponse.003 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejectCode:1 TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr:<> TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].rejected:1 TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].rejectCode:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejectCode:1 TEST.END -- Test Case: handleDGCommandResponse.004 TEST.UNIT:DGInterface TEST.SUBPROGRAM:handleDGCommandResponse TEST.NEW TEST.NAME:handleDGCommandResponse.004 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejectCode:1 TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr:<> TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].rejected:1 TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].rejectCode:5 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejectCode:1 TEST.END -- Test Case: handleDGCommandResponse.005 @@ -802,10 +882,24 @@ Condition a ==> FALSE Test Case Generation Notes: TEST.END_NOTES: +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejected:1 TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr:<> TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].commandID:<> +TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].rejected:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejected:1 TEST.END +-- Test Case: handleDGCommandResponse.006 +TEST.UNIT:DGInterface +TEST.SUBPROGRAM:handleDGCommandResponse +TEST.NEW +TEST.NAME:handleDGCommandResponse.006 +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejected:1 +TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr:<> +TEST.VALUE:DGInterface.handleDGCommandResponse.dgCmdRespPtr[0].rejected:1 +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_NONE].rejected:1 +TEST.END + -- Subprogram: hasDGCompletedReservoirSwitch -- Test Case: hasDGCompletedReservoirSwitch.001 @@ -824,6 +918,7 @@ TEST.END_NOTES: TEST.VALUE:DGInterface.<>.dgActiveReservoir:<> TEST.VALUE:DGInterface.<>.dgActiveReservoirSet:<> +TEST.EXPECTED:DGInterface.hasDGCompletedReservoirSwitch.return:1 TEST.END -- Test Case: hasDGCompletedReservoirSwitch.002 @@ -842,6 +937,7 @@ TEST.END_NOTES: TEST.VALUE:DGInterface.<>.dgActiveReservoir:DG_RESERVOIR_1 TEST.VALUE:DGInterface.<>.dgActiveReservoirSet:DG_RESERVOIR_2 +TEST.EXPECTED:DGInterface.hasDGCompletedReservoirSwitch.return:0 TEST.END -- Subprogram: initDGInterface @@ -852,10 +948,10 @@ TEST.NEW TEST.NAME:initDGInterface_NominalPath TEST.IMPORT_FAILURES: -(E) @LINE: 3249 TEST.EXPECTED:DGInterface.<>.dgPrimaryTempSet:0.0 - >>> Unknown parameter/object name dgPrimaryTempSet - >>> Value Line Error - Command Ignored (E) Errors from previous script import(s) + >>> (E) @LINE: 3249 TEST.EXPECTED:DGInterface.<>.dgPrimaryTempSet:0.0 + >>> >>> Unknown parameter/object name dgPrimaryTempSet + >>> >>> Value Line Error - Command Ignored >>> (E) @LINE: 808 TEST.EXPECTED:DGInterface.<>.dgWaterSampled:0 >>> >>> Unknown parameter/object name dgWaterSampled >>> >>> Value Line Error - Command Ignored @@ -875,8 +971,23 @@ TEST.SUBPROGRAM:setDGDisinfectsStates TEST.NEW TEST.NAME:setDGDisinfectsStates.001 +TEST.EXPECTED:DGInterface.setDGDisinfectsStates.states.chemDisinfectUIState:0 +TEST.EXPECTED:DGInterface.setDGDisinfectsStates.states.heatDisinfectUIState:0 +TEST.EXPECTED:DGInterface.setDGDisinfectsStates.states.flushUIState:0 TEST.END +-- Subprogram: setDGMixingRatios + +-- Test Case: setDGMixingRatios.001 +TEST.UNIT:DGInterface +TEST.SUBPROGRAM:setDGMixingRatios +TEST.NEW +TEST.NAME:setDGMixingRatios.001 +TEST.EXPECTED:DGInterface.setDGMixingRatios.ratios.acidMixingRatio:0.0 +TEST.EXPECTED:DGInterface.setDGMixingRatios.ratios.bicarbMixingRatio:0.0 +TEST.EXPECTED:DGInterface.setDGMixingRatios.ratios.timeFillPrepMS:0 +TEST.END + -- Subprogram: setDGOpMode -- Test Case: setDGOpMode_InvalidMode @@ -946,6 +1057,7 @@ TEST.SUBPROGRAM:setDialysateFlowData TEST.NEW TEST.NAME:setDialysateFlowData.001 +TEST.EXPECTED:DGInterface.<>.dgDialysateFlowDataFreshFlag:1 TEST.END -- Subprogram: setDialysateTemperatureReadings @@ -971,6 +1083,12 @@ TEST.NEW TEST.NAME:setNewLoadCellReadings.001 TEST.VALUE:DGInterface.<>.lgLoadCellReadingsIdx:40 +TEST.VALUE:DGInterface.setNewLoadCellReadings.res1Primary:1.0 +TEST.VALUE:DGInterface.setNewLoadCellReadings.res2Primary:1.0 +TEST.VALUE:DGInterface.setNewLoadCellReadings.res2Backup:1.0 +TEST.EXPECTED:DGInterface.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_1_PRIMARY].data:1.0 +TEST.EXPECTED:DGInterface.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_2_PRIMARY].data:1.0 +TEST.EXPECTED:DGInterface.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_2_BACKUP].data:1.0 TEST.END -- Test Case: setNewLoadCellReadings.002 @@ -987,11 +1105,13 @@ Condition a ==> TRUE Test Case Generation Notes: TEST.END_NOTES: -TEST.VALUE:DGInterface.setNewLoadCellReadings.res1Primary:<> +TEST.VALUE:DGInterface.setNewLoadCellReadings.res1Primary:1.0 TEST.VALUE:DGInterface.setNewLoadCellReadings.res1Backup:<> -TEST.VALUE:DGInterface.setNewLoadCellReadings.res2Primary:<> +TEST.VALUE:DGInterface.setNewLoadCellReadings.res2Primary:1.0 TEST.VALUE:DGInterface.setNewLoadCellReadings.res2Backup:<> TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_TREA +TEST.EXPECTED:DGInterface.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_1_PRIMARY].data:1.0 +TEST.EXPECTED:DGInterface.<>.loadCellWeightInGrams[LOAD_CELL_RESERVOIR_2_PRIMARY].data:1.0 TEST.END -- Subprogram: testResetDialOutLoadCellWeightOverride @@ -1011,6 +1131,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:DGInterface.testResetDialOutLoadCellWeightOverride.sensor:<> +TEST.EXPECTED:DGInterface.testResetDialOutLoadCellWeightOverride.return:0 TEST.END -- Test Case: testResetDialOutLoadCellWeightOverride.002 @@ -1028,6 +1149,7 @@ Test Case Generation Notes: TEST.END_NOTES: TEST.VALUE:DGInterface.testResetDialOutLoadCellWeightOverride.sensor:<> +TEST.EXPECTED:DGInterface.testResetDialOutLoadCellWeightOverride.return:0 TEST.END -- Test Case: testResetDialOutLoadCellWeightOverride.003 @@ -1047,6 +1169,7 @@ TEST.END_NOTES: TEST.VALUE:DGInterface.testResetDialOutLoadCellWeightOverride.sensor:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:DGInterface.testResetDialOutLoadCellWeightOverride.return:1 TEST.END -- Subprogram: testSetDialOutLoadCellWeightOverride @@ -1067,6 +1190,7 @@ TEST.END_NOTES: TEST.VALUE:DGInterface.testSetDialOutLoadCellWeightOverride.sensor:<> TEST.VALUE:DGInterface.testSetDialOutLoadCellWeightOverride.value:<> +TEST.EXPECTED:DGInterface.testSetDialOutLoadCellWeightOverride.return:0 TEST.END -- Test Case: testSetDialOutLoadCellWeightOverride.002 @@ -1085,6 +1209,7 @@ TEST.END_NOTES: TEST.VALUE:DGInterface.testSetDialOutLoadCellWeightOverride.sensor:<> TEST.VALUE:DGInterface.testSetDialOutLoadCellWeightOverride.value:<> +TEST.EXPECTED:DGInterface.testSetDialOutLoadCellWeightOverride.return:0 TEST.END -- Test Case: testSetDialOutLoadCellWeightOverride.003 @@ -1105,4 +1230,5 @@ TEST.VALUE:DGInterface.testSetDialOutLoadCellWeightOverride.sensor:<> TEST.VALUE:DGInterface.testSetDialOutLoadCellWeightOverride.value:<> TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1 +TEST.EXPECTED:DGInterface.testSetDialOutLoadCellWeightOverride.return:1 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE_cba.cvr =================================================================== diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE_cba.cvr (.../DGINTERFACE_cba.cvr) (revision c403f891689e120d6202a3f3fab85ac1054f8f45) +++ vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE_cba.cvr (.../DGINTERFACE_cba.cvr) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -1,46 +1 @@ --- Imported Coverage Results Script -IMPORT.BEGIN -IMPORT.SOURCE.BEGIN -IMPORT.SOURCE.UNIT:8 -IMPORT.SOURCE.ORIG_FILENAME:S0000008.c -IMPORT.SOURCE.COVERAGE_STATUS:FALSE -IMPORT.SOURCE.COVERAGE_TYPE:None -IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE -IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:TRUE -IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE -IMPORT.SOURCE.HAS_CATCH_STATEMENTS:TRUE -IMPORT.SOURCE.EDG_COVERAGE:TRUE -IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:TRUE -IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:TRUE -IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE -IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE -IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_UNKNOWN -IMPORT.SOURCE.HAS_CONSTANT_BRANCH:TRUE -IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE -IMPORT.SOURCE.END -IMPORT.SOURCE.BEGIN -IMPORT.SOURCE.UNIT:9 -IMPORT.SOURCE.ORIG_FILENAME:DGInterface.c -IMPORT.SOURCE.COVERAGE_STATUS:TRUE -IMPORT.SOURCE.COVERAGE_TYPE:Statement+MCDC -IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE -IMPORT.SOURCE.HAS_EMPTY_STATEMENTS:TRUE -IMPORT.SOURCE.COVER_CATCH_AS_BRANCH:TRUE -IMPORT.SOURCE.HAS_CATCH_STATEMENTS:FALSE -IMPORT.SOURCE.EDG_COVERAGE:TRUE -IMPORT.SOURCE.COVER_FUNCTION_PARAMETERS:TRUE -IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE -IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:TRUE -IMPORT.SOURCE.HAS_NESTED_CONDITIONAL_OPERATOR:FALSE -IMPORT.SOURCE.COVER_STATEMENTS_BY_BLOCK:FALSE -IMPORT.SOURCE.COVERAGE_FOR_DECLARATIONS:INSTRUMENT_VARIABLE_DECLARATIONS_INITIALIZATIONS -IMPORT.SOURCE.HAS_CONSTANT_BRANCH:FALSE -IMPORT.SOURCE.BASIS_PATHS_FOR_CONSTANT_BRANCHES:TRUE -IMPORT.SOURCE.COVERAGE_FOR_LAMBDAS:FALSE -IMPORT.SOURCE.END -IMPORT.END Index: vectorcast/Hercules_RM46_HD_Project/environment/MODEINITPOST/MODEINITPOST.tst =================================================================== diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/Hercules_RM46_HD_Project/environment/MODEINITPOST/MODEINITPOST.tst (.../MODEINITPOST.tst) (revision c403f891689e120d6202a3f3fab85ac1054f8f45) +++ vectorcast/Hercules_RM46_HD_Project/environment/MODEINITPOST/MODEINITPOST.tst (.../MODEINITPOST.tst) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -59,6 +59,8 @@ TEST.NEW TEST.NAME:execInitAndPOSTMode.001 TEST.VALUE:ModeInitPOST.<>.postState:POST_STATE_FW_INTEGRITY +TEST.VALUE:uut_prototype_stubs.execIntegrityTest.return:SELF_TEST_STATUS_PASSED +TEST.EXPECTED:ModeInitPOST.execInitAndPOSTMode.return:2 TEST.END -- Test Case: execInitAndPOSTMode.002 Index: vectorcast/setup_env.sh =================================================================== diff -u -rc403f891689e120d6202a3f3fab85ac1054f8f45 -rf0c69714f9b6a7d637ef488588e0965eb5588b7b --- vectorcast/setup_env.sh (.../setup_env.sh) (revision c403f891689e120d6202a3f3fab85ac1054f8f45) +++ vectorcast/setup_env.sh (.../setup_env.sh) (revision f0c69714f9b6a7d637ef488588e0965eb5588b7b) @@ -5,15 +5,25 @@ # *** Insert any custom environment variables needed *** # ******************************************************* +doesDialityDirExist=false +# Check if this script is called from a Diality machine by checking the location that VectorCAST has been installed +if [[ -d /opt/VectorCASTSP3 ]]; then + doesDialityDirExist=true +fi + # VECTORCAST_DIR - Environment variable pointing to the base directory for VectorCAST -if [ -z "$VECTORCAST_DIR" ]; then - export VECTORCAST_DIR=/usr/local/vcast/vcast1 +if [ "$doesDialityDirExist" == false ]; then + export VECTORCAST_DIR=/usr/local/vcast/ +else + export VECTORCAST_DIR=~/vcast fi # VECTOR_LICENSE_FILE - Environment variable pointing to the license file -if [ -z "$VECTOR_LICENSE_FILE" ]; then +if [ "$doesDialityDirExist" == false ]; then export VECTOR_LICENSE_FILE=/usr/local/flexlm/licenses/license.dat +else + export VECTOR_LICENSE_FILE=27000@dvm-util01 fi # VCAST_COMPILER_DIR - Environment variable pointing to the base directory of compiler installation