Index: vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.env
===================================================================
diff -u -r1760616331f8dbf20f80bd9ec1cfaba01134b8f7 -r96344ec7d442efbcc3f1917d523b5e02c7324003
--- vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.env	(.../NVDATAMGMT.env)	(revision 1760616331f8dbf20f80bd9ec1cfaba01134b8f7)
+++ vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.env	(.../NVDATAMGMT.env)	(revision 96344ec7d442efbcc3f1917d523b5e02c7324003)
@@ -5,4 +5,27 @@
 ENVIRO.STUB: ALL_BY_PROTOTYPE
 ENVIRO.TYPE_HANDLED_DIRS_ALLOWED:
 ENVIRO.LIBRARY_STUBS:
+ENVIRO.UNIT_PREFIX_USER_CODE:
+ENVIRO.UNIT_PREFIX_USER_CODE_FILE:NVDataMgmt
+#include "F021.h"
+
+//_Bool FSMStatus;
+uint8_t FSMStatus;
+#undef FAPI_CHECK_FSM_READY_BUSY
+#define FAPI_CHECK_FSM_READY_BUSY FSMStatus 
+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)/FWCommon/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/Common/
+ENVIRO.SEARCH_LIST: $(VCAST_SRC_DIR)/FWCommon/FlashDriver/
 ENVIRO.END
Index: vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.tst
===================================================================
diff -u -r01c0eb4c57c9ac7609ad32526bbbe8c87e2c8534 -r96344ec7d442efbcc3f1917d523b5e02c7324003
--- vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.tst	(.../NVDATAMGMT.tst)	(revision 01c0eb4c57c9ac7609ad32526bbbe8c87e2c8534)
+++ vectorcast/Hercules_RM46_HD_Project/environment/NVDATAMGMT/NVDATAMGMT.tst	(.../NVDATAMGMT.tst)	(revision 96344ec7d442efbcc3f1917d523b5e02c7324003)
@@ -145,6 +145,24 @@
 
 -- Subprogram: execNVDataMgmt
 
+-- Test Case: Default
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:execNVDataMgmt
+TEST.NEW
+TEST.NAME:Default
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NUM_OF_NVDATAMGMT_EXEC_STATES
+TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
+-- Test Case: Erase_EEPROM
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:execNVDataMgmt
+TEST.NEW
+TEST.NAME:Erase_EEPROM
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_ERASE_EEPROM
+TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_ERASE_EEPROM
+TEST.END
+
 -- Test Case: Idle
 TEST.UNIT:NVDataMgmt
 TEST.SUBPROGRAM:execNVDataMgmt
@@ -154,15 +172,25 @@
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_IDLE
 TEST.END
 
--- Test Case: Idle.001
+-- Test Case: Read_From_EEPROM
 TEST.UNIT:NVDataMgmt
 TEST.SUBPROGRAM:execNVDataMgmt
 TEST.NEW
-TEST.NAME:Idle.001
-TEST.VALUE:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM
-TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM
+TEST.NAME:Read_From_EEPROM
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM
+TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM
 TEST.END
 
+-- Test Case: Read_From_RTC
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:execNVDataMgmt
+TEST.NEW
+TEST.NAME:Read_From_RTC
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.currentJob.externalAddress:<<malloc 1>>
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_READ_FROM_RTC
+TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
 -- Test Case: Wait_For_POST
 TEST.UNIT:NVDataMgmt
 TEST.SUBPROGRAM:execNVDataMgmt
@@ -173,6 +201,24 @@
 TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_WAIT_FOR_POST
 TEST.END
 
+-- Test Case: Write_To_EEPROM
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:execNVDataMgmt
+TEST.NEW
+TEST.NAME:Write_To_EEPROM
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM
+TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM
+TEST.END
+
+-- Test Case: Write_To_RTC
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:execNVDataMgmt
+TEST.NEW
+TEST.NAME:Write_To_RTC
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC
+TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtExecState:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
 -- Subprogram: execNVDataMgmtSelfTest
 
 -- Test Case: Enable_EEPROM
@@ -186,6 +232,17 @@
 TEST.EXPECTED:NVDataMgmt.execNVDataMgmtSelfTest.return:SELF_TEST_STATUS_IN_PROGRESS
 TEST.END
 
