Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.cfg
===================================================================
diff -u -re28798081348b470495ec605fcadda4276f37c46 -rdba8e16a2645adbc90a739ac5d3e2e3377fa94ec
--- vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.cfg (.../DIALOUTFLOW.cfg) (revision e28798081348b470495ec605fcadda4276f37c46)
+++ vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.cfg (.../DIALOUTFLOW.cfg) (revision dba8e16a2645adbc90a739ac5d3e2e3377fa94ec)
@@ -1,2 +1 @@
-C_LINK_OPTIONS: -lm
C_EDG_FLAGS: -w --gcc --gnu_version 60300 --mingw --define_macro='_Float128=float'
Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.mfg
===================================================================
diff -u -rdbf9c245d46c7536c72d277da24f7b44d7a84118 -rdba8e16a2645adbc90a739ac5d3e2e3377fa94ec
--- vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.mfg (.../DIALOUTFLOW.mfg) (revision dbf9c245d46c7536c72d277da24f7b44d7a84118)
+++ vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.mfg (.../DIALOUTFLOW.mfg) (revision dba8e16a2645adbc90a739ac5d3e2e3377fa94ec)
@@ -1,11 +1,9 @@
- WHITEBOX
- YES
COVERAGE_TYPE
STATEMENT+MCDC
- $(VCAST_SRC_DIR)/../../fwcommon/
- $(VCAST_SRC_DIR)/../../common/
+ $(VCAST_SRC_DIR)/FWCommon/
+ $(VCAST_SRC_DIR)/Common/
Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst
===================================================================
diff -u -r202a7e6c312e5dc5b85c0d2a30689c6d35a4358b -rdba8e16a2645adbc90a739ac5d3e2e3377fa94ec
--- vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst (.../DIALOUTFLOW.tst) (revision 202a7e6c312e5dc5b85c0d2a30689c6d35a4358b)
+++ vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst (.../DIALOUTFLOW.tst) (revision dba8e16a2645adbc90a739ac5d3e2e3377fa94ec)
@@ -930,6 +930,21 @@
TEST.EXPECTED:DialOutFlow.<>.errorDialOutMotorOffPersistTimerCtr:0
TEST.END
+-- Test Case: checkDialOutPumpSpeeds_meas_rotor_pct_out_of_range
+TEST.UNIT:DialOutFlow
+TEST.SUBPROGRAM:checkDialOutPumpSpeeds
+TEST.NEW
+TEST.NAME:checkDialOutPumpSpeeds_meas_rotor_pct_out_of_range
+TEST.VALUE:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE
+TEST.VALUE:DialOutFlow.<>.isDialOutPumpOn:1
+TEST.VALUE:DialOutFlow.<>.dialOutPumpRotorSpeedRPM.data:63.0
+TEST.VALUE:DialOutFlow.<>.dialOutPumpRotorSpeedRPM.override:0
+TEST.VALUE:DialOutFlow.<>.dialOutPumpSpeedRPM.data:1800.0
+TEST.VALUE:DialOutFlow.<>.dialOutPumpSpeedRPM.override:0
+TEST.VALUE:DialOutFlow.<>.errorDialOutRotorSpeedPersistTimerCtr:1
+TEST.EXPECTED:DialOutFlow.<>.errorDialOutRotorSpeedPersistTimerCtr:0
+TEST.END
+
-- Subprogram: execDialOutFlowController
-- Test Case: execDialOutFlowController
@@ -1917,25 +1932,23 @@
TEST.EXPECTED:DialOutFlow.<>.dopHomeStartTime:0
TEST.END
--- Test Case: homeDialOutPump.003
+-- Test Case: homeDialOutPump_dial_out_pump_off
TEST.UNIT:DialOutFlow
TEST.SUBPROGRAM:homeDialOutPump
TEST.NEW
-TEST.NAME:homeDialOutPump.003
+TEST.NAME:homeDialOutPump_dial_out_pump_off
TEST.IMPORT_FAILURES:
(E) Errors from previous script import(s)
>>> (E) @LINE: 515 TEST.NAME:
>>> >>> Invalid Test Case Name - Zero-length test name
>>> >>> Using Automatic Name: homeDialOutPump.003
TEST.END_IMPORT_FAILURES:
TEST.VALUE:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_OFF_STATE
-TEST.VALUE:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP
TEST.VALUE:DialOutFlow.<>.dopStopAtHomePosition:0
TEST.VALUE:DialOutFlow.<>.dopHomeStartTime:0
TEST.VALUE:uut_prototype_stubs.getMSTimerCount.return:100000
TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_OFF_STATE
TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirection:MOTOR_DIR_FORWARD
-TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:PUMP_CONTROL_MODE_CLOSED_LOOP
TEST.EXPECTED:DialOutFlow.<>.dopStopAtHomePosition:1
TEST.EXPECTED:DialOutFlow.<>.dopHomeStartTime:100000
TEST.END
@@ -2191,19 +2204,33 @@
-- Subprogram: setDialOutPumpTargetRPM
--- Test Case: setDialOutPumpTargetRPM.001
+-- Test Case: setDialOutPumpTargetRPM_forward
TEST.UNIT:DialOutFlow
TEST.SUBPROGRAM:setDialOutPumpTargetRPM
TEST.NEW
-TEST.NAME:setDialOutPumpTargetRPM.001
+TEST.NAME:setDialOutPumpTargetRPM_forward
+TEST.NOTES:
+ No branches in subprogram
+TEST.END_NOTES:
+TEST.VALUE:DialOutFlow.setDialOutPumpTargetRPM.rpm:100
+TEST.VALUE:DialOutFlow.setDialOutPumpTargetRPM.dir:MOTOR_DIR_FORWARD
+TEST.VALUE:DialOutFlow.setDialOutPumpTargetRPM.return:0
+TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRPM.return:1
+TEST.END
+
+-- Test Case: setDialOutPumpTargetRPM_reverse
+TEST.UNIT:DialOutFlow
+TEST.SUBPROGRAM:setDialOutPumpTargetRPM
+TEST.NEW
+TEST.NAME:setDialOutPumpTargetRPM_reverse
TEST.BASIS_PATH:1 of 1
TEST.NOTES:
No branches in subprogram
TEST.END_NOTES:
-TEST.VALUE:DialOutFlow.setDialOutPumpTargetRPM.rpm:<>
-TEST.VALUE:DialOutFlow.setDialOutPumpTargetRPM.dir:<>
-TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRPM.rpm:0
-TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRPM.dir:MOTOR_DIR_FORWARD
+TEST.VALUE:DialOutFlow.setDialOutPumpTargetRPM.rpm:100
+TEST.VALUE:DialOutFlow.setDialOutPumpTargetRPM.dir:MOTOR_DIR_REVERSE
+TEST.VALUE:DialOutFlow.setDialOutPumpTargetRPM.return:0
+TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRPM.return:1
TEST.END
-- Subprogram: setDialOutPumpTargetRate
@@ -2668,7 +2695,7 @@
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.return:1
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_SOFTWARE_FAULT
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_U32
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:0
TEST.EXPECTED:DialOutFlow.<>.isDialOutPumpOn:0
@@ -2706,9 +2733,9 @@
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.return:1
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_SOFTWARE_FAULT
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:00
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:0
TEST.EXPECTED:DialOutFlow.<>.isDialOutPumpOn:0
TEST.EXPECTED:DialOutFlow.<>.dialOutPumpDirectionSet:MOTOR_DIR_FORWARD
TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlMode:NUM_OF_PUMP_CONTROL_MODES
@@ -2752,7 +2779,7 @@
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.return:0
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:ALARM_ID_HD_SOFTWARE_FAULT
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=ALARM_ID_HD_SOFTWARE_FAULT
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_U32
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:0
TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_OFF_STATE
@@ -2794,7 +2821,7 @@
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.return:0
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:ALARM_ID_HD_SOFTWARE_FAULT
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=ALARM_ID_HD_SOFTWARE_FAULT
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_U32
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:0
TEST.EXPECTED:DialOutFlow.<>.dialOutPumpState:DIAL_OUT_PUMP_OFF_STATE
@@ -2835,7 +2862,7 @@
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.mode:PUMP_CONTROL_MODE_CLOSED_LOOP
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.return:0
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:ALARM_ID_HD_SOFTWARE_FAULT
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=ALARM_ID_HD_SOFTWARE_FAULT
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_U32
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:0
TEST.EXPECTED:DialOutFlow.setDialOutPumpTargetRate.return:1
@@ -2866,7 +2893,7 @@
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.return:0
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_SOFTWARE_FAULT
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_U32
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:0
TEST.EXPECTED:DialOutFlow.<>.isDialOutPumpOn:0
@@ -2899,7 +2926,7 @@
TEST.VALUE:DialOutFlow.setDialOutPumpTargetRate.return:0
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_SOFTWARE_FAULT
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=SW_FAULT_ID_DIAL_OUT_FLOW_SET_TOO_HIGH
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_U32
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:0
TEST.EXPECTED:DialOutFlow.<>.isDialOutPumpOn:0
Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALYSIS/DIALYSIS.tst
===================================================================
diff -u -r202a7e6c312e5dc5b85c0d2a30689c6d35a4358b -rdba8e16a2645adbc90a739ac5d3e2e3377fa94ec
--- vectorcast/Hercules_RM46_HD_Project/environment/DIALYSIS/DIALYSIS.tst (.../DIALYSIS.tst) (revision 202a7e6c312e5dc5b85c0d2a30689c6d35a4358b)
+++ vectorcast/Hercules_RM46_HD_Project/environment/DIALYSIS/DIALYSIS.tst (.../DIALYSIS.tst) (revision dba8e16a2645adbc90a739ac5d3e2e3377fa94ec)
@@ -17,199 +17,73 @@
-- Subprogram: checkLoadCellsStablePrimaryBackupDriftOutOfRange
--- Test Case: checkLoadCellsStablePrimaryBackupDriftOutOfRange.001
+-- Test Case: checkLoadCellsStable_r1_final
TEST.UNIT:Dialysis
TEST.SUBPROGRAM:checkLoadCellsStablePrimaryBackupDriftOutOfRange
TEST.NEW
-TEST.NAME:checkLoadCellsStablePrimaryBackupDriftOutOfRange.001
-TEST.IMPORT_FAILURES:
-(E) Errors from previous script import(s)
- >>> (E) @LINE: 37 TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_1_PRIMARY]:<>
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
- >>> (E) @LINE: 39 TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_1_PRIMARY]:-3.40282E+38
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
-TEST.END_IMPORT_FAILURES:
-TEST.BASIS_PATH:1 of 4 (partial)
-TEST.NOTES:
-This is an automatically generated test case.
- Test Path 1
- (1) if ((DG_RESERVOIR_1) == reservoirID) ==> FALSE
- (2) if (lcLastSteadyWeight[lcPrimaryIndex] > -(10000.0F) + (1)) ==> FALSE
- (3) if (driftDiff > (10.0F)) ==> FALSE
- Test Case Generation Notes:
- Cannot set lcPrimaryIndex due to assignment
- Cannot set local variable driftDiff in branch 3
- Cannot set lcBackupIndex due to assignment
-TEST.END_NOTES:
-TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
+TEST.NAME:checkLoadCellsStable_r1_final
+TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_FIRST]:-11000.0
+TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][LOAD_CELL_FIRST]:0.0
+TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_1
+TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_FINAL
+TEST.VALUE:uut_prototype_stubs.getReservoirWeightLargeFilter.return:1500.0
+TEST.VALUE:uut_prototype_stubs.getReservoirBackupWeightLargeFilter.return:1500.0
+TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][LOAD_CELL_FIRST]:1500.0
+TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][LOAD_CELL_RESERVOIR_1_BACKUP]:1500.0
+TEST.EXPECTED:uut_prototype_stubs.sendEvent.event:HD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES
TEST.END
--- Test Case: checkLoadCellsStablePrimaryBackupDriftOutOfRange.002
+-- Test Case: checkLoadCellsStable_r1_start
TEST.UNIT:Dialysis
TEST.SUBPROGRAM:checkLoadCellsStablePrimaryBackupDriftOutOfRange
TEST.NEW
-TEST.NAME:checkLoadCellsStablePrimaryBackupDriftOutOfRange.002
-TEST.IMPORT_FAILURES:
-(E) Errors from previous script import(s)
- >>> (E) @LINE: 60 TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_1_PRIMARY]:<>
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
- >>> (E) @LINE: 62 TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_1_PRIMARY]:0.0
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
-TEST.END_IMPORT_FAILURES:
-TEST.BASIS_PATH:4 of 4 (partial)
-TEST.NOTES:
-This is an automatically generated test case.
- Test Path 4
- (1) if ((DG_RESERVOIR_1) == reservoirID) ==> TRUE
- (2) if (lcLastSteadyWeight[lcPrimaryIndex] > -(10000.0F) + (1)) ==> FALSE
- (3) if (driftDiff > (10.0F)) ==> FALSE
- Test Case Generation Notes:
- Cannot set lcPrimaryIndex due to assignment
- Cannot set local variable driftDiff in branch 3
- Cannot set lcBackupIndex due to assignment
-TEST.END_NOTES:
+TEST.NAME:checkLoadCellsStable_r1_start
+TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_FIRST]:-11000.0
TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_1
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_1
+TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_START
+TEST.VALUE:uut_prototype_stubs.getReservoirWeightLargeFilter.return:1500.0
+TEST.VALUE:uut_prototype_stubs.getReservoirBackupWeightLargeFilter.return:1500.0
+TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_FIRST]:1500.0
+TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_RESERVOIR_1_BACKUP]:1500.0
TEST.END
--- Test Case: checkLoadCellsStablePrimaryBackupDriftOutOfRange.003
+-- Test Case: checkLoadCellsStable_r2_final
TEST.UNIT:Dialysis
TEST.SUBPROGRAM:checkLoadCellsStablePrimaryBackupDriftOutOfRange
TEST.NEW
-TEST.NAME:checkLoadCellsStablePrimaryBackupDriftOutOfRange.003
-TEST.IMPORT_FAILURES:
-(E) Errors from previous script import(s)
- >>> (E) @LINE: 82 TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_1_PRIMARY]:100.0
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
- >>> (E) @LINE: 83 TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_1_BACKUP]:50.0
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
- >>> (E) @LINE: 84 TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_2_PRIMARY]:100.0
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
- >>> (E) @LINE: 85 TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_2_BACKUP]:50.0
- >>> >>> Array Index Value(s) out of range 0 to 2
- >>> >>> Input Index was: 3
- >>> (E) @LINE: 89 TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_1_PRIMARY]:100.0
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
- >>> (E) @LINE: 90 TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_1_BACKUP]:50.0
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
- >>> (E) @LINE: 91 TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_2_PRIMARY]:100.0
- >>> >>> Too Few Array Index Values in Command
- >>> >>> Command Ignored.
- >>> (E) @LINE: 92 TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[LOAD_CELL_RESERVOIR_2_BACKUP]:0.0
- >>> >>> Array Index Value(s) out of range 0 to 2
- >>> >>> Input Index was: 3
-TEST.END_IMPORT_FAILURES:
-TEST.NOTES:
-This is an automatically generated test case.
- Test Path 1
- (1) if ((DG_RESERVOIR_1) == reservoirID) ==> FALSE
- (2) if (lcLastSteadyWeight[lcPrimaryIndex] > -(10000.0F) + (1)) ==> FALSE
- (3) if (driftDiff > (10.0F)) ==> FALSE
- Test Case Generation Notes:
- Cannot set lcPrimaryIndex due to assignment
- Cannot set local variable driftDiff in branch 3
- Cannot set lcBackupIndex due to assignment
-TEST.END_NOTES:
+TEST.NAME:checkLoadCellsStable_r2_final
+TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_FIRST]:150.0
+TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_RESERVOIR_2_PRIMARY]:200.0
+TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_RESERVOIR_2_BACKUP]:220.0
TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
-TEST.VALUE:uut_prototype_stubs.getReservoirWeightLargeFilter.resID:DG_RESERVOIR_2
-TEST.VALUE:uut_prototype_stubs.getReservoirWeightLargeFilter.return:100.0
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
-TEST.EXPECTED:uut_prototype_stubs.getReservoirWeightLargeFilter.resID:DG_RESERVOIR_2
-TEST.END
-
--- Test Case: checkLoadCellsStablePrimaryBackupDriftOutOfRange.004
-TEST.UNIT:Dialysis
-TEST.SUBPROGRAM:checkLoadCellsStablePrimaryBackupDriftOutOfRange
-TEST.NEW
-TEST.NAME:checkLoadCellsStablePrimaryBackupDriftOutOfRange.004
-TEST.BASIS_PATH:3 of 4 (partial)
-TEST.NOTES:
-This is an automatically generated test case.
- Test Path 3
- (1) if ((DG_RESERVOIR_1) == reservoirID) ==> FALSE
- (2) if ((RESERVOIR_STEADY_CYCLE_FINAL) == cycle && lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] > -(10000.0F) + (1)) ==> TRUE
- (3) if (driftDiff > (10.0F)) ==> FALSE
- Test Case Generation Notes:
- Cannot set lcPrimaryIndex due to assignment
- Cannot set return value of function fabs in branch 3
- Cannot set lcBackupIndex due to assignment
- Conflict: Multiple equality operators with different values (Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle) in branches 2/3
-TEST.END_NOTES:
-TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_FIRST]:<>
-TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_FINAL
-TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_FIRST]:3.40282E+38
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_FINAL
+TEST.VALUE:uut_prototype_stubs.getReservoirWeightLargeFilter.return:1500.0
+TEST.VALUE:uut_prototype_stubs.getReservoirBackupWeightLargeFilter.return:1580.0
+TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][LOAD_CELL_RESERVOIR_2_PRIMARY]:1500.0
+TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][LOAD_CELL_RESERVOIR_2_BACKUP]:1580.0
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_F32
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.flt.data:-80.0
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_F32
+TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.flt.data:-20.0
+TEST.EXPECTED:uut_prototype_stubs.sendEvent.event:HD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES
TEST.END
--- Test Case: checkLoadCellsStablePrimaryBackupDriftOutOfRange.005
+-- Test Case: checkLoadCellsStable_r2_start
TEST.UNIT:Dialysis
TEST.SUBPROGRAM:checkLoadCellsStablePrimaryBackupDriftOutOfRange
TEST.NEW
-TEST.NAME:checkLoadCellsStablePrimaryBackupDriftOutOfRange.005
-TEST.NOTES:
-This is an automatically generated test case.
- Test Path 3
- (1) if ((DG_RESERVOIR_1) == reservoirID) ==> FALSE
- (2) if ((RESERVOIR_STEADY_CYCLE_FINAL) == cycle && lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] > -(10000.0F) + (1)) ==> TRUE
- (3) if (driftDiff > (10.0F)) ==> FALSE
- Test Case Generation Notes:
- Cannot set lcPrimaryIndex due to assignment
- Cannot set return value of function fabs in branch 3
- Cannot set lcBackupIndex due to assignment
- Conflict: Multiple equality operators with different values (Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle) in branches 2/3
-TEST.END_NOTES:
-TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_RESERVOIR_2_PRIMARY]:-9999.0
+TEST.NAME:checkLoadCellsStable_r2_start
+TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_FIRST]:150.0
TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
-TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_FINAL
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_FINAL
+TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_START
+TEST.VALUE:uut_prototype_stubs.getReservoirWeightLargeFilter.return:1500.0
+TEST.VALUE:uut_prototype_stubs.getReservoirBackupWeightLargeFilter.return:1500.0
+TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_RESERVOIR_2_PRIMARY]:1500.0
+TEST.EXPECTED:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_RESERVOIR_2_BACKUP]:1500.0
+TEST.EXPECTED:uut_prototype_stubs.sendEvent.event:HD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES
TEST.END
--- Test Case: checkLoadCellsStablePrimaryBackupDriftOutOfRange.006
-TEST.UNIT:Dialysis
-TEST.SUBPROGRAM:checkLoadCellsStablePrimaryBackupDriftOutOfRange
-TEST.NEW
-TEST.NAME:checkLoadCellsStablePrimaryBackupDriftOutOfRange.006
-TEST.NOTES:
-This is an automatically generated test case.
- Test Path 3
- (1) if ((DG_RESERVOIR_1) == reservoirID) ==> FALSE
- (2) if ((RESERVOIR_STEADY_CYCLE_FINAL) == cycle && lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][lcPrimaryIndex] > -(10000.0F) + (1)) ==> TRUE
- (3) if (driftDiff > (10.0F)) ==> FALSE
- Test Case Generation Notes:
- Cannot set lcPrimaryIndex due to assignment
- Cannot set return value of function fabs in branch 3
- Cannot set lcBackupIndex due to assignment
- Conflict: Multiple equality operators with different values (Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle) in branches 2/3
-TEST.END_NOTES:
-TEST.VALUE:Dialysis.<>.lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][LOAD_CELL_RESERVOIR_2_PRIMARY]:30.0
-TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
-TEST.VALUE:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_FINAL
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_F32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_F32
-TEST.VALUE:uut_prototype_stubs.getReservoirWeightLargeFilter.resID:DG_RESERVOIR_2
-TEST.VALUE:uut_prototype_stubs.getReservoirWeightLargeFilter.return:100.0
-TEST.VALUE:uut_prototype_stubs.getReservoirBackupWeightLargeFilter.resID:DG_RESERVOIR_2
-TEST.VALUE:uut_prototype_stubs.getReservoirBackupWeightLargeFilter.return:50.0
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.reservoirID:DG_RESERVOIR_2
-TEST.EXPECTED:Dialysis.checkLoadCellsStablePrimaryBackupDriftOutOfRange.cycle:RESERVOIR_STEADY_CYCLE_FINAL
-TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.flt.data:50.0
-TEST.EXPECTED:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.flt.data:30.0
-TEST.END
-
-- Subprogram: checkUFControl
-- Test Case: checkUFControl.001
@@ -442,7 +316,7 @@
TEST.VALUE:Dialysis.handleDialysisSalineBolusState.return:DIALYSIS_SALINE_BOLUS_STATE
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_SOFTWARE_FAULT
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:SW_FAULT_ID_DIALYSIS_INVALID_SALINE_BOLUS_STATE
+TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData1.data.uInt.data:MACRO=SW_FAULT_ID_DIALYSIS_INVALID_SALINE_BOLUS_STATE
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.dataType:ALARM_DATA_TYPE_U32
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarmData2.data.uInt.data:0
TEST.EXPECTED:Dialysis.<>.currentSalineBolusState:SALINE_BOLUS_STATE_MAX_DELIVERED
@@ -467,7 +341,7 @@
TEST.VALUE:Dialysis.<>.currentSalineBolusState:SALINE_BOLUS_STATE_MAX_DELIVERED
TEST.VALUE:Dialysis.handleDialysisSalineBolusState.return:DIALYSIS_SALINE_BOLUS_STATE
TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.dataType:ALARM_DATA_TYPE_U32
-TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.data.uInt.data:SW_FAULT_ID_DIALYSIS_INVALID_SALINE_BOLUS_STATE
+TEST.VALUE:uut_prototype_stubs.activateAlarm1Data.alarmData.data.uInt.data:MACRO=SW_FAULT_ID_DIALYSIS_INVALID_SALINE_BOLUS_STATE
TEST.VALUE:uut_prototype_stubs.activateAlarm2Data.alarm:ALARM_ID_HD_SOFTWARE_FAULT
TEST.EXPECTED:Dialysis.<>.currentSalineBolusState:SALINE_BOLUS_STATE_MAX_DELIVERED
TEST.EXPECTED:Dialysis.handleDialysisSalineBolusState.return:DIALYSIS_UF_STATE
@@ -2988,6 +2862,8 @@
TEST.SUBPROGRAM:stopDialysis
TEST.NEW
TEST.NAME:stopDialysis.001
+TEST.VALUE:Dialysis.<>.currentDialysisState:DIALYSIS_UF_STATE
+TEST.EXPECTED:Dialysis.<>.currentDialysisState:DIALYSIS_UF_STATE
TEST.END
-- Subprogram: transitionToDialysis
Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALYSIS/DIALYSIS_cba.cvr
===================================================================
diff -u -r202a7e6c312e5dc5b85c0d2a30689c6d35a4358b -rdba8e16a2645adbc90a739ac5d3e2e3377fa94ec
--- vectorcast/Hercules_RM46_HD_Project/environment/DIALYSIS/DIALYSIS_cba.cvr (.../DIALYSIS_cba.cvr) (revision 202a7e6c312e5dc5b85c0d2a30689c6d35a4358b)
+++ vectorcast/Hercules_RM46_HD_Project/environment/DIALYSIS/DIALYSIS_cba.cvr (.../DIALYSIS_cba.cvr) (revision dba8e16a2645adbc90a739ac5d3e2e3377fa94ec)
@@ -1,256 +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:Dialysis.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
-RESULT.CBA.BEGIN
-RESULT.CBA.RESULT: CBA_Dialysis
-RESULT.CBA.NOTES
-Test code will be removed - no need to test.
-Empty saline bag detection not yet implemented.
-
---- Invalidated Analysis Lines ---
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: transitionToDialysis
- >>> Line Context: {
-
- >>> Context After: }
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: transitionToDialysis
- >>> Context Before: {
-
-
- >>> Line Context: }
-
---- Invalidated Analysis Lines ---
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleSalineBolusInProgressState
- >>> Context Before: if ( 0 )
-{
-
-
- >>> Line Context: activateAlarm1Data( ALARM_ID_EMPTY_SALINE_BAG, dat1 );
-
- >>> Context After: errorFound =
-1
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleSalineBolusInProgressState
- >>> Context Before: if ( 0 )
-{
-
-
- >>> Line Context: dat1.data.flt.data = (F32)(0.0);
-
- >>> Context After: errorFound =
-1
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleSalineBolusInProgressState
- >>> Context Before: {
-{ ALARM_DATA_T dat1; dat1.dataType = ALARM_DATA_TYPE_F32; dat1.data.flt.data = (F32)(0.0); activateAlarm1Data( ALARM_ID_EMPTY_SALINE_BAG, dat1 ); }; // TODO - give data supporting empty bag detection
-
-
- >>> Line Context: errorFound =
-
- >>> Context After: 1
-;
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleUFPausedState
- >>> Context Before: ;
-// set outlet pump to dialysate rate + set UF rate
-
-
- >>> Line Context: (setUFRate) < 0.0
-
- >>> Context After: // restart UF time accumulation for reference volume calculation
-lastUFTimeStamp = getMSTimerCount();
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleUFPausedState
- >>> Context Before: ;
-// set outlet pump to dialysate rate + set UF rate
-
-
- >>> Line Context: (setUFRate) < 0.0
-
- >>> Context After: // restart UF time accumulation for reference volume calculation
-lastUFTimeStamp = getMSTimerCount();
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleUFPausedState
- >>> Context Before: == isStopButtonPressed() )
-{
-
-
- >>> Line Context: resumeUF();
-
- >>> Context After: result = UF_RUNNING_STATE;
-}
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleUFPausedState
- >>> Context Before: {
-resumeUF();
-
-
- >>> Line Context: result = UF_RUNNING_STATE;
-
- >>> Context After: }
-return result;
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleUFRunningState
- >>> Context Before: == isStopButtonPressed() )
-{
-
-
- >>> Line Context: pauseUF();
-
- >>> Context After: result = UF_PAUSED_STATE;
-}
-
- >>> Failed to find matching line for:
- >>> Result: CBA_Dialysis
- >>> Unit: 9
- >>> Function: handleUFRunningState
- >>> Context Before: {
-pauseUF();
-
-
- >>> Line Context: result = UF_PAUSED_STATE;
-
- >>> Context After: }
-return result;
-
-RESULT.CBA.NOTES_END
-RESULT.CBA.UNIT: /home/asif/work/update_22nd/workspace_hd/hdfirmware/firmware/App/Modes/Dialysis.c
-RESULT.CBA.FUNCTION: handleSalineBolusInProgressState
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 12
-RESULT.CBA.CONTEXT: dat1.dataType = ALARM_DATA_TYPE_F32;
-RESULT.CBA.CONTEXT_BEFORE:
-== isSalineBagEmpty() )
-{
-RESULT.CBA.CONTEXT_BEFORE_END
-RESULT.CBA.CONTEXT_AFTER:
-errorFound =
-1
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: handleUFPausedState
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 4
-RESULT.CBA.CONTEXT: if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState
-RESULT.CBA.CONTEXT_BEFORE:
-;
-// Go to saline bolus state if we can
-RESULT.CBA.CONTEXT_BEFORE_END
-RESULT.CBA.CONTEXT_AFTER:
-{
-*dialysisState = DIALYSIS_SALINE_BOLUS_STATE;
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.LINE.END
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 4
-RESULT.CBA.COVERAGE: 3 3
-RESULT.CBA.CONTEXT: if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState
-RESULT.CBA.CONTEXT_BEFORE:
-;
-// Go to saline bolus state if we can
-RESULT.CBA.CONTEXT_BEFORE_END
-RESULT.CBA.CONTEXT_AFTER:
-{
-*dialysisState = DIALYSIS_SALINE_BOLUS_STATE;
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.LINE.END
-RESULT.CBA.FUNCTION: handleUFRunningState
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 11
-RESULT.CBA.CONTEXT: if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState
-RESULT.CBA.CONTEXT_BEFORE:
-== salineBolusStartRequested )
-{
-RESULT.CBA.CONTEXT_BEFORE_END
-RESULT.CBA.CONTEXT_AFTER:
-{
-// Since we were doing UF prior to saline bolus, we want to auto-resume when done
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.LINE.END
-RESULT.CBA.LINE.BEGIN
-RESULT.CBA.LINE: 11
-RESULT.CBA.COVERAGE: 3 3
-RESULT.CBA.CONTEXT: if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState
-RESULT.CBA.CONTEXT_BEFORE:
-== salineBolusStartRequested )
-{
-RESULT.CBA.CONTEXT_BEFORE_END
-RESULT.CBA.CONTEXT_AFTER:
-{
-// Since we were doing UF prior to saline bolus, we want to auto-resume when done
-RESULT.CBA.CONTEXT_AFTER_END
-RESULT.CBA.LINE.END
-RESULT.CBA.END
-IMPORT.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/FLUIDLEAK/FLUIDLEAK.tst
===================================================================
diff -u -r8d6cb96810d734a0a1645bdec85b90c6347b1313 -rdba8e16a2645adbc90a739ac5d3e2e3377fa94ec
--- vectorcast/Hercules_RM46_HD_Project/environment/FLUIDLEAK/FLUIDLEAK.tst (.../FLUIDLEAK.tst) (revision 8d6cb96810d734a0a1645bdec85b90c6347b1313)
+++ vectorcast/Hercules_RM46_HD_Project/environment/FLUIDLEAK/FLUIDLEAK.tst (.../FLUIDLEAK.tst) (revision dba8e16a2645adbc90a739ac5d3e2e3377fa94ec)
@@ -52,9 +52,11 @@
Condition a ==> FALSE
Test Case Generation Notes:
TEST.END_NOTES:
-TEST.STUB:FluidLeak.publishFluidLeakState
+TEST.VALUE:FluidLeak.<>.fluidLeakStatePublicationTimerCounter:5
+TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:15
TEST.VALUE:uut_prototype_stubs.noFPGAFluidLeakDetected.return:1
TEST.VALUE:uut_prototype_stubs.getCurrentOperationMode.return:MODE_INIT
+TEST.EXPECTED:FluidLeak.<>.fluidLeakStatePublicationTimerCounter:6
TEST.END
-- Test Case: execFluidLeak.003
@@ -165,11 +167,11 @@
-- Subprogram: publishFluidLeakState
--- Test Case: publishFluidLeakState.001
+-- Test Case: publishFluidLeakState_time_elapsed
TEST.UNIT:FluidLeak
TEST.SUBPROGRAM:publishFluidLeakState
TEST.NEW
-TEST.NAME:publishFluidLeakState.001
+TEST.NAME:publishFluidLeakState_time_elapsed
TEST.MCDC_BASIS_PATH:2 of 2
TEST.NOTES:
This is an automatically generated test case.
@@ -179,21 +181,23 @@
Condition a ==> TRUE
Test Case Generation Notes:
TEST.END_NOTES:
-TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<>
+TEST.VALUE:FluidLeak.<>.fluidLeakStatePublicationTimerCounter:15
+TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:15
TEST.VALUE:uut_prototype_stubs.broadcastData.msgID:MSG_ID_HD_FLUID_LEAK_STATE_DATA
TEST.VALUE:uut_prototype_stubs.broadcastData.buffer:COMM_BUFFER_OUT_CAN_HD_BROADCAST
TEST.VALUE:uut_prototype_stubs.broadcastData.dataPtr:""
TEST.VALUE:uut_prototype_stubs.broadcastData.length:4
+TEST.EXPECTED:FluidLeak.<>.fluidLeakStatePublicationTimerCounter:0
TEST.EXPECTED:uut_prototype_stubs.broadcastData.msgID:MSG_ID_HD_FLUID_LEAK_STATE_DATA
TEST.EXPECTED:uut_prototype_stubs.broadcastData.buffer:COMM_BUFFER_OUT_CAN_HD_BROADCAST
TEST.EXPECTED:uut_prototype_stubs.broadcastData.length:4
TEST.END
--- Test Case: publishFluidLeakState.002
+-- Test Case: publishFluidLeakState_time_not_elapsed
TEST.UNIT:FluidLeak
TEST.SUBPROGRAM:publishFluidLeakState
TEST.NEW
-TEST.NAME:publishFluidLeakState.002
+TEST.NAME:publishFluidLeakState_time_not_elapsed
TEST.MCDC_BASIS_PATH:1 of 2
TEST.NOTES:
This is an automatically generated test case.
@@ -203,7 +207,9 @@
Condition a ==> FALSE
Test Case Generation Notes:
TEST.END_NOTES:
-TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:<>
+TEST.VALUE:FluidLeak.<>.fluidLeakStatePublicationTimerCounter:5
+TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:15
+TEST.EXPECTED:FluidLeak.<>.fluidLeakStatePublicationTimerCounter:6
TEST.END
-- Subprogram: testResetFluidLeakStateOverride
Index: vectorcast/Hercules_RM46_HD_Project/environment/INTEGRITY/INTEGRITY.env
===================================================================
diff -u -r58d4768cacb79b0e2960ee3773f2f59f96154771 -rdba8e16a2645adbc90a739ac5d3e2e3377fa94ec
--- vectorcast/Hercules_RM46_HD_Project/environment/INTEGRITY/INTEGRITY.env (.../INTEGRITY.env) (revision 58d4768cacb79b0e2960ee3773f2f59f96154771)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INTEGRITY/INTEGRITY.env (.../INTEGRITY.env) (revision dba8e16a2645adbc90a739ac5d3e2e3377fa94ec)
@@ -5,4 +5,31 @@
ENVIRO.STUB: ALL_BY_PROTOTYPE
ENVIRO.TYPE_HANDLED_DIRS_ALLOWED:
ENVIRO.LIBRARY_STUBS:
+ENVIRO.UNIT_PREFIX_USER_CODE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:Integrity
+#include "reg_tcram.h"
+
+tcramBASE_t * prt_tcram1REG;
+tcramBASE_t * prt_tcram2REG;
+
+#undef tcram1REG
+#define tcram1REG prt_tcram1REG
+
+#undef tcram2REG
+#define tcram2REG prt_tcram2REG
+
+ENVIRO.END_UNIT_PREFIX_USER_CODE_FILE:
+ENVIRO.END_UNIT_PREFIX_USER_CODE:
+ENVIRO.COVERAGE_TYPE: STATEMENT+MCDC
+ENVIRO.WHITE_BOX: YES
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/include/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/source/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Controllers/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Drivers/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Modes/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Services/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/App/Tasks/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/../../common/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/../../fwcommon/
ENVIRO.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/INTEGRITY/INTEGRITY.tst
===================================================================
diff -u -r202a7e6c312e5dc5b85c0d2a30689c6d35a4358b -rdba8e16a2645adbc90a739ac5d3e2e3377fa94ec
--- vectorcast/Hercules_RM46_HD_Project/environment/INTEGRITY/INTEGRITY.tst (.../INTEGRITY.tst) (revision 202a7e6c312e5dc5b85c0d2a30689c6d35a4358b)
+++ vectorcast/Hercules_RM46_HD_Project/environment/INTEGRITY/INTEGRITY.tst (.../INTEGRITY.tst) (revision dba8e16a2645adbc90a739ac5d3e2e3377fa94ec)
@@ -17,49 +17,189 @@
-- Subprogram: execIntegrityTest
--- Test Case: execIntegrityTest.001
+-- Test Case: execIntegrityTest_integrity_failed_last_record
TEST.UNIT:Integrity
TEST.SUBPROGRAM:execIntegrityTest
TEST.NEW
-TEST.NAME:execIntegrityTest.001
+TEST.NAME:execIntegrityTest_integrity_failed_last_record
+TEST.VALUE:Integrity.<>.testTable.num_recs:1
+TEST.VALUE:Integrity.<>.testTable.recs[0].crc_value:1
+TEST.VALUE:Integrity.<>.testTable.recs[0].size:34000
+TEST.VALUE:Integrity.<>.currentRecord:0
+TEST.VALUE:Integrity.<>.currentProcessedSize:32000
+TEST.VALUE:Integrity.<>.crcCalculated:2
+TEST.VALUE:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_IN_PROGRESS
+TEST.VALUE:uut_prototype_stubs.crc32.return:2
+TEST.EXPECTED:Integrity.<>.currentRecord:1
+TEST.EXPECTED:Integrity.<>.currentProcessedSize:0
+TEST.EXPECTED:Integrity.<>.crcCalculated:0
+TEST.EXPECTED:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_FAILED
TEST.END
+-- Test Case: execIntegrityTest_integrity_in_progress_size_large
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:execIntegrityTest
+TEST.NEW
+TEST.NAME:execIntegrityTest_integrity_in_progress_size_large
+TEST.VALUE:Integrity.<>.testTable.num_recs:2
+TEST.VALUE:Integrity.<>.testTable.recs[0].size:34000
+TEST.VALUE:Integrity.<>.currentRecord:1
+TEST.VALUE:Integrity.<>.currentProcessedSize:1
+TEST.VALUE:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_FAILED
+TEST.EXPECTED:Integrity.<>.currentProcessedSize:32769
+TEST.EXPECTED:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_IN_PROGRESS
+TEST.END
+
+-- Test Case: execIntegrityTest_integrity_passed_last_record
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:execIntegrityTest
+TEST.NEW
+TEST.NAME:execIntegrityTest_integrity_passed_last_record
+TEST.VALUE:Integrity.<>.testTable.num_recs:1
+TEST.VALUE:Integrity.<>.testTable.recs[0].crc_value:1
+TEST.VALUE:Integrity.<>.testTable.recs[0].size:34000
+TEST.VALUE:Integrity.<>.currentRecord:0
+TEST.VALUE:Integrity.<>.currentProcessedSize:32000
+TEST.VALUE:Integrity.<>.crcCalculated:2
+TEST.VALUE:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_FAILED
+TEST.VALUE:uut_prototype_stubs.crc32.return:1
+TEST.EXPECTED:Integrity.<>.currentRecord:1
+TEST.EXPECTED:Integrity.<>.currentProcessedSize:0
+TEST.EXPECTED:Integrity.<>.crcCalculated:0
+TEST.EXPECTED:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_PASSED
+TEST.END
+
+-- Test Case: execIntegrityTest_no_integrity
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:execIntegrityTest
+TEST.NEW
+TEST.NAME:execIntegrityTest_no_integrity
+TEST.VALUE:Integrity.<>.testTable.num_recs:0
+TEST.VALUE:Integrity.<>.currentRecord:1
+TEST.VALUE:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_FAILED
+TEST.EXPECTED:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_IN_PROGRESS
+TEST.END
+
+-- Test Case: execIntegrityTest_no_integrity_passed
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:execIntegrityTest
+TEST.NEW
+TEST.NAME:execIntegrityTest_no_integrity_passed
+TEST.VALUE:Integrity.<>.testTable.num_recs:1
+TEST.VALUE:Integrity.<>.currentRecord:1
+TEST.VALUE:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_FAILED
+TEST.EXPECTED:Integrity.execIntegrityTest.return:SELF_TEST_STATUS_PASSED
+TEST.END
+
-- Subprogram: execRAMMonitor
--- Test Case: execRAMMonitor.001
+-- Test Case: execRAMMonitor_time_elapsed_err1_true
TEST.UNIT:Integrity
TEST.SUBPROGRAM:execRAMMonitor
TEST.NEW
-TEST.NAME:execRAMMonitor.001
-TEST.VALUE:Integrity.<>.processorRAMStatusCounter:0
-TEST.EXPECTED:Integrity.<>.processorRAMStatusCounter:1
+TEST.NAME:execRAMMonitor_time_elapsed_err1_true
+TEST.VALUE:Integrity.<>.prt_tcram1REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram1REG[0].RAMERRSTATUS:15
+TEST.VALUE:Integrity.<>.prt_tcram2REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram2REG[0].RAMERRSTATUS:15
+TEST.VALUE:Integrity.<>.processorRAMStatusCounter:41
+TEST.VALUE:Integrity.<>.singleBitRAMErrorFlag:1
+TEST.VALUE:Integrity.<>.tcram1ErrStat.data:1
+TEST.VALUE:Integrity.<>.tcram2ErrStat.data:1
+TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:1,0
+TEST.EXPECTED:Integrity.<>.processorRAMStatusCounter:0
+TEST.EXPECTED:Integrity.<>.tcram1ErrStat.data:15
+TEST.EXPECTED:Integrity.<>.tcram2ErrStat.data:15
TEST.END
--- Test Case: execRAMMonitor.002
+-- Test Case: execRAMMonitor_time_elapsed_err1_true_single_bit_false
TEST.UNIT:Integrity
TEST.SUBPROGRAM:execRAMMonitor
TEST.NEW
-TEST.NAME:execRAMMonitor.002
+TEST.NAME:execRAMMonitor_time_elapsed_err1_true_single_bit_false
+TEST.VALUE:Integrity.<>.prt_tcram1REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram1REG[0].RAMERRSTATUS:15
+TEST.VALUE:Integrity.<>.prt_tcram2REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram2REG[0].RAMERRSTATUS:15
TEST.VALUE:Integrity.<>.processorRAMStatusCounter:41
-TEST.VALUE:Integrity.<>.tcram1ErrStat.data:0
-TEST.VALUE:Integrity.<>.tcram1ErrStat.ovInitData:0
-TEST.VALUE:Integrity.<>.tcram1ErrStat.ovData:0
+TEST.VALUE:Integrity.<>.singleBitRAMErrorFlag:0
+TEST.VALUE:Integrity.<>.tcram1ErrStat.data:1
+TEST.VALUE:Integrity.<>.tcram2ErrStat.data:1
+TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:1,0
+TEST.EXPECTED:Integrity.<>.processorRAMStatusCounter:0
+TEST.EXPECTED:Integrity.<>.singleBitRAMErrorFlag:1
+TEST.EXPECTED:Integrity.<>.tcram1ErrStat.data:15
+TEST.EXPECTED:Integrity.<>.tcram2ErrStat.data:15
+TEST.END
+
+-- Test Case: execRAMMonitor_time_elapsed_err2_true_in_bitwise_or
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:execRAMMonitor
+TEST.NEW
+TEST.NAME:execRAMMonitor_time_elapsed_err2_true_in_bitwise_or
+TEST.VALUE:Integrity.<>.prt_tcram1REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram1REG[0].RAMERRSTATUS:0
+TEST.VALUE:Integrity.<>.prt_tcram2REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram2REG[0].RAMERRSTATUS:821
+TEST.VALUE:Integrity.<>.processorRAMStatusCounter:41
+TEST.VALUE:Integrity.<>.singleBitRAMErrorFlag:0
+TEST.VALUE:Integrity.<>.tcram1ErrStat.data:1
TEST.VALUE:Integrity.<>.tcram1ErrStat.override:0
-TEST.VALUE:Integrity.<>.tcram2ErrStat.data:0
-TEST.VALUE:Integrity.<>.tcram2ErrStat.ovInitData:0
-TEST.VALUE:Integrity.<>.tcram2ErrStat.ovData:0
+TEST.VALUE:Integrity.<>.tcram2ErrStat.data:1
TEST.VALUE:Integrity.<>.tcram2ErrStat.override:0
-TEST.EXPECTED:Integrity.<>.processorRAMStatusCounter:41
+TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:(3)0,821
+TEST.EXPECTED:Integrity.<>.processorRAMStatusCounter:0
+TEST.EXPECTED:Integrity.<>.singleBitRAMErrorFlag:0
TEST.EXPECTED:Integrity.<>.tcram1ErrStat.data:0
-TEST.EXPECTED:Integrity.<>.tcram1ErrStat.ovInitData:0
-TEST.EXPECTED:Integrity.<>.tcram1ErrStat.ovData:0
-TEST.EXPECTED:Integrity.<>.tcram1ErrStat.override:0
-TEST.EXPECTED:Integrity.<>.tcram2ErrStat.data:0
-TEST.EXPECTED:Integrity.<>.tcram2ErrStat.ovInitData:0
-TEST.EXPECTED:Integrity.<>.tcram2ErrStat.ovData:0
-TEST.EXPECTED:Integrity.<>.tcram2ErrStat.override:0
+TEST.EXPECTED:Integrity.<>.tcram2ErrStat.data:821
TEST.END
+-- Test Case: execRAMMonitor_time_elapsed_err2_true_single_bit_false
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:execRAMMonitor
+TEST.NEW
+TEST.NAME:execRAMMonitor_time_elapsed_err2_true_single_bit_false
+TEST.VALUE:Integrity.<>.prt_tcram1REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram1REG[0].RAMERRSTATUS:15
+TEST.VALUE:Integrity.<>.prt_tcram2REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram2REG[0].RAMERRSTATUS:15
+TEST.VALUE:Integrity.<>.processorRAMStatusCounter:41
+TEST.VALUE:Integrity.<>.singleBitRAMErrorFlag:0
+TEST.VALUE:Integrity.<>.tcram1ErrStat.data:1
+TEST.VALUE:Integrity.<>.tcram2ErrStat.data:1
+TEST.VALUE:uut_prototype_stubs.getU32OverrideValue.return:0,1
+TEST.EXPECTED:Integrity.<>.processorRAMStatusCounter:0
+TEST.EXPECTED:Integrity.<>.singleBitRAMErrorFlag:1
+TEST.EXPECTED:Integrity.<>.tcram1ErrStat.data:15
+TEST.EXPECTED:Integrity.<>.tcram2ErrStat.data:15
+TEST.END
+
+-- Test Case: execRAMMonitor_time_elapsed_no_ram_error
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:execRAMMonitor
+TEST.NEW
+TEST.NAME:execRAMMonitor_time_elapsed_no_ram_error
+TEST.VALUE:Integrity.<>.prt_tcram1REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram1REG[0].RAMERRSTATUS:15
+TEST.VALUE:Integrity.<>.prt_tcram2REG:<>
+TEST.VALUE:Integrity.<>.prt_tcram2REG[0].RAMERRSTATUS:15
+TEST.VALUE:Integrity.<>.processorRAMStatusCounter:41
+TEST.VALUE:Integrity.<>.tcram1ErrStat.data:1
+TEST.VALUE:Integrity.<>.tcram2ErrStat.data:1
+TEST.EXPECTED:Integrity.<>.processorRAMStatusCounter:0
+TEST.EXPECTED:Integrity.<>.tcram1ErrStat.data:15
+TEST.EXPECTED:Integrity.<>.tcram2ErrStat.data:15
+TEST.END
+
+-- Test Case: execRAMMonitor_time_not_elapsed
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:execRAMMonitor
+TEST.NEW
+TEST.NAME:execRAMMonitor_time_not_elapsed
+TEST.VALUE:Integrity.<>.processorRAMStatusCounter:30
+TEST.EXPECTED:Integrity.<>.processorRAMStatusCounter:31
+TEST.END
+
-- Subprogram: initIntegrity
-- Test Case: initIntegrity.001
@@ -68,16 +208,16 @@
TEST.NEW
TEST.NAME:initIntegrity.001
TEST.VALUE:Integrity.<>.currentRecord:1
-TEST.VALUE:Integrity.<>.currentProcessedSize:1
-TEST.VALUE:Integrity.<>.crcCalculated:1
+TEST.VALUE:Integrity.<>.currentProcessedSize:15
+TEST.VALUE:Integrity.<>.crcCalculated:14
TEST.VALUE:Integrity.<>.integrityTestStatus:SELF_TEST_STATUS_PASSED
-TEST.VALUE:Integrity.<>.processorRAMStatusCounter:1
+TEST.VALUE:Integrity.<>.processorRAMStatusCounter:5
TEST.VALUE:Integrity.<>.singleBitRAMErrorFlag:1
TEST.VALUE:Integrity.<>.tcram1ErrStat.data:1
-TEST.VALUE:Integrity.<>.tcram1ErrStat.ovInitData:1
-TEST.VALUE:Integrity.<>.tcram1ErrStat.ovData:1
+TEST.VALUE:Integrity.<>.tcram1ErrStat.ovInitData:2
+TEST.VALUE:Integrity.<>.tcram1ErrStat.ovData:5
TEST.VALUE:Integrity.<>.tcram1ErrStat.override:1
-TEST.VALUE:Integrity.<>.tcram2ErrStat.data:1
+TEST.VALUE:Integrity.<>.tcram2ErrStat.data:15
TEST.VALUE:Integrity.<>.tcram2ErrStat.ovInitData:1
TEST.VALUE:Integrity.<>.tcram2ErrStat.ovData:1
TEST.VALUE:Integrity.<>.tcram2ErrStat.override:1
@@ -99,87 +239,89 @@
-- Subprogram: testResetRAMStatusOverride
--- Test Case: testResetRAMStatusOverride.001
+-- Test Case: testResetRAMStatusOverride_logged_in_reg_1
TEST.UNIT:Integrity
TEST.SUBPROGRAM:testResetRAMStatusOverride
TEST.NEW
-TEST.NAME:testResetRAMStatusOverride.001
-TEST.VALUE:Integrity.testResetRAMStatusOverride.return:1
-TEST.EXPECTED:Integrity.testResetRAMStatusOverride.return:0
-TEST.END
-
--- Test Case: testResetRAMStatusOverride.002
-TEST.UNIT:Integrity
-TEST.SUBPROGRAM:testResetRAMStatusOverride
-TEST.NEW
-TEST.NAME:testResetRAMStatusOverride.002
-TEST.VALUE:Integrity.<>.tcram1ErrStat.ovInitData:0
+TEST.NAME:testResetRAMStatusOverride_logged_in_reg_1
+TEST.VALUE:Integrity.<>.tcram1ErrStat.ovInitData:5
+TEST.VALUE:Integrity.<>.tcram1ErrStat.ovData:1
TEST.VALUE:Integrity.<>.tcram1ErrStat.override:1
TEST.VALUE:Integrity.testResetRAMStatusOverride.reg:0
TEST.VALUE:Integrity.testResetRAMStatusOverride.return:0
TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
-TEST.EXPECTED:Integrity.<>.tcram1ErrStat.ovInitData:0
-TEST.EXPECTED:Integrity.<>.tcram1ErrStat.override:0x0
-TEST.EXPECTED:Integrity.testResetRAMStatusOverride.reg:0
+TEST.EXPECTED:Integrity.<>.tcram1ErrStat.ovData:5
+TEST.EXPECTED:Integrity.<>.tcram1ErrStat.override:0
TEST.EXPECTED:Integrity.testResetRAMStatusOverride.return:1
TEST.END
--- Test Case: testResetRAMStatusOverride.003
+-- Test Case: testResetRAMStatusOverride_logged_in_reg_2
TEST.UNIT:Integrity
TEST.SUBPROGRAM:testResetRAMStatusOverride
TEST.NEW
-TEST.NAME:testResetRAMStatusOverride.003
-TEST.VALUE:Integrity.<>.tcram1ErrStat.ovInitData:1
-TEST.VALUE:Integrity.<>.tcram1ErrStat.override:1
+TEST.NAME:testResetRAMStatusOverride_logged_in_reg_2
+TEST.VALUE:Integrity.<>.tcram2ErrStat.ovInitData:6
+TEST.VALUE:Integrity.<>.tcram2ErrStat.ovData:1
+TEST.VALUE:Integrity.<>.tcram2ErrStat.override:1
TEST.VALUE:Integrity.testResetRAMStatusOverride.reg:1
TEST.VALUE:Integrity.testResetRAMStatusOverride.return:0
TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
-TEST.EXPECTED:Integrity.<>.tcram1ErrStat.ovInitData:1
-TEST.EXPECTED:Integrity.<>.tcram1ErrStat.override:0x1
-TEST.EXPECTED:Integrity.testResetRAMStatusOverride.reg:1
+TEST.EXPECTED:Integrity.<>.tcram2ErrStat.ovData:6
+TEST.EXPECTED:Integrity.<>.tcram2ErrStat.override:0
TEST.EXPECTED:Integrity.testResetRAMStatusOverride.return:1
TEST.END
--- Subprogram: testSetRAMStatusOverride
-
--- Test Case: testSetRAMStatusOverride.001
+-- Test Case: testResetRAMStatusOverride_not_logged_in
TEST.UNIT:Integrity
-TEST.SUBPROGRAM:testSetRAMStatusOverride
+TEST.SUBPROGRAM:testResetRAMStatusOverride
TEST.NEW
-TEST.NAME:testSetRAMStatusOverride.001
-TEST.VALUE:Integrity.testSetRAMStatusOverride.return:0
+TEST.NAME:testResetRAMStatusOverride_not_logged_in
+TEST.VALUE:Integrity.testResetRAMStatusOverride.reg:0
+TEST.VALUE:Integrity.testResetRAMStatusOverride.return:1
TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:0
-TEST.EXPECTED:Integrity.testSetRAMStatusOverride.return:0
+TEST.EXPECTED:Integrity.testResetRAMStatusOverride.return:0
TEST.END
--- Test Case: testSetRAMStatusOverride.002
+-- Subprogram: testSetRAMStatusOverride
+
+-- Test Case: testSetRAMStatusOverride_logged_in_reg_1
TEST.UNIT:Integrity
TEST.SUBPROGRAM:testSetRAMStatusOverride
TEST.NEW
-TEST.NAME:testSetRAMStatusOverride.002
-TEST.VALUE:Integrity.<>.tcram1ErrStat.ovData:0
-TEST.VALUE:Integrity.<>.tcram1ErrStat.override:0
+TEST.NAME:testSetRAMStatusOverride_logged_in_reg_1
+TEST.VALUE:Integrity.<>.tcram1ErrStat.ovData:4
+TEST.VALUE:Integrity.<>.tcram1ErrStat.override:1
TEST.VALUE:Integrity.testSetRAMStatusOverride.reg:0
-TEST.VALUE:Integrity.testSetRAMStatusOverride.status:100
+TEST.VALUE:Integrity.testSetRAMStatusOverride.status:2
TEST.VALUE:Integrity.testSetRAMStatusOverride.return:0
TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
-TEST.EXPECTED:Integrity.<>.tcram1ErrStat.ovData:100
+TEST.EXPECTED:Integrity.<>.tcram1ErrStat.ovData:2
TEST.EXPECTED:Integrity.<>.tcram1ErrStat.override:0xCCC33C33
TEST.EXPECTED:Integrity.testSetRAMStatusOverride.return:1
TEST.END
--- Test Case: testSetRAMStatusOverride.003
+-- Test Case: testSetRAMStatusOverride_logged_in_reg_2
TEST.UNIT:Integrity
TEST.SUBPROGRAM:testSetRAMStatusOverride
TEST.NEW
-TEST.NAME:testSetRAMStatusOverride.003
-TEST.VALUE:Integrity.<>.tcram2ErrStat.ovData:1
+TEST.NAME:testSetRAMStatusOverride_logged_in_reg_2
+TEST.VALUE:Integrity.<>.tcram2ErrStat.ovData:4
TEST.VALUE:Integrity.<>.tcram2ErrStat.override:1
TEST.VALUE:Integrity.testSetRAMStatusOverride.reg:1
-TEST.VALUE:Integrity.testSetRAMStatusOverride.status:10
+TEST.VALUE:Integrity.testSetRAMStatusOverride.status:2
TEST.VALUE:Integrity.testSetRAMStatusOverride.return:0
TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:1
-TEST.EXPECTED:Integrity.<>.tcram2ErrStat.ovData:10
+TEST.EXPECTED:Integrity.<>.tcram2ErrStat.ovData:2
TEST.EXPECTED:Integrity.<>.tcram2ErrStat.override:0xCCC33C33
TEST.EXPECTED:Integrity.testSetRAMStatusOverride.return:1
TEST.END
+
+-- Test Case: testSetRAMStatusOverride_not_logged_in
+TEST.UNIT:Integrity
+TEST.SUBPROGRAM:testSetRAMStatusOverride
+TEST.NEW
+TEST.NAME:testSetRAMStatusOverride_not_logged_in
+TEST.VALUE:Integrity.testSetRAMStatusOverride.return:1
+TEST.VALUE:uut_prototype_stubs.isTestingActivated.return:0
+TEST.EXPECTED:Integrity.testSetRAMStatusOverride.return:0
+TEST.END