Index: vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst =================================================================== diff -u -r72f56aa9eebfb142741f5589d5c600c88ecb2d06 -re38bc77d881536f690243db021b8c4c3d326f730 --- vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst (.../DIALOUTFLOW.tst) (revision 72f56aa9eebfb142741f5589d5c600c88ecb2d06) +++ vectorcast/Hercules_RM46_HD_Project/environment/DIALOUTFLOW/DIALOUTFLOW.tst (.../DIALOUTFLOW.tst) (revision e38bc77d881536f690243db021b8c4c3d326f730) @@ -1630,14 +1630,14 @@ TEST.VALUE:DialOutFlow.getTotalMeasuredUFVolumeInMl.return:0.0 TEST.VALUE:uut_prototype_stubs.getCurrentUFSetRate.return:0.0 TEST.VALUE:uut_prototype_stubs.getDialInPumpPWMDutyCyclePct.return:0.0 -TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.1 +TEST.EXPECTED:DialOutFlow.<>.dialOutPumpPWMDutyCyclePctSet:0.11 TEST.EXPECTED:DialOutFlow.<>.dialOutPumpControlModeSet:PUMP_CONTROL_MODE_CLOSED_LOOP TEST.EXPECTED:DialOutFlow.<>.offsetPWMDutyCyclePct:0.0 TEST.EXPECTED:DialOutFlow.<>.ufMeasuredRate:0.0 TEST.EXPECTED:DialOutFlow.<>.dopRateCorrectionOffset:0.0 TEST.EXPECTED:DialOutFlow.<>.dopControlSignal:0 TEST.EXPECTED:DialOutFlow.handleDialOutPumpControlToTargetState.return:DIAL_OUT_PUMP_CONTROL_TO_TARGET_STATE -TEST.EXPECTED:DialOutFlow.setDialOutPumpControlSignalPWM.newPWM:0.1 +TEST.EXPECTED:DialOutFlow.setDialOutPumpControlSignalPWM.newPWM:0.11 TEST.EXPECTED:uut_prototype_stubs.getDialInPumpPWMDutyCyclePct.init:0 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.env =================================================================== diff -u -rd55b4805e956fe6e15a55f48f1e30aed90f06cd8 -re38bc77d881536f690243db021b8c4c3d326f730 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.env (.../INT_MODETREATMENTPARAMS.env) (revision d55b4805e956fe6e15a55f48f1e30aed90f06cd8) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.env (.../INT_MODETREATMENTPARAMS.env) (revision e38bc77d881536f690243db021b8c4c3d326f730) @@ -2,6 +2,7 @@ ENVIRO.NAME:INT_MODETREATMENTPARAMS ENVIRO.STUB_BY_FUNCTION:AlarmMgmt ENVIRO.STUB_BY_FUNCTION:ModePostTreat +ENVIRO.STUB_BY_FUNCTION:ModeStandby ENVIRO.STUB_BY_FUNCTION:ModeTreatment ENVIRO.STUB_BY_FUNCTION:ModeTreatmentParams ENVIRO.STUB_BY_FUNCTION:OperationModes Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.tst =================================================================== diff -u -rd55b4805e956fe6e15a55f48f1e30aed90f06cd8 -re38bc77d881536f690243db021b8c4c3d326f730 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.tst (.../INT_MODETREATMENTPARAMS.tst) (revision d55b4805e956fe6e15a55f48f1e30aed90f06cd8) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS.tst (.../INT_MODETREATMENTPARAMS.tst) (revision e38bc77d881536f690243db021b8c4c3d326f730) @@ -2,7 +2,7 @@ -- Test Case Script -- -- Environment : INT_MODETREATMENTPARAMS --- Unit(s) Under Test: AlarmMgmt ModePostTreat ModeTreatment ModeTreatmentParams OperationModes SystemCommMessages +-- Unit(s) Under Test: AlarmMgmt ModePostTreat ModeStandby ModeTreatment ModeTreatmentParams OperationModes SystemCommMessages -- -- Script Features TEST.SCRIPT_FEATURE:C_DIRECT_ARRAY_INDEXING @@ -42,6 +42,25 @@ TEST.EXPECTED:ModePostTreat.<>.treatmentLogData.originUFVolume_L:15.0 TEST.END +-- Unit: ModeStandby + +-- Subprogram: handleStandbyModeWaitForTreatmentState + +-- Test Case: getTreatmentParameterS32DefaultValue +TEST.UNIT:ModeStandby +TEST.SUBPROGRAM:handleStandbyModeWaitForTreatmentState +TEST.NEW +TEST.NAME:getTreatmentParameterS32DefaultValue +TEST.STUB:SystemCommMessages.sendPressureLimitsChangeResponse +TEST.VALUE:ModeStandby.<>.treatStartReqReceived:1 +TEST.EXPECTED:ModeStandby.<>.treatStartReqReceived:0 +TEST.EXPECTED:SystemCommMessages.sendPressureLimitsChangeResponse.data[0].accepted:1 +TEST.EXPECTED:SystemCommMessages.sendPressureLimitsChangeResponse.data[0].rejReasonCode:0 +TEST.EXPECTED:SystemCommMessages.sendPressureLimitsChangeResponse.data[0].artPresLimitWindowmmHg:120 +TEST.EXPECTED:SystemCommMessages.sendPressureLimitsChangeResponse.data[0].venPresLimitWindowmmHg:100 +TEST.EXPECTED:SystemCommMessages.sendPressureLimitsChangeResponse.data[0].venPresLimitAsymmetricmmHg:20 +TEST.END + -- Unit: OperationModes -- Subprogram: execOperationModes Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS_cba.cvr =================================================================== diff -u -rd55b4805e956fe6e15a55f48f1e30aed90f06cd8 -re38bc77d881536f690243db021b8c4c3d326f730 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS_cba.cvr (.../INT_MODETREATMENTPARAMS_cba.cvr) (revision d55b4805e956fe6e15a55f48f1e30aed90f06cd8) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_MODETREATMENTPARAMS/INT_MODETREATMENTPARAMS_cba.cvr (.../INT_MODETREATMENTPARAMS_cba.cvr) (revision e38bc77d881536f690243db021b8c4c3d326f730) @@ -45,7 +45,7 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:11 -IMPORT.SOURCE.ORIG_FILENAME:ModeTreatment.c +IMPORT.SOURCE.ORIG_FILENAME:ModeStandby.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE @@ -67,7 +67,7 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:12 -IMPORT.SOURCE.ORIG_FILENAME:ModeTreatmentParams.c +IMPORT.SOURCE.ORIG_FILENAME:ModeTreatment.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE @@ -89,7 +89,7 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:13 -IMPORT.SOURCE.ORIG_FILENAME:OperationModes.c +IMPORT.SOURCE.ORIG_FILENAME:ModeTreatmentParams.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE @@ -111,7 +111,7 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:14 -IMPORT.SOURCE.ORIG_FILENAME:AlarmMgmt.c +IMPORT.SOURCE.ORIG_FILENAME:OperationModes.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function IMPORT.SOURCE.COVER_EMPTY_STATEMENTS:TRUE @@ -133,6 +133,28 @@ IMPORT.SOURCE.END IMPORT.SOURCE.BEGIN IMPORT.SOURCE.UNIT:15 +IMPORT.SOURCE.ORIG_FILENAME:AlarmMgmt.c +IMPORT.SOURCE.COVERAGE_STATUS:TRUE +IMPORT.SOURCE.COVERAGE_TYPE:Function +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:FALSE +IMPORT.SOURCE.HAS_LOGICAL_OPS_IN_PARAMETERS:FALSE +IMPORT.SOURCE.COVER_CONDITIONAL_OPERATOR:FALSE +IMPORT.SOURCE.HAS_CONDITIONAL_OPERATOR:FALSE +IMPORT.SOURCE.COVER_NESTED_CONDITIONAL_OPERATOR:FALSE +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.SOURCE.BEGIN +IMPORT.SOURCE.UNIT:16 IMPORT.SOURCE.ORIG_FILENAME:SystemCommMessages.c IMPORT.SOURCE.COVERAGE_STATUS:TRUE IMPORT.SOURCE.COVERAGE_TYPE:Function @@ -186,7 +208,7 @@ 2)S32 getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_T param ) Line # 683 RESULT.CBA.NOTES_END -RESULT.CBA.UNIT: /home/fw/workspace_hd/hdfirmware/firmware/App/Modes/ModeTreatmentParams.c +RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Modes/ModeTreatmentParams.c RESULT.CBA.FUNCTION: checkTreatmentParamsDependencies RESULT.CBA.LINE.BEGIN RESULT.CBA.LINE: 0 Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.tst =================================================================== diff -u -rd3c75dd5ffe14fa83d84b5eb991e8e6b03749b18 -re38bc77d881536f690243db021b8c4c3d326f730 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.tst (.../INT_PRESOCCL.tst) (revision d3c75dd5ffe14fa83d84b5eb991e8e6b03749b18) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL.tst (.../INT_PRESOCCL.tst) (revision e38bc77d881536f690243db021b8c4c3d326f730) @@ -82,8 +82,13 @@ TEST.NAME:handleRinsebackRunState_isSalineBagEmpty TEST.VALUE:BloodFlow.<>.ptr_etpwmBASE_t:<> TEST.VALUE:BloodFlow.<>.ptr_canBASE_t:<> +TEST.VALUE:PresOccl.<>.arterialPressure.data:-310.0 +TEST.VALUE:PresOccl.<>.arterialPressure.override:0 +TEST.VALUE:PresOccl.<>.emptySalineBagCtr:5 +TEST.VALUE:Rinseback.<>.rinsebackTargetVolume_mL:300.0 TEST.VALUE:Rinseback.handleRinsebackRunState.return:RINSEBACK_RUN_STATE -TEST.EXPECTED:Rinseback.handleRinsebackRunState.return:RINSEBACK_STOP_STATE +TEST.EXPECTED:uut_prototype_stubs.activateAlarm1Data.alarm:ALARM_ID_HD_EMPTY_SALINE_BAG +TEST.EXPECTED:Rinseback.handleRinsebackRunState.return:RINSEBACK_PAUSED_STATE TEST.END -- Unit: SelfTests Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL_cba.cvr =================================================================== diff -u -rd3c75dd5ffe14fa83d84b5eb991e8e6b03749b18 -re38bc77d881536f690243db021b8c4c3d326f730 --- vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL_cba.cvr (.../INT_PRESOCCL_cba.cvr) (revision d3c75dd5ffe14fa83d84b5eb991e8e6b03749b18) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_PRESOCCL/INT_PRESOCCL_cba.cvr (.../INT_PRESOCCL_cba.cvr) (revision e38bc77d881536f690243db021b8c4c3d326f730) @@ -346,7 +346,7 @@ 3) void updatePressureLimitWindows( void ) Line # 413 RESULT.CBA.NOTES_END -RESULT.CBA.UNIT: /home/fw/workspace_hd/hdfirmware/firmware/App/Controllers/PresOccl.c +RESULT.CBA.UNIT: /home/fw/wshd/hdfirmware/firmware/App/Controllers/PresOccl.c RESULT.CBA.FUNCTION: getLongFilteredVenousPressure RESULT.CBA.LINE.BEGIN RESULT.CBA.LINE: 0 Index: vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst =================================================================== diff -u -r4adbf3a2bfd90c8c19428cf077e619968b9999f6 -re38bc77d881536f690243db021b8c4c3d326f730 --- vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst (.../MODESTANDBY.tst) (revision 4adbf3a2bfd90c8c19428cf077e619968b9999f6) +++ vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst (.../MODESTANDBY.tst) (revision e38bc77d881536f690243db021b8c4c3d326f730) @@ -114,11 +114,15 @@ TEST.NEW TEST.NAME:execStandbyMode.005 TEST.IMPORT_FAILURES: -(I) @LINE: 168 - >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (I) @LINE: 172 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. +(I) @LINE: 176 + >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 168 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 172 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 164 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 168 @@ -182,11 +186,15 @@ TEST.NEW TEST.NAME:execStandbyMode.006 TEST.IMPORT_FAILURES: -(I) @LINE: 232 +(I) @LINE: 240 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 234 +(I) @LINE: 242 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 232 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 234 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 224 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 226 @@ -270,11 +278,15 @@ TEST.NEW TEST.NAME:execStandbyMode.008 TEST.IMPORT_FAILURES: -(I) @LINE: 316 +(I) @LINE: 328 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 319 +(I) @LINE: 331 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 316 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 319 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 304 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 307 @@ -337,11 +349,15 @@ TEST.NEW TEST.NAME:execStandbyMode.009 TEST.IMPORT_FAILURES: -(I) @LINE: 379 +(I) @LINE: 395 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 382 +(I) @LINE: 398 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 379 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 382 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 363 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 366 @@ -455,11 +471,15 @@ TEST.NEW TEST.NAME:execStandbyMode.012 TEST.IMPORT_FAILURES: -(I) @LINE: 493 +(I) @LINE: 513 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 497 +(I) @LINE: 517 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 493 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 497 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 473 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 477 @@ -2849,7 +2869,14 @@ TEST.END_NOTES: TEST.VALUE:ModeStandby.<>.treatStartReqReceived:1 TEST.VALUE:uut_prototype_stubs.getDGOpMode.return:DG_MODE_FAUL +TEST.VALUE:uut_prototype_stubs.getTreatmentParameterS32DefaultValue.return:120,100,20 TEST.EXPECTED:ModeStandby.<>.treatStartReqReceived:0 +TEST.EXPECTED:uut_prototype_stubs.getTreatmentParameterS32DefaultValue.param:TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW,TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW,TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC +TEST.EXPECTED:uut_prototype_stubs.sendPressureLimitsChangeResponse.data[0].accepted:1 +TEST.EXPECTED:uut_prototype_stubs.sendPressureLimitsChangeResponse.data[0].rejReasonCode:0 +TEST.EXPECTED:uut_prototype_stubs.sendPressureLimitsChangeResponse.data[0].artPresLimitWindowmmHg:120 +TEST.EXPECTED:uut_prototype_stubs.sendPressureLimitsChangeResponse.data[0].venPresLimitWindowmmHg:100 +TEST.EXPECTED:uut_prototype_stubs.sendPressureLimitsChangeResponse.data[0].venPresLimitAsymmetricmmHg:20 TEST.END -- Test Case: handleStandbyModeWaitForTreatmentState.003 Index: vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENTPARAMS/MODETREATMENTPARAMS.tst =================================================================== diff -u -r8de030b4b4c0057c01d00ddaa299fbd4f9b21418 -re38bc77d881536f690243db021b8c4c3d326f730 --- vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENTPARAMS/MODETREATMENTPARAMS.tst (.../MODETREATMENTPARAMS.tst) (revision 8de030b4b4c0057c01d00ddaa299fbd4f9b21418) +++ vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENTPARAMS/MODETREATMENTPARAMS.tst (.../MODETREATMENTPARAMS.tst) (revision e38bc77d881536f690243db021b8c4c3d326f730) @@ -847,6 +847,17 @@ TEST.EXPECTED:ModeTreatmentParams.getTreatmentParameterS32.return:1 TEST.END +-- Subprogram: getTreatmentParameterS32DefaultValue + +-- Test Case: getTreatmentParameterS32DefaultValue_Nominal +TEST.UNIT:ModeTreatmentParams +TEST.SUBPROGRAM:getTreatmentParameterS32DefaultValue +TEST.NEW +TEST.NAME:getTreatmentParameterS32DefaultValue_Nominal +TEST.VALUE:ModeTreatmentParams.getTreatmentParameterS32DefaultValue.param:TREATMENT_PARAM_TREATMENT_DURATION +TEST.EXPECTED:ModeTreatmentParams.getTreatmentParameterS32DefaultValue.return:240 +TEST.END + -- Subprogram: getTreatmentParameterU32 -- Test Case: getTreatmentParameterU32_Invalid