Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_DGINTERFACE/INT_DGINTERFACE.tst =================================================================== diff -u -rd42968295e43a4abc55e69df487151905adf79e5 -rd9ace5f885dbba0c33199b9deee1917c0470f1fd --- vectorcast/Hercules_RM46_HD_Project/environment/INT_DGINTERFACE/INT_DGINTERFACE.tst (.../INT_DGINTERFACE.tst) (revision d42968295e43a4abc55e69df487151905adf79e5) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_DGINTERFACE/INT_DGINTERFACE.tst (.../INT_DGINTERFACE.tst) (revision d9ace5f885dbba0c33199b9deee1917c0470f1fd) @@ -345,7 +345,7 @@ TEST.VALUE:uut_prototype_stubs.isDGCommunicating.return:1 TEST.VALUE:uut_prototype_stubs.isBatteryCharged.return:1 TEST.VALUE:uut_prototype_stubs.isPOSTPassed.return:1 -TEST.VALUE:uut_prototype_stubs.getDGVersion.return.compatibilityRev:SW_COMPATIBILITY_REV +TEST.VALUE:uut_prototype_stubs.getDGVersion.return.compatibilityRev:MACRO=SW_COMPATIBILITY_REV TEST.VALUE:ModeStandby.<>.currentStandbyState:STANDBY_WAIT_FOR_TREATMENT_STATE TEST.VALUE:ModeStandby.signalUserInitiateTreatment.return:0 TEST.VALUE:ModeStandby.isDGDisinfectValid.return:1 @@ -364,6 +364,8 @@ TEST.NAME:broadcastTreatmentPeriodicData_getDialysateTemperature TEST.VALUE:DGInterface.<>.dgDialysateTemp:35.0 TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:1005 +TEST.VALUE:Dialysis.<>.currentDialysisState:DIALYSIS_START_STATE +TEST.VALUE:ModeTreatment.<>.currentTreatmentState:TREATMENT_DIALYSIS_STATE TEST.VALUE:ModeTreatment.<>.treatmentDialysateTempTotal_degree_C:35.0 TEST.EXPECTED:ModeTreatment.<>.treatmentDialysateTempTotal_degree_C:70.0 TEST.END Index: vectorcast/Hercules_RM46_HD_Project/environment/INT_NVDATAMGMT/INT_NVDATAMGMT.tst =================================================================== diff -u -rd70e51a4923a1815042e579c78b585b9f987a5df -rd9ace5f885dbba0c33199b9deee1917c0470f1fd --- vectorcast/Hercules_RM46_HD_Project/environment/INT_NVDATAMGMT/INT_NVDATAMGMT.tst (.../INT_NVDATAMGMT.tst) (revision d70e51a4923a1815042e579c78b585b9f987a5df) +++ vectorcast/Hercules_RM46_HD_Project/environment/INT_NVDATAMGMT/INT_NVDATAMGMT.tst (.../INT_NVDATAMGMT.tst) (revision d9ace5f885dbba0c33199b9deee1917c0470f1fd) @@ -80,7 +80,7 @@ TEST.VALUE:uut_prototype_stubs.isDGCommunicating.return:1 TEST.VALUE:ModeStandby.<>.currentStandbyState:STANDBY_WAIT_FOR_DISINFECT_STATE TEST.VALUE:OperationModes.<>.currentMode:MODE_STAN -TEST.EXPECTED:ModeStandby.signalUserInitiateChemicalDisinfectMode.return:0 +TEST.EXPECTED:ModeStandby.signalUserInitiateChemicalDisinfectMode.return:1 TEST.END -- Unit: ModeTreatment Index: vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENT/MODETREATMENT.tst =================================================================== diff -u -rd70e51a4923a1815042e579c78b585b9f987a5df -rd9ace5f885dbba0c33199b9deee1917c0470f1fd --- vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENT/MODETREATMENT.tst (.../MODETREATMENT.tst) (revision d70e51a4923a1815042e579c78b585b9f987a5df) +++ vectorcast/Hercules_RM46_HD_Project/environment/MODETREATMENT/MODETREATMENT.tst (.../MODETREATMENT.tst) (revision d9ace5f885dbba0c33199b9deee1917c0470f1fd) @@ -120,6 +120,111 @@ TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.endMSCount:0 TEST.END +-- Test Case: broadcastTreatmentPeriodicData_in_treatment_and_not_saline_bolus +TEST.UNIT:ModeTreatment +TEST.SUBPROGRAM:broadcastTreatmentPeriodicData +TEST.NEW +TEST.NAME:broadcastTreatmentPeriodicData_in_treatment_and_not_saline_bolus +TEST.NOTES: +This is an automatically generated test case. + Test Path 2 + (1) if (timeElapsedSinceLastCollect_ms >= TREATMENT_PERIODIC_DATA_LOG_INTERVAL) ==> 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.VALUE:ModeTreatment.<>.currentTreatmentState:TREATMENT_DIALYSIS_STATE +TEST.VALUE:ModeTreatment.<>.treatmentTimeMS:0 +TEST.VALUE:ModeTreatment.<>.lastTreatmentPeriodicDataCollectTimeStamp:0 +TEST.VALUE:ModeTreatment.<>.lastUltraFiltrationVolume_mL:0.0 +TEST.VALUE:ModeTreatment.<>.bloodFlowRateSum_mL_min:0.0 +TEST.VALUE:ModeTreatment.<>.dialysateFlowRateSum_mL_min:0.0 +TEST.VALUE:ModeTreatment.<>.arterialPressureSum_mmHg:0.0 +TEST.VALUE:ModeTreatment.<>.venousPressureSum_mmHg:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentBloodFlowRateTotal_mL_min:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentDialysateFlowRateTotal_mL_min:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentDialysateTempTotal_degree_C:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentArterialPressureTotal_mmHg:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentVenousPressureTotal_mmHg:0.0 +TEST.VALUE:ModeTreatment.<>.sendLastTreatmentPeriodicData:0 +TEST.VALUE:uut_prototype_stubs.getMeasuredBloodFlowRate.return:0.0 +TEST.VALUE:uut_prototype_stubs.getDialysateTemperature.return:0.0 +TEST.VALUE:uut_prototype_stubs.getMeasuredDialInFlowRate.return:0.0 +TEST.VALUE:uut_prototype_stubs.getUltrafiltrationVolumeCollected.return:0.0 +TEST.VALUE:uut_prototype_stubs.getFilteredArterialPressure.return:0.0 +TEST.VALUE:uut_prototype_stubs.getFilteredVenousPressure.return:0.0 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.startMSCount:0 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.endMSCount:0 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:<> +TEST.EXPECTED:ModeTreatment.<>.lastTreatmentPeriodicDataCollectTimeStamp:0 +TEST.EXPECTED:ModeTreatment.<>.lastUltraFiltrationVolume_mL:0.0 +TEST.EXPECTED:ModeTreatment.<>.bloodFlowRateSum_mL_min:0.0 +TEST.EXPECTED:ModeTreatment.<>.dialysateFlowRateSum_mL_min:0.0 +TEST.EXPECTED:ModeTreatment.<>.arterialPressureSum_mmHg:0.0 +TEST.EXPECTED:ModeTreatment.<>.venousPressureSum_mmHg:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentBloodFlowRateTotal_mL_min:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentDialysateFlowRateTotal_mL_min:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentDialysateTempTotal_degree_C:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentArterialPressureTotal_mmHg:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentVenousPressureTotal_mmHg:0.0 +TEST.EXPECTED:ModeTreatment.<>.sendLastTreatmentPeriodicData:0 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.startMSCount:0 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.endMSCount:0 +TEST.END + +-- Test Case: broadcastTreatmentPeriodicData_in_treatment_and_saline_bolus +TEST.UNIT:ModeTreatment +TEST.SUBPROGRAM:broadcastTreatmentPeriodicData +TEST.NEW +TEST.NAME:broadcastTreatmentPeriodicData_in_treatment_and_saline_bolus +TEST.NOTES: +This is an automatically generated test case. + Test Path 2 + (1) if (timeElapsedSinceLastCollect_ms >= TREATMENT_PERIODIC_DATA_LOG_INTERVAL) ==> 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.VALUE:ModeTreatment.<>.currentTreatmentState:TREATMENT_DIALYSIS_STATE +TEST.VALUE:ModeTreatment.<>.treatmentTimeMS:0 +TEST.VALUE:ModeTreatment.<>.lastTreatmentPeriodicDataCollectTimeStamp:0 +TEST.VALUE:ModeTreatment.<>.lastUltraFiltrationVolume_mL:0.0 +TEST.VALUE:ModeTreatment.<>.bloodFlowRateSum_mL_min:0.0 +TEST.VALUE:ModeTreatment.<>.dialysateFlowRateSum_mL_min:0.0 +TEST.VALUE:ModeTreatment.<>.arterialPressureSum_mmHg:0.0 +TEST.VALUE:ModeTreatment.<>.venousPressureSum_mmHg:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentBloodFlowRateTotal_mL_min:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentDialysateFlowRateTotal_mL_min:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentDialysateTempTotal_degree_C:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentArterialPressureTotal_mmHg:0.0 +TEST.VALUE:ModeTreatment.<>.treatmentVenousPressureTotal_mmHg:0.0 +TEST.VALUE:ModeTreatment.<>.sendLastTreatmentPeriodicData:0 +TEST.VALUE:uut_prototype_stubs.getMeasuredBloodFlowRate.return:0.0 +TEST.VALUE:uut_prototype_stubs.getDialysateTemperature.return:0.0 +TEST.VALUE:uut_prototype_stubs.getMeasuredDialInFlowRate.return:0.0 +TEST.VALUE:uut_prototype_stubs.getDialysisState.return:DIALYSIS_SALINE_BOLUS_STATE +TEST.VALUE:uut_prototype_stubs.getUltrafiltrationVolumeCollected.return:0.0 +TEST.VALUE:uut_prototype_stubs.getFilteredArterialPressure.return:0.0 +TEST.VALUE:uut_prototype_stubs.getFilteredVenousPressure.return:0.0 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.startMSCount:0 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.endMSCount:0 +TEST.VALUE:uut_prototype_stubs.calcTimeBetween.return:<> +TEST.EXPECTED:ModeTreatment.<>.lastTreatmentPeriodicDataCollectTimeStamp:0 +TEST.EXPECTED:ModeTreatment.<>.lastUltraFiltrationVolume_mL:0.0 +TEST.EXPECTED:ModeTreatment.<>.bloodFlowRateSum_mL_min:0.0 +TEST.EXPECTED:ModeTreatment.<>.dialysateFlowRateSum_mL_min:0.0 +TEST.EXPECTED:ModeTreatment.<>.arterialPressureSum_mmHg:0.0 +TEST.EXPECTED:ModeTreatment.<>.venousPressureSum_mmHg:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentBloodFlowRateTotal_mL_min:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentDialysateFlowRateTotal_mL_min:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentDialysateTempTotal_degree_C:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentArterialPressureTotal_mmHg:0.0 +TEST.EXPECTED:ModeTreatment.<>.treatmentVenousPressureTotal_mmHg:0.0 +TEST.EXPECTED:ModeTreatment.<>.sendLastTreatmentPeriodicData:0 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.startMSCount:0 +TEST.EXPECTED:uut_prototype_stubs.calcTimeBetween.endMSCount:0 +TEST.END + -- Subprogram: broadcastTreatmentSettingsRanges -- Test Case: broadcastTreatmentSettingsRanges.001 @@ -157,7 +262,7 @@ TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.minUFVol:0.0 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxUFVol:8000.0 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.minDialRate:100 -TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxDialRate:600 +TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxDialRate:100 TEST.END -- Test Case: broadcastTreatmentSettingsRanges.003 @@ -232,7 +337,7 @@ TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.minUFVol:0.0 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxUFVol:8000.0 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.minDialRate:100 -TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxDialRate:600 +TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxDialRate:100 TEST.END -- Test Case: broadcastTreatmentSettingsRanges_TimeToBroadcast_1HrDuration @@ -504,7 +609,7 @@ TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxTime:480 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxUFVol:8000.0 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.minDialRate:100 -TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxDialRate:357 +TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxDialRate:384 TEST.END -- Test Case: broadcastTreatmentSettingsRanges_TimeToBroadcast_7HrDuration_100Dial @@ -550,7 +655,7 @@ TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxTime:480 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxUFVol:8000.0 TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.minDialRate:100 -TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxDialRate:357 +TEST.EXPECTED:uut_prototype_stubs.sendTreatmentParamsRangesToUI.maxDialRate:384 TEST.END -- Test Case: broadcastTreatmentSettingsRanges_TimeToBroadcast_ZeroUF @@ -3957,9 +4062,11 @@ TEST.NEW TEST.NAME:verifyUFSettingsConfirmation_ConfirmationTimeout TEST.IMPORT_FAILURES: -(I) @LINE: 4060 +(I) @LINE: 4062 >>> 'UF_ADJ_UF_RATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 4060 + >>> >>> 'UF_ADJ_UF_RATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 4058 >>> >>> 'UF_ADJ_UF_RATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 4056 @@ -4082,9 +4189,11 @@ TEST.NEW TEST.NAME:verifyUFSettingsConfirmation_NotInTreatmentMode TEST.IMPORT_FAILURES: -(I) @LINE: 4183 +(I) @LINE: 4187 >>> 'UF_ADJ_UF_RATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 4183 + >>> >>> 'UF_ADJ_UF_RATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 4179 >>> >>> 'UF_ADJ_UF_RATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 4175 Index: vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst =================================================================== diff -u -r21e16693d7682f32f952a6c888efc0a3658df11e -rd9ace5f885dbba0c33199b9deee1917c0470f1fd --- vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst (.../RESERVOIRS.tst) (revision 21e16693d7682f32f952a6c888efc0a3658df11e) +++ vectorcast/Hercules_RM46_HD_Project/environment/RESERVOIRS/RESERVOIRS.tst (.../RESERVOIRS.tst) (revision d9ace5f885dbba0c33199b9deee1917c0470f1fd) @@ -626,9 +626,11 @@ TEST.NEW TEST.NAME:handleReservoirMgmtFillState_DoneFilling TEST.IMPORT_FAILURES: -(I) @LINE: 639 +(I) @LINE: 643 >>> 'DG_GEN_IDLE_MODE_STATE_FLUSH_WATER' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 639 + >>> >>> 'DG_GEN_IDLE_MODE_STATE_FLUSH_WATER' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 645 >>> >>> 'DG_GEN_IDLE_MODE_STATE_FLUSH_WATER' was specified as a macro, but it is in the symbol dictionary. >>> (E) @LINE: 646 TEST.VALUE:Reservoirs.<>.recirculationLevelPct:1.0 @@ -865,6 +867,23 @@ TEST.EXPECTED:Reservoirs.handleReservoirMgmtWaitForFillSettleState.return:TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE TEST.END +-- Test Case: handleReservoirMgmtWaitForFillSettleState_reservoir_weight_active +TEST.UNIT:Reservoirs +TEST.SUBPROGRAM:handleReservoirMgmtWaitForFillSettleState +TEST.NEW +TEST.NAME:handleReservoirMgmtWaitForFillSettleState_reservoir_weight_active +TEST.STUB:Reservoirs.isDialysateTempAlarmActive +TEST.VALUE:Reservoirs.<>.dilutionLevelPct:1.0 +TEST.VALUE:Reservoirs.handleReservoirMgmtWaitForFillSettleState.return:TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE +TEST.VALUE:Reservoirs.isDialysateTempAlarmActive.return:0 +TEST.VALUE:uut_prototype_stubs.isAlarmActive.alarm:ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE +TEST.VALUE:uut_prototype_stubs.isAlarmActive.return:1 +TEST.VALUE:uut_prototype_stubs.getDGActiveReservoir.return:NUM_OF_DG_RESERVOIRS +TEST.VALUE:uut_prototype_stubs.getDGInactiveReservoir.return:NUM_OF_DG_RESERVOIRS +TEST.VALUE:uut_prototype_stubs.didTimeout.return:1 +TEST.EXPECTED:Reservoirs.handleReservoirMgmtWaitForFillSettleState.return:TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE +TEST.END + -- Subprogram: handleReservoirMgmtWaitForSwitchSettleState -- Test Case: handleReservoirMgmtWaitForSwitchSettleState.001