Index: vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE.tst =================================================================== diff -u -r202a7e6c312e5dc5b85c0d2a30689c6d35a4358b -r79a7ca3ade4d31c331a24695887c2220684cafff --- vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE.tst (.../DGINTERFACE.tst) (revision 202a7e6c312e5dc5b85c0d2a30689c6d35a4358b) +++ vectorcast/Hercules_RM46_HD_Project/environment/DGINTERFACE/DGINTERFACE.tst (.../DGINTERFACE.tst) (revision 79a7ca3ade4d31c331a24695887c2220684cafff) @@ -669,9 +669,9 @@ TEST.NOTES: No branches in subprogram TEST.END_NOTES: -TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.VALUE:uut_prototype_stubs.sendDGParkConcentratePumpsCommand.return:1 -TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.END -- Subprogram: cmdDGSampleWater @@ -767,7 +767,9 @@ TEST.NOTES: No branches in subprogram TEST.END_NOTES: +TEST.VALUE:DGInterface.<>.dgSubMode:1 TEST.VALUE:uut_prototype_stubs.sendDGServiceModeRequest.return:1 +TEST.EXPECTED:DGInterface.<>.dgSubMode:1 TEST.END -- Subprogram: cmdStartDG @@ -804,9 +806,9 @@ TEST.NOTES: No branches in subprogram TEST.END_NOTES: -TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.VALUE:uut_prototype_stubs.sendDGStartStopChemicalDisinfectFlushModeCommand.start:1 -TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.EXPECTED:uut_prototype_stubs.sendDGStartStopChemicalDisinfectFlushModeCommand.start:1 TEST.END @@ -829,7 +831,7 @@ >>> >>> Unknown parameter/object name drainToVolumeMl >>> >>> Value Line Error - Command Ignored TEST.END_IMPORT_FAILURES: -TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.VALUE:DGInterface.cmdStartDGDrain.drainToVolMl:100 TEST.VALUE:DGInterface.cmdStartDGDrain.tareLoadCell:0 TEST.VALUE:DGInterface.cmdStartDGDrain.rinse:0 @@ -844,11 +846,33 @@ -- Subprogram: cmdStartDGFill --- Test Case: cmdStartDGFill +-- Test Case: cmdStartDGFill_all_false TEST.UNIT:DGInterface TEST.SUBPROGRAM:cmdStartDGFill TEST.NEW -TEST.NAME:cmdStartDGFill +TEST.NAME:cmdStartDGFill_all_false +TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV +TEST.VALUE:DGInterface.cmdStartDGFill.fillToVolMl:1700 +TEST.VALUE:uut_prototype_stubs.isAlarmActive.return:1 +TEST.EXPECTED:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV +TEST.END + +-- Test Case: cmdStartDGFill_first_true_second_false +TEST.UNIT:DGInterface +TEST.SUBPROGRAM:cmdStartDGFill +TEST.NEW +TEST.NAME:cmdStartDGFill_first_true_second_false +TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV +TEST.VALUE:DGInterface.cmdStartDGFill.fillToVolMl:1700 +TEST.VALUE:uut_prototype_stubs.isAlarmActive.return:0,1 +TEST.EXPECTED:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV +TEST.END + +-- Test Case: cmdStartDGFill_start_fill +TEST.UNIT:DGInterface +TEST.SUBPROGRAM:cmdStartDGFill +TEST.NEW +TEST.NAME:cmdStartDGFill_start_fill TEST.IMPORT_FAILURES: (E) Errors from previous script import(s) >>> (E) @LINE: 681 TEST.VALUE:DGInterface.<>.dgReservoirFillVolumeTargetSet:0 @@ -896,9 +920,9 @@ TEST.NOTES: No branches in subprogram TEST.END_NOTES: -TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.VALUE:uut_prototype_stubs.sendDGStartStopDGROPermeateSampleModeCommand.start:0 -TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.EXPECTED:uut_prototype_stubs.sendDGStartStopDGROPermeateSampleModeCommand.start:1 TEST.END @@ -939,9 +963,9 @@ TEST.NOTES: No branches in subprogram TEST.END_NOTES: -TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.VALUE:uut_prototype_stubs.sendDGStopActiveCoolModeCommand.return:1 -TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.END -- Subprogram: cmdStopDGChemFlushDisinfect @@ -952,9 +976,11 @@ TEST.NEW TEST.NAME:cmdStopDGChemFlushDisinfect.001 TEST.IMPORT_FAILURES: -(I) @LINE: 904 +(I) @LINE: 977 >>> 'DG_CMD_NONE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 904 + >>> >>> 'DG_CMD_NONE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 788 >>> >>> 'DG_CMD_NONE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 785 @@ -1004,12 +1030,12 @@ >>> >>> Unknown parameter/object name dgReservoirFillVolumeTargetSet >>> >>> Value Line Error - Command Ignored TEST.END_IMPORT_FAILURES: -TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE -TEST.VALUE:uut_prototype_stubs.sendDGFillCommand.cmd:DG_CMD_STOP +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE +TEST.VALUE:uut_prototype_stubs.sendDGFillCommand.cmd:MACRO=DG_CMD_STOP TEST.VALUE:uut_prototype_stubs.sendDGFillCommand.fillToVolumeMl:0 TEST.VALUE:uut_prototype_stubs.sendDGFillCommand.targetFlowRateLPM:0.0 -TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE -TEST.EXPECTED:uut_prototype_stubs.sendDGFillCommand.cmd:DG_CMD_STOP +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE +TEST.EXPECTED:uut_prototype_stubs.sendDGFillCommand.cmd:MACRO=DG_CMD_STOP TEST.EXPECTED:uut_prototype_stubs.sendDGFillCommand.fillToVolumeMl:0 TEST.EXPECTED:uut_prototype_stubs.sendDGFillCommand.targetFlowRateLPM:0.0 TEST.END @@ -1047,9 +1073,9 @@ TEST.NOTES: No branches in subprogram TEST.END_NOTES: -TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.VALUE:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.VALUE:uut_prototype_stubs.sendDGStartStopDGROPermeateSampleModeCommand.start:1 -TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:DG_CMD_NONE +TEST.EXPECTED:DGInterface.<>.dgCmdResp[DG_CMD_SWITCH_RESERVOIR].commandID:MACRO=DG_CMD_NONE TEST.EXPECTED:uut_prototype_stubs.sendDGStartStopDGROPermeateSampleModeCommand.start:0 TEST.END @@ -1212,7 +1238,7 @@ TEST.STUB:DGInterface.setDGOpMode TEST.STUB:DGInterface.checkDGRestart TEST.VALUE:DGInterface.checkDGDataFreshness.alarmID:ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE -TEST.VALUE:DGInterface.setDGOpMode.opMode:DG_MODE_FAUL +TEST.VALUE:DGInterface.setDGOpMode.opMode:MACRO=DG_MODE_FAUL TEST.VALUE:DGInterface.setDGOpMode.subMode:0 TEST.VALUE:uut_prototype_stubs.isAlarmActive.return:1 TEST.EXPECTED:DGInterface.checkDGDataFreshness.alarmID:ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE,ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE,ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE,ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE @@ -1463,7 +1489,9 @@ TEST.NOTES: No branches in subprogram TEST.END_NOTES: +TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV TEST.VALUE:DGInterface.getHDVersionDGServiceAndUsageData.data:<> +TEST.EXPECTED:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV TEST.END -- Subprogram: getHeatDisinfectTemperatureSensorValue @@ -2007,7 +2035,9 @@ TEST.NOTES: No branches in subprogram TEST.END_NOTES: +TEST.VALUE:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV TEST.VALUE:DGInterface.setDGHeatersData.data:<> +TEST.EXPECTED:DGInterface.<>.dgCurrentOpMode:DG_MODE_SERV TEST.END -- Subprogram: setDGMixingRatios