From 16458f6a1e42fa75c4ca0155f22117bd0acf2b0b Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Wed, 6 Jan 2021 18:20:38 +0100
Subject: [PATCH] continued tests

---
 datapoollocal/LocalPoolVariable.tpp           |  4 ++--
 datapoollocal/LocalPoolVector.tpp             | 20 +++++++++----------
 .../datapoollocal/LocalPoolVariableTest.cpp   | 11 ++++++++++
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/datapoollocal/LocalPoolVariable.tpp b/datapoollocal/LocalPoolVariable.tpp
index dd6219b1..153a13d0 100644
--- a/datapoollocal/LocalPoolVariable.tpp
+++ b/datapoollocal/LocalPoolVariable.tpp
@@ -46,7 +46,7 @@ inline ReturnValue_t LocalPoolVariable<T>::readWithoutLock() {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 		sif::error << "PoolPoolVariable: Read of local pool variable of object "
 				<< std::hex << std::setw(8) << std::setfill('0')
-				<< hkManager->getOwner() << " and lp ID " << localPoolId
+				<< hkManager->getOwner() << " and lp ID 0x" << localPoolId
 				<< std::dec << " failed." << std::setfill(' ') <<  std::endl;
 #endif
 		return result;
@@ -78,7 +78,7 @@ inline ReturnValue_t LocalPoolVariable<T>::commitWithoutLock() {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 		sif::error << "PoolPoolVariable: Read of local pool variable of "
 				<< "object " << std::hex << std::setw(8) << std::setfill('0')
-				<< hkManager->getOwner() << " and lp ID " << localPoolId
+				<< hkManager->getOwner() << " and lp ID 0x" << localPoolId
 				<< std::dec << " failed." << std::endl;
 #endif
 		return result;
diff --git a/datapoollocal/LocalPoolVector.tpp b/datapoollocal/LocalPoolVector.tpp
index 5c3b0ce0..a010a8bb 100644
--- a/datapoollocal/LocalPoolVector.tpp
+++ b/datapoollocal/LocalPoolVector.tpp
@@ -33,7 +33,7 @@ template<typename T, uint16_t vectorSize>
 inline ReturnValue_t LocalPoolVector<T, vectorSize>::readWithoutLock() {
 	if(readWriteMode == pool_rwm_t::VAR_WRITE) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-		sif::debug << "LocalPoolVar: Invalid read write "
+		sif::warning << "LocalPoolVector: Invalid read write "
 				"mode for read() call." << std::endl;
 #endif
 		return PoolVariableIF::INVALID_READ_WRITE_MODE;
@@ -45,10 +45,10 @@ inline ReturnValue_t LocalPoolVector<T, vectorSize>::readWithoutLock() {
 
 	if(result != RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-		sif::error << "PoolVector: Read of local pool variable of object "
-				"0x" << std::hex << std::setw(8) << std::setfill('0') <<
-				hkManager->getOwner() << "and lp ID 0x" << localPoolId <<
-				std::dec << " failed." << std::endl;
+		sif::error << "LocalPoolVector: Read of local pool variable of object "
+				<< std::hex << std::setw(8) << std::setfill('0')
+				<< hkManager->getOwner() << "and lp ID 0x" << localPoolId
+				<< std::dec << " failed." << std::endl;
 #endif
 		return result;
 	}
@@ -69,7 +69,7 @@ template<typename T, uint16_t vectorSize>
 inline ReturnValue_t LocalPoolVector<T, vectorSize>::commitWithoutLock() {
 	if(readWriteMode == pool_rwm_t::VAR_READ) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-		sif::debug << "LocalPoolVar: Invalid read write "
+		sif::warning << "LocalPoolVector: Invalid read write "
 				"mode for commit() call." << std::endl;
 #endif
 		return PoolVariableIF::INVALID_READ_WRITE_MODE;
@@ -78,10 +78,10 @@ inline ReturnValue_t LocalPoolVector<T, vectorSize>::commitWithoutLock() {
 	ReturnValue_t result = hkManager->fetchPoolEntry(localPoolId, &poolEntry);
 	if(result != RETURN_OK) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
-		sif::error << "PoolVector: Read of local pool variable of object "
-				"0x" << std::hex << std::setw(8) << std::setfill('0') <<
-				hkManager->getOwner() << " and lp ID 0x" << localPoolId <<
-				std::dec << " failed.\n" << std::flush;
+		sif::error << "LocalPoolVector: Read of local pool variable of object "
+				<< std::hex << std::setw(8) << std::setfill('0')
+				<< hkManager->getOwner() << " and lp ID " << localPoolId
+				<< std::dec << " failed." << std::endl;
 #endif
 		return result;
 	}
diff --git a/unittest/tests/datapoollocal/LocalPoolVariableTest.cpp b/unittest/tests/datapoollocal/LocalPoolVariableTest.cpp
index faca03e3..2a7f9863 100644
--- a/unittest/tests/datapoollocal/LocalPoolVariableTest.cpp
+++ b/unittest/tests/datapoollocal/LocalPoolVariableTest.cpp
@@ -26,12 +26,23 @@ TEST_CASE("LocalPoolVariable" , "[LocPoolVarTest]") {
 		testVariable.setValid(true);
 		CHECK(testVariable.isValid());
 
+		gp_id_t globPoolId(objects::TEST_LOCAL_POOL_OWNER_BASE,
+				lpool::uint8VarId);
+		lp_var_t<uint8_t> testVariable2 = lp_var_t<uint8_t>(globPoolId);
+		REQUIRE(testVariable.read() == retval::CATCH_OK);
+		REQUIRE(testVariable == 5);
+	}
+
+	SECTION("ErrorHandling") {
+
 		// not try to use a local pool variable which does not exist
 		lp_var_t<uint8_t> invalidVariable = lp_var_t<uint8_t>(
 				objects::TEST_LOCAL_POOL_OWNER_BASE, 0xffffffff);
 		REQUIRE(invalidVariable.read() ==
 				static_cast<int>(HasLocalDataPoolIF::POOL_ENTRY_NOT_FOUND));
 
+		REQUIRE(invalidVariable.commit() ==
+				static_cast<int>(HasLocalDataPoolIF::POOL_ENTRY_NOT_FOUND));
 		// now try to access with wrong type
 		lp_var_t<int8_t> invalidVariable2 = lp_var_t<int8_t>(
 				objects::TEST_LOCAL_POOL_OWNER_BASE, lpool::uint8VarId);