+-- Test Case: Enable_EEPROM.001
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:execNVDataMgmtSelfTest
+TEST.NEW
+TEST.NAME:Enable_EEPROM.001
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.NVDataMgmtSelfTestState:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.VALUE:NVDataMgmt.execNVDataMgmtSelfTest.return:SELF_TEST_STATUS_IN_PROGRESS
+TEST.EXPECTED:NVDataMgmt.<<GLOBAL>>.NVDataMgmtSelfTestState:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.EXPECTED:NVDataMgmt.execNVDataMgmtSelfTest.return:SELF_TEST_STATUS_IN_PROGRESS
+TEST.END
+
 -- Test Case: Test_Start
 TEST.UNIT:NVDataMgmt
 TEST.SUBPROGRAM:execNVDataMgmtSelfTest
@@ -423,17 +480,39 @@
 
 -- Subprogram: handleExecEraseState
 
--- Test Case: handleExecEraseState.001
+-- Test Case: FSM_Busy_No_Timeout
 TEST.UNIT:NVDataMgmt
 TEST.SUBPROGRAM:handleExecEraseState
 TEST.NEW
-TEST.NAME:handleExecEraseState.001
-TEST.VALUE:NVDataMgmt.<<GLOBAL>>.hasCommandTimedout:1
+TEST.NAME:FSM_Busy_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
 TEST.VALUE:NVDataMgmt.handleExecEraseState.return:NVDATAMGMT_EXEC_STATE_ERASE_EEPROM
-TEST.VALUE:uut_prototype_stubs.Fapi_enableEepromBankSectors.return:Fapi_Status_FsmReady
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
 TEST.EXPECTED:NVDataMgmt.handleExecEraseState.return:NVDATAMGMT_EXEC_STATE_ERASE_EEPROM
 TEST.END
 
+-- Test Case: FSM_Busy_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecEraseState
+TEST.NEW
+TEST.NAME:FSM_Busy_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
+TEST.VALUE:NVDataMgmt.handleExecEraseState.return:NVDATAMGMT_EXEC_STATE_ERASE_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleExecEraseState.return:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
+-- Test Case: FSM_Ready_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecEraseState
+TEST.NEW
+TEST.NAME:FSM_Ready_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:2
+TEST.VALUE:NVDataMgmt.handleExecEraseState.return:NVDATAMGMT_EXEC_STATE_ERASE_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleExecEraseState.return:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
 -- Subprogram: handleExecIdleState
 
 -- Test Case: Default
@@ -442,6 +521,7 @@
 TEST.NEW
 TEST.NAME:Default
 TEST.VALUE:NVDataMgmt.handleExecIdleState.return:NUM_OF_NVDATAMGMT_EXEC_STATES
+TEST.EXPECTED:NVDataMgmt.handleExecIdleState.return:NVDATAMGMT_EXEC_STATE_IDLE
 TEST.END
 
 -- Test Case: Queue_Empty
@@ -532,7 +612,7 @@
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.queueCount:1
 TEST.VALUE:NVDataMgmt.handleExecIdleState.return:NVDATAMGMT_EXEC_STATE_IDLE
 TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_BUSY
-TEST.EXPECTED:NVDataMgmt.handleExecIdleState.return:NVDATAMGMT_EXEC_STATE_READ_FROM_RTC
+TEST.EXPECTED:NVDataMgmt.handleExecIdleState.return:NVDATAMGMT_EXEC_STATE_IDLE
 TEST.END
 
 -- Test Case: Queue_Not_Empty_Read_RTC_Ready
@@ -571,7 +651,7 @@
 TEST.VALUE:NVDataMgmt.<<GLOBAL>>.queueCount:1
 TEST.VALUE:NVDataMgmt.handleExecIdleState.return:NVDATAMGMT_EXEC_STATE_IDLE
 TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_BUSY
-TEST.EXPECTED:NVDataMgmt.handleExecIdleState.return:NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC
+TEST.EXPECTED:NVDataMgmt.handleExecIdleState.return:NVDATAMGMT_EXEC_STATE_IDLE
 TEST.END
 
 -- Test Case: Queue_Not_Empty_Write_RTC_Ready
@@ -587,6 +667,43 @@
 TEST.EXPECTED:NVDataMgmt.handleExecIdleState.return:NVDATAMGMT_EXEC_STATE_WRITE_TO_RTC
 TEST.END
 
