Index: vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst =================================================================== diff -u -r78a0fbeca0676223f72571022ca5210dabb4b1bf -rc0f6606729ee193a240c918e7af71b4d828cfdc5 --- vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst (.../MODESTANDBY.tst) (revision 78a0fbeca0676223f72571022ca5210dabb4b1bf) +++ vectorcast/Hercules_RM46_HD_Project/environment/MODESTANDBY/MODESTANDBY.tst (.../MODESTANDBY.tst) (revision c0f6606729ee193a240c918e7af71b4d828cfdc5) @@ -114,11 +114,15 @@ TEST.NEW TEST.NAME:execStandbyMode.005 TEST.IMPORT_FAILURES: -(I) @LINE: 196 - >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (I) @LINE: 200 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. +(I) @LINE: 204 + >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 196 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 200 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 192 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 196 @@ -210,11 +214,15 @@ TEST.NEW TEST.NAME:execStandbyMode.006 TEST.IMPORT_FAILURES: -(I) @LINE: 288 +(I) @LINE: 296 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 290 +(I) @LINE: 298 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 288 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 290 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 280 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 282 @@ -326,11 +334,15 @@ TEST.NEW TEST.NAME:execStandbyMode.008 TEST.IMPORT_FAILURES: -(I) @LINE: 400 +(I) @LINE: 412 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 403 +(I) @LINE: 415 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 400 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 403 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 388 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 391 @@ -421,11 +433,15 @@ TEST.NEW TEST.NAME:execStandbyMode.009 TEST.IMPORT_FAILURES: -(I) @LINE: 491 +(I) @LINE: 507 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 494 +(I) @LINE: 510 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 491 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 494 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 475 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 478 @@ -567,11 +583,15 @@ TEST.NEW TEST.NAME:execStandbyMode.012 TEST.IMPORT_FAILURES: -(I) @LINE: 633 +(I) @LINE: 653 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. -(I) @LINE: 637 +(I) @LINE: 657 >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. (E) Errors from previous script import(s) + >>> (I) @LINE: 633 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. + >>> (I) @LINE: 637 + >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 613 >>> >>> 'STANDBY_START_STATE' was specified as a macro, but it is in the symbol dictionary. >>> (I) @LINE: 617 @@ -3504,7 +3524,7 @@ TEST.VALUE:ModeStandby.isDGDisinfectValid.rejReason:<> TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatDisCompleteDateEpoch:4000 TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].isDGUsageInfoAvailable:1 -TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED +TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0 TEST.END @@ -3527,7 +3547,7 @@ TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatActiveCoolCompleteDateEpoch:<> TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].isDGUsageInfoAvailable:1 TEST.VALUE:uut_prototype_stubs.getRTCTimestamp.return:1900000 -TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED +TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0 TEST.END @@ -3540,7 +3560,7 @@ TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatActiveCoolCompleteDateEpoch:<> TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].isDGUsageInfoAvailable:1 TEST.VALUE:uut_prototype_stubs.getRTCTimestamp.return:10000000 -TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED +TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0 TEST.END @@ -3551,7 +3571,7 @@ TEST.NAME:isDGDisinfectValid.008 TEST.VALUE:ModeStandby.isDGDisinfectValid.rejReason:<> TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].isDGUsageInfoAvailable:1 -TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED +TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0 TEST.END @@ -3564,7 +3584,7 @@ TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastChemDisCompleteDateEpoch:10000 TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatDisCompleteDateEpoch:0 TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].isDGUsageInfoAvailable:1 -TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED +TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_NONE TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0 TEST.END @@ -3612,7 +3632,7 @@ TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[10]:0 TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[11]:0 TEST.VALUE:uut_prototype_stubs.getNVRecord2Driver.bufferAddress[12]:0 -TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED +TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0 TEST.END @@ -3721,6 +3741,20 @@ TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0 TEST.END +-- Test Case: isDGDisinfectValid_rej_reason_disinfect_expired +TEST.UNIT:ModeStandby +TEST.SUBPROGRAM:isDGDisinfectValid +TEST.NEW +TEST.NAME:isDGDisinfectValid_rej_reason_disinfect_expired +TEST.VALUE:ModeStandby.isDGDisinfectValid.rejReason:<> +TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastChemDisFlushCompleteDateEpoch:10000 +TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].dgUsageInfo.lastHeatDisCompleteDateEpoch:0 +TEST.VALUE:uut_prototype_stubs.getHDVersionDGServiceAndUsageData.data[0].isDGUsageInfoAvailable:1 +TEST.VALUE:uut_prototype_stubs.getRTCTimestamp.return:10000000 +TEST.EXPECTED:ModeStandby.isDGDisinfectValid.rejReason[0]:REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED +TEST.EXPECTED:ModeStandby.isDGDisinfectValid.return:0 +TEST.END + -- Subprogram: setRequestedCleaningMode -- Test Case: setRequestedCleaningMode.001