Index: vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst =================================================================== diff -u -r68faec206b0dbe4074f814691615411e1fc72609 -r8c520fc7314794ea2e04303dcc1aa9311458dcca --- vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst (.../ALARMMGMT.tst) (revision 68faec206b0dbe4074f814691615411e1fc72609) +++ vectorcast/Hercules_RM46_HD_Project/environment/ALARMMGMT/ALARMMGMT.tst (.../ALARMMGMT.tst) (revision 8c520fc7314794ea2e04303dcc1aa9311458dcca) @@ -318,6 +318,18 @@ TEST.EXPECTED:AlarmMgmt.<>.alarmsBlockedTimer:200 TEST.END +-- Test Case: activateAlarm2Data_DG_restarted.001 +TEST.UNIT:AlarmMgmt +TEST.SUBPROGRAM:activateAlarm2Data +TEST.NEW +TEST.NAME:activateAlarm2Data_DG_restarted.001 +TEST.VALUE:AlarmMgmt.<>.alarmsBlockedTimer:0 +TEST.VALUE:AlarmMgmt.<>.alarmNoRetrigger:0 +TEST.VALUE:AlarmMgmt.activateAlarm2Data.alarm:ALARM_ID_HD_DG_RESTARTED_FAULT +TEST.VALUE:uut_prototype_stubs.getCPLDACPowerLossDetected.return:1 +TEST.EXPECTED:AlarmMgmt.<>.alarmsBlockedTimer:200 +TEST.END + -- Test Case: activateAlarm2Data_alarm_in_range_all_false TEST.UNIT:AlarmMgmt TEST.SUBPROGRAM:activateAlarm2Data @@ -1705,11 +1717,15 @@ TEST.NEW TEST.NAME:handleActiveAlarmListRequest.001 TEST.IMPORT_FAILURES: -(I) @LINE: 1754 +(I) @LINE: 1758 >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1757 +(I) @LINE: 1761 >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 1754 + >>> >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1757 + >>> >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 55 >>> >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 58 @@ -1767,29 +1783,51 @@ TEST.NEW TEST.NAME:handleActiveAlarmListRequest.002 TEST.IMPORT_FAILURES: -(I) @LINE: 1952 +(I) @LINE: 1978 >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 1953 +(I) @LINE: 1979 >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 1952 + >>> >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 1953 + >>> >>> 'ALARM_ID_NO_ALARM' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 230 >>> >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 231 @@ -1990,11 +2028,15 @@ TEST.NEW TEST.NAME:handleActiveAlarmListRequest.003 TEST.IMPORT_FAILURES: -(I) @LINE: 2023 +(I) @LINE: 2053 >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 2025 +(I) @LINE: 2055 >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 2023 + >>> >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 2025 + >>> >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 296 >>> >>> 'REQUEST_REJECT_REASON_NONE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 298 @@ -2081,10 +2123,13 @@ TEST.NEW TEST.NAME:handleResendActiveAlarmsRequest.002 TEST.IMPORT_FAILURES: -(S) @LINE: 2125 +(S) @LINE: 2158 >>> Range Value Command VARY FROM:ALARM_ID_NO_ALARM TO:NUM_OF_ALARM_IDS BY: 1 >>> Results in 325 Iterations. (E) Errors from previous script import(s) + >>> (S) @LINE: 2125 + >>> >>> Range Value Command VARY FROM:ALARM_ID_NO_ALARM TO:NUM_OF_ALARM_IDS BY: 1 + >>> >>> Results in 325 Iterations. >>> (S) @LINE: 374 >>> >>> Range Value Command VARY FROM:ALARM_ID_NO_ALARM TO:NUM_OF_ALARM_IDS BY: 1 >>> >>> Results in 325 Iterations. @@ -2167,10 +2212,13 @@ TEST.NEW TEST.NAME:handleResendActiveAlarmsRequest.003 TEST.IMPORT_FAILURES: -(S) @LINE: 2212 +(S) @LINE: 2248 >>> Range Value Command VARY FROM:ALARM_ID_NO_ALARM TO:NUM_OF_ALARM_IDS BY: 1 >>> Results in 325 Iterations. (E) Errors from previous script import(s) + >>> (S) @LINE: 2212 + >>> >>> Range Value Command VARY FROM:ALARM_ID_NO_ALARM TO:NUM_OF_ALARM_IDS BY: 1 + >>> >>> Results in 325 Iterations. >>> (S) @LINE: 457 >>> >>> Range Value Command VARY FROM:ALARM_ID_NO_ALARM TO:NUM_OF_ALARM_IDS BY: 1 >>> >>> Results in 325 Iterations. @@ -4117,10 +4165,13 @@ TEST.NEW TEST.NAME:testSetAlarmStartOverride_NominalPath TEST.IMPORT_FAILURES: -(E) @LINE: 4217 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 +(E) @LINE: 4256 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 >>> Invalid array index value ALARM_ID_STUCK_BUTTON_TEST_FAILED >>> Command Ignored. (E) Errors from previous script import(s) + >>> (E) @LINE: 4217 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 + >>> >>> Invalid array index value ALARM_ID_STUCK_BUTTON_TEST_FAILED + >>> >>> Command Ignored. >>> (E) @LINE: 603 TEST.ATTRIBUTES:AlarmMgmt.<>.alarmStartedAt[ALARM_ID_STUCK_BUTTON_TEST_FAILED].override::EXPECTED_BASE=16 >>> >>> Invalid array index value ALARM_ID_STUCK_BUTTON_TEST_FAILED >>> >>> Command Ignored. Index: vectorcast/Hercules_RM46_HD_Project/environment/RINSEBACK/RINSEBACK.tst =================================================================== diff -u -r44ba92a6fd49976c851cea04a82ebd6c37523541 -r8c520fc7314794ea2e04303dcc1aa9311458dcca --- vectorcast/Hercules_RM46_HD_Project/environment/RINSEBACK/RINSEBACK.tst (.../RINSEBACK.tst) (revision 44ba92a6fd49976c851cea04a82ebd6c37523541) +++ vectorcast/Hercules_RM46_HD_Project/environment/RINSEBACK/RINSEBACK.tst (.../RINSEBACK.tst) (revision 8c520fc7314794ea2e04303dcc1aa9311458dcca) @@ -1614,6 +1614,32 @@ TEST.SUBPROGRAM:handleRinsebackStopInitState TEST.NEW TEST.NAME:handleRinsebackStopInitState.001 +TEST.IMPORT_FAILURES: +(E) @LINE: 1631 TEST.VALUE:uut_prototype_stubs.sendTreatmentLogEventData.event:MID_TREATMENT_RINSE_BACK_EVENT + >>> Could not find function sendTreatmentLogEventData + >>> in unit uut_prototype_stubs. + >>> Value Line Error - Command Ignored +(E) @LINE: 1632 TEST.VALUE:uut_prototype_stubs.sendTreatmentLogEventData.oldValue:0.0 + >>> Could not find function sendTreatmentLogEventData + >>> in unit uut_prototype_stubs. + >>> Value Line Error - Command Ignored +(E) @LINE: 1633 TEST.VALUE:uut_prototype_stubs.sendTreatmentLogEventData.newValue:0.0 + >>> Could not find function sendTreatmentLogEventData + >>> in unit uut_prototype_stubs. + >>> Value Line Error - Command Ignored +(E) @LINE: 1637 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentLogEventData.event:MID_TREATMENT_RINSE_BACK_EVENT + >>> Could not find function sendTreatmentLogEventData + >>> in unit uut_prototype_stubs. + >>> Value Line Error - Command Ignored +(E) @LINE: 1638 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentLogEventData.oldValue:0.0 + >>> Could not find function sendTreatmentLogEventData + >>> in unit uut_prototype_stubs. + >>> Value Line Error - Command Ignored +(E) @LINE: 1639 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentLogEventData.newValue:0.0 + >>> Could not find function sendTreatmentLogEventData + >>> in unit uut_prototype_stubs. + >>> Value Line Error - Command Ignored +TEST.END_IMPORT_FAILURES: TEST.MCDC_BASIS_PATH:2 of 8 TEST.NOTES: This is an automatically generated test case. @@ -1628,15 +1654,9 @@ TEST.VALUE:Rinseback.setupForRinsebackDelivery.rate:0 TEST.VALUE:Rinseback.handleRinsebackStopInitState.return:RINSEBACK_RUN_STATE TEST.VALUE:uut_prototype_stubs.setBloodIsPrimed.flag:0 -TEST.VALUE:uut_prototype_stubs.sendTreatmentLogEventData.event:MID_TREATMENT_RINSE_BACK_EVENT -TEST.VALUE:uut_prototype_stubs.sendTreatmentLogEventData.oldValue:0.0 -TEST.VALUE:uut_prototype_stubs.sendTreatmentLogEventData.newValue:0.0 TEST.EXPECTED:Rinseback.setupForRinsebackDelivery.rate:0 TEST.EXPECTED:Rinseback.handleRinsebackStopInitState.return:RINSEBACK_RUN_STATE TEST.EXPECTED:uut_prototype_stubs.setBloodIsPrimed.flag:0 -TEST.EXPECTED:uut_prototype_stubs.sendTreatmentLogEventData.event:MID_TREATMENT_RINSE_BACK_EVENT -TEST.EXPECTED:uut_prototype_stubs.sendTreatmentLogEventData.oldValue:0.0 -TEST.EXPECTED:uut_prototype_stubs.sendTreatmentLogEventData.newValue:0.0 TEST.END -- Test Case: handleRinsebackStopInitState.002 @@ -3070,3 +3090,28 @@ TEST.EXPECTED:uut_prototype_stubs.setValvePosition.valve:VDI,VDO,VBA,VBV TEST.EXPECTED:uut_prototype_stubs.setValvePosition.position:(4)VALVE_POSITION_C_CLOSE TEST.END + +-- Test Case: transitionToRinseback.002 +TEST.UNIT:Rinseback +TEST.SUBPROGRAM:transitionToRinseback +TEST.NEW +TEST.NAME:transitionToRinseback.002 +TEST.STUB:Rinseback.initRinseback +TEST.VALUE:uut_prototype_stubs.setAlarmUserActionEnabled.action:ALARM_USER_ACTION_RESUME +TEST.VALUE:uut_prototype_stubs.setAlarmUserActionEnabled.enabled:0 +TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:DG_MODE_STAN +TEST.VALUE:uut_prototype_stubs.setDialInPumpTargetFlowRate.flowRate:100 +TEST.VALUE:uut_prototype_stubs.setDialInPumpTargetFlowRate.dir:MOTOR_DIR_FORWARD +TEST.VALUE:uut_prototype_stubs.setDialInPumpTargetFlowRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.VALUE:uut_prototype_stubs.setValvePosition.valve:VDI +TEST.VALUE:uut_prototype_stubs.setValvePosition.position:VALVE_POSITION_C_CLOSE +TEST.EXPECTED:uut_prototype_stubs.setAlarmUserActionEnabled.action:ALARM_USER_ACTION_RESUME,ALARM_USER_ACTION_RINSEBACK,ALARM_USER_ACTION_END_TREATMENT +TEST.EXPECTED:uut_prototype_stubs.setAlarmUserActionEnabled.enabled:(3)0 +TEST.EXPECTED:uut_prototype_stubs.setDialInPumpTargetFlowRate.flowRate:250 +TEST.EXPECTED:uut_prototype_stubs.setDialInPumpTargetFlowRate.dir:MOTOR_DIR_FORWARD +TEST.EXPECTED:uut_prototype_stubs.setDialInPumpTargetFlowRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP +TEST.EXPECTED:uut_prototype_stubs.doorClosedRequired.door:1 +TEST.EXPECTED:uut_prototype_stubs.doorClosedRequired.pumpTrack:1 +TEST.EXPECTED:uut_prototype_stubs.setValvePosition.valve:VDI,VDO,VBA,VBV +TEST.EXPECTED:uut_prototype_stubs.setValvePosition.position:(4)VALVE_POSITION_C_CLOSE +TEST.END