+-- Subprogram: handleExecReadFromEEPROMState
+
+-- Test Case: FSM_Busy_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecReadFromEEPROMState
+TEST.NEW
+TEST.NAME:FSM_Busy_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
+TEST.VALUE:NVDataMgmt.handleExecReadFromEEPROMState.return:NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleExecReadFromEEPROMState.return:NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM
+TEST.END
+
+-- Test Case: FSM_Busy_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecReadFromEEPROMState
+TEST.NEW
+TEST.NAME:FSM_Busy_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.currentJob.externalAddress:<<malloc 1>>
+TEST.VALUE:NVDataMgmt.handleExecReadFromEEPROMState.return:NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleExecReadFromEEPROMState.return:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
+-- Test Case: FSM_Ready_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecReadFromEEPROMState
+TEST.NEW
+TEST.NAME:FSM_Ready_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:2
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.currentJob.externalAddress:<<malloc 1>>
+TEST.VALUE:NVDataMgmt.handleExecReadFromEEPROMState.return:NVDATAMGMT_EXEC_STATE_READ_FROM_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleExecReadFromEEPROMState.return:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
 -- Subprogram: handleExecWaitForPostState
 
 -- Test Case: Self_Test_Complete
@@ -609,6 +726,41 @@
 TEST.EXPECTED:NVDataMgmt.handleExecWaitForPostState.return:NVDATAMGMT_EXEC_STATE_WAIT_FOR_POST
 TEST.END
 
+-- Subprogram: handleExecWriteToEEPROMState
+
+-- Test Case: FSM_Busy_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecWriteToEEPROMState
+TEST.NEW
+TEST.NAME:FSM_Busy_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
+TEST.VALUE:NVDataMgmt.handleExecWriteToEEPROMState.return:NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleExecWriteToEEPROMState.return:NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM
+TEST.END
+
+-- Test Case: FSM_Busy_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecWriteToEEPROMState
+TEST.NEW
+TEST.NAME:FSM_Busy_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
+TEST.VALUE:NVDataMgmt.handleExecWriteToEEPROMState.return:NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleExecWriteToEEPROMState.return:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
+-- Test Case: FSM_Ready_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleExecWriteToEEPROMState
+TEST.NEW
+TEST.NAME:FSM_Ready_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:2
+TEST.VALUE:NVDataMgmt.handleExecWriteToEEPROMState.return:NVDATAMGMT_EXEC_STATE_WRITE_TO_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleExecWriteToEEPROMState.return:NVDATAMGMT_EXEC_STATE_IDLE
+TEST.END
+
 -- Subprogram: handleSelfTestCheckCRC
 
 -- Test Case: CRC_Fail
@@ -667,15 +819,139 @@
 
 -- Subprogram: handleSelfTestEnableEEPROM
 
--- Test Case: handleSelfTestEnableEEPROM
+-- Test Case: FSM_Busy_No_Timeout
 TEST.UNIT:NVDataMgmt
 TEST.SUBPROGRAM:handleSelfTestEnableEEPROM
 TEST.NEW
-TEST.NAME:handleSelfTestEnableEEPROM
+TEST.NAME:FSM_Busy_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:MACRO=false
 TEST.VALUE:NVDataMgmt.handleSelfTestEnableEEPROM.return:NVDATAMGMT_SELF_TEST_STATE_ENABLE_EEPROM
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
 TEST.EXPECTED:NVDataMgmt.handleSelfTestEnableEEPROM.return:NVDATAMGMT_SELF_TEST_STATE_ENABLE_EEPROM
 TEST.END
 
+-- Test Case: FSM_Busy_Timeout_RAM_State_Not_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestEnableEEPROM
+TEST.NEW
+TEST.NAME:FSM_Busy_Timeout_RAM_State_Not_Ready
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:MACRO=false
+TEST.VALUE:NVDataMgmt.handleSelfTestEnableEEPROM.return:NVDATAMGMT_SELF_TEST_STATE_ENABLE_EEPROM
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_BUSY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleSelfTestEnableEEPROM.return:NVDATAMGMT_SELF_TEST_STATE_ENABLE_EEPROM
+TEST.END
+
+-- Test Case: FSM_Ready_RAM_State_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestEnableEEPROM
+TEST.NEW
+TEST.NAME:FSM_Ready_RAM_State_Ready
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:2
+TEST.VALUE:NVDataMgmt.handleSelfTestEnableEEPROM.return:NVDATAMGMT_SELF_TEST_STATE_ENABLE_EEPROM
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_READY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestEnableEEPROM.return:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.END
+
+-- Subprogram: handleSelfTestReadBootloaderFlag
+
+-- Test Case: RAM_Status_Idle_RAM_State_Busy
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadBootloaderFlag
+TEST.NEW
+TEST.NAME:RAM_Status_Idle_RAM_State_Busy
+TEST.VALUE:NVDataMgmt.handleSelfTestReadBootloaderFlag.return:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IDLE
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_BUSY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadBootloaderFlag.return:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.END
+
+-- Test Case: RAM_Status_Idle_RAM_State_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadBootloaderFlag
+TEST.NEW
+TEST.NAME:RAM_Status_Idle_RAM_State_Ready
+TEST.VALUE:NVDataMgmt.handleSelfTestReadBootloaderFlag.return:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IDLE
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_READY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadBootloaderFlag.return:NVDATAMGMT_SELF_TEST_STATE_READ_WATER_CONSUMPTION
+TEST.END
+
+-- Test Case: RAM_Status_Not_Idle_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadBootloaderFlag
+TEST.NEW
+TEST.NAME:RAM_Status_Not_Idle_No_Timeout
+TEST.VALUE:NVDataMgmt.handleSelfTestReadBootloaderFlag.return:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IN_PROGRESS
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadBootloaderFlag.return:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.END
+
+-- Test Case: RAM_Status_Not_Idle_Timeout_RAM_State_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadBootloaderFlag
+TEST.NEW
+TEST.NAME:RAM_Status_Not_Idle_Timeout_RAM_State_Ready
+TEST.VALUE:NVDataMgmt.handleSelfTestReadBootloaderFlag.return:NVDATAMGMT_SELF_TEST_STATE_READ_BOOTLOADER_FLAG
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IN_PROGRESS
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_READY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadBootloaderFlag.return:NVDATAMGMT_SELF_TEST_STATE_READ_WATER_CONSUMPTION
+TEST.END
+
+-- Subprogram: handleSelfTestReadCalibrationRecord
+
+-- Test Case: FSM_Busy_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadCalibrationRecord
+TEST.NEW
+TEST.NAME:FSM_Busy_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
+TEST.VALUE:NVDataMgmt.handleSelfTestReadCalibrationRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadCalibrationRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD
+TEST.END
+
+-- Test Case: FSM_Busy_Timeout_RAM_State_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadCalibrationRecord
+TEST.NEW
+TEST.NAME:FSM_Busy_Timeout_RAM_State_Ready
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
+TEST.VALUE:NVDataMgmt.handleSelfTestReadCalibrationRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_READY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadCalibrationRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_SERVICE_RECORD
+TEST.END
+
+-- Test Case: FSM_Ready_No_Timeout_RAM_State_Not_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadCalibrationRecord
+TEST.NEW
+TEST.NAME:FSM_Ready_No_Timeout_RAM_State_Not_Ready
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:2
+TEST.VALUE:NVDataMgmt.handleSelfTestReadCalibrationRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_BUSY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadCalibrationRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD
+TEST.END
+
+-- Test Case: FSM_Ready_No_Timeout_RAM_State_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadCalibrationRecord
+TEST.NEW
+TEST.NAME:FSM_Ready_No_Timeout_RAM_State_Ready
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:2
+TEST.VALUE:NVDataMgmt.handleSelfTestReadCalibrationRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_READY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadCalibrationRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_SERVICE_RECORD
+TEST.END
+
 -- Subprogram: handleSelfTestReadDGWaterConsumption
 
 -- Test Case: RAM_Status_Idle_RAM_State_Busy
@@ -776,6 +1052,41 @@
 TEST.EXPECTED:NVDataMgmt.handleSelfTestReadHDTreatmentTime.return:NVDATAMGMT_SELF_TEST_STATE_READ_TREATMENT_TIME
 TEST.END
 
+-- Subprogram: handleSelfTestReadLastDisinfectionDate
+
+-- Test Case: RAM_Status_Idle_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadLastDisinfectionDate
+TEST.NEW
+TEST.NAME:RAM_Status_Idle_No_Timeout
+TEST.VALUE:NVDataMgmt.handleSelfTestReadLastDisinfectionDate.return:NVDATAMGMT_SELF_TEST_STATE_READ_LAST_DISINFECTION_DATE
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IDLE
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadLastDisinfectionDate.return:NVDATAMGMT_SELF_TEST_STATE_CHECK_CRC
+TEST.END
+
+-- Test Case: RAM_Status_Not_Idle_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadLastDisinfectionDate
+TEST.NEW
+TEST.NAME:RAM_Status_Not_Idle_No_Timeout
+TEST.VALUE:NVDataMgmt.handleSelfTestReadLastDisinfectionDate.return:NVDATAMGMT_SELF_TEST_STATE_READ_LAST_DISINFECTION_DATE
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IN_PROGRESS
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadLastDisinfectionDate.return:NVDATAMGMT_SELF_TEST_STATE_READ_LAST_DISINFECTION_DATE
+TEST.END
+
+-- Test Case: RAM_Status_Not_Idle_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadLastDisinfectionDate
+TEST.NEW
+TEST.NAME:RAM_Status_Not_Idle_Timeout
+TEST.VALUE:NVDataMgmt.handleSelfTestReadLastDisinfectionDate.return:NVDATAMGMT_SELF_TEST_STATE_READ_LAST_DISINFECTION_DATE
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IN_PROGRESS
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadLastDisinfectionDate.return:NVDATAMGMT_SELF_TEST_STATE_CHECK_CRC
+TEST.END
+
 -- Subprogram: handleSelfTestReadLogRecord
 
 -- Test Case: RAM_Status_Idle
@@ -813,16 +1124,76 @@
 
 -- Subprogram: handleSelfTestReadMfgRecord
 
--- Test Case: handleSelfTestReadMfgRecord.001
+-- Test Case: FSM_Busy_No_Timeout
 TEST.UNIT:NVDataMgmt
 TEST.SUBPROGRAM:handleSelfTestReadMfgRecord
 TEST.NEW
-TEST.NAME:handleSelfTestReadMfgRecord.001
-TEST.VALUE:NVDataMgmt.<<GLOBAL>>.hasCommandTimedout:0
+TEST.NAME:FSM_Busy_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
 TEST.VALUE:NVDataMgmt.handleSelfTestReadMfgRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_MFG_RECORD
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
 TEST.EXPECTED:NVDataMgmt.handleSelfTestReadMfgRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_MFG_RECORD
 TEST.END
 
+-- Test Case: FSM_Busy_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadMfgRecord
+TEST.NEW
+TEST.NAME:FSM_Busy_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:1
+TEST.VALUE:NVDataMgmt.handleSelfTestReadMfgRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_MFG_RECORD
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadMfgRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD
+TEST.END
+
+-- Test Case: FSM_Ready_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadMfgRecord
+TEST.NEW
+TEST.NAME:FSM_Ready_No_Timeout
+TEST.VALUE:NVDataMgmt.<<GLOBAL>>.FSMStatus:2
+TEST.VALUE:NVDataMgmt.handleSelfTestReadMfgRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_MFG_RECORD
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadMfgRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_CAL_RECORD
+TEST.END
+
+-- Subprogram: handleSelfTestReadServiceRecord
+
+-- Test Case: RAM_Status_Idle_No_Timeout_RAM_State_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadServiceRecord
+TEST.NEW
+TEST.NAME:RAM_Status_Idle_No_Timeout_RAM_State_Ready
+TEST.VALUE:NVDataMgmt.handleSelfTestReadServiceRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_SERVICE_RECORD
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IDLE
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_READY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadServiceRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_LAST_DISINFECTION_DATE
+TEST.END
+
+-- Test Case: RAM_Status_Not_Idle_No_Timeout
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadServiceRecord
+TEST.NEW
+TEST.NAME:RAM_Status_Not_Idle_No_Timeout
+TEST.VALUE:NVDataMgmt.handleSelfTestReadServiceRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_SERVICE_RECORD
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IN_PROGRESS
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:0
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadServiceRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_SERVICE_RECORD
+TEST.END
+
+-- Test Case: RAM_Status_Not_Idle_Timeout_RAM_State_Not_Ready
+TEST.UNIT:NVDataMgmt
+TEST.SUBPROGRAM:handleSelfTestReadServiceRecord
+TEST.NEW
+TEST.NAME:RAM_Status_Not_Idle_Timeout_RAM_State_Not_Ready
+TEST.VALUE:NVDataMgmt.handleSelfTestReadServiceRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_SERVICE_RECORD
+TEST.VALUE:uut_prototype_stubs.getRTCRAMStatus.return:RTC_RAM_STATUS_IN_PROGRESS
+TEST.VALUE:uut_prototype_stubs.getRTCRAMState.return:RTC_RAM_STATE_BUSY
+TEST.VALUE:uut_prototype_stubs.didTimeout.return:1
+TEST.EXPECTED:NVDataMgmt.handleSelfTestReadServiceRecord.return:NVDATAMGMT_SELF_TEST_STATE_READ_SERVICE_RECORD
+TEST.END
+
 -- Subprogram: handleSelfTestStart
 
 -- Test Case: Start
Index: vectorcast/Hercules_RM46_HD_Project/project.db
===================================================================
diff -u -r01c0eb4c57c9ac7609ad32526bbbe8c87e2c8534 -r96344ec7d442efbcc3f1917d523b5e02c7324003
Binary files differ