From ba046cebd9b5142283536cd66f4745673a43c636 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Tue, 6 Sep 2022 14:06:22 +0200
Subject: [PATCH] empty file unittest complete

---
 unittests/cfdp/handler/testDestHandler.cpp | 16 ++++++++++------
 unittests/mocks/cfdp/UserMock.cpp          | 10 ++++++----
 unittests/mocks/cfdp/UserMock.h            |  3 ++-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/unittests/cfdp/handler/testDestHandler.cpp b/unittests/cfdp/handler/testDestHandler.cpp
index 7a3253a2..5bce49d3 100644
--- a/unittests/cfdp/handler/testDestHandler.cpp
+++ b/unittests/cfdp/handler/testDestHandler.cpp
@@ -85,12 +85,12 @@ TEST_CASE("CFDP Dest Handler", "[cfdp]") {
     REQUIRE(packetInfoList.empty());
     destHandler.performStateMachine();
     REQUIRE(userMock.metadataRecvd.size() == 1);
-    MetadataRecvdParams& params = userMock.metadataRecvd.back();
-    REQUIRE(params.id == destHandler.getTransactionId());
-    REQUIRE(params.sourceId.getValue() == 3);
-    REQUIRE(params.fileSize == 0);
-    REQUIRE(strcmp(params.destFileName, "hello-cpy.txt") == 0);
-    REQUIRE(strcmp(params.sourceFileName, "hello.txt") == 0);
+    auto& idMetadataPair = userMock.metadataRecvd.back();
+    REQUIRE(idMetadataPair.first == destHandler.getTransactionId());
+    REQUIRE(idMetadataPair.second.sourceId.getValue() == 3);
+    REQUIRE(idMetadataPair.second.fileSize == 0);
+    REQUIRE(strcmp(idMetadataPair.second.destFileName, "hello-cpy.txt") == 0);
+    REQUIRE(strcmp(idMetadataPair.second.sourceFileName, "hello.txt") == 0);
     userMock.metadataRecvd.pop();
     REQUIRE(fsMock.fileMap.find("hello-cpy.txt") != fsMock.fileMap.end());
     REQUIRE(res.result == OK);
@@ -115,6 +115,10 @@ TEST_CASE("CFDP Dest Handler", "[cfdp]") {
     REQUIRE(userMock.eofsRevd.size() == 1);
     auto& eofId = userMock.eofsRevd.back();
     CHECK(eofId == transactionId);
+    REQUIRE(userMock.finishedRecvd.size() == 1);
+    auto& idParamPair = userMock.finishedRecvd.back();
+    CHECK(idParamPair.first == transactionId);
+    CHECK(idParamPair.second.condCode == ConditionCode::NO_ERROR);
   }
 
   SECTION("Small File Transfer") {}
diff --git a/unittests/mocks/cfdp/UserMock.cpp b/unittests/mocks/cfdp/UserMock.cpp
index 04d9f4f4..ca15a5e6 100644
--- a/unittests/mocks/cfdp/UserMock.cpp
+++ b/unittests/mocks/cfdp/UserMock.cpp
@@ -11,11 +11,12 @@ void UserMock::abandonedIndication(const TransactionId& id, cfdp::ConditionCode
 
 void UserMock::eofRecvIndication(const TransactionId& id) { eofsRevd.push(id); }
 
-void UserMock::transactionFinishedIndication(const TransactionFinishedParams& finishedParams) {}
+void UserMock::transactionFinishedIndication(const TransactionFinishedParams& finishedParams) {
+  finishedRecvd.push({finishedParams.id, finishedParams});
+}
 
 void UserMock::metadataRecvdIndication(const MetadataRecvdParams& params) {
-  MetadataRecvdParams copy = params;
-  metadataRecvd.push(copy);
+  metadataRecvd.push({params.id, params});
 }
 
 void UserMock::fileSegmentRecvdIndication(const FileSegmentRecvdParams& params) {}
@@ -27,7 +28,8 @@ void UserMock::faultIndication(const TransactionId& id, cfdp::ConditionCode code
 
 void UserMock::reset() {
   std::queue<TransactionId>().swap(eofsRevd);
-  std::queue<cfdp::MetadataRecvdParams>().swap(metadataRecvd);
+  std::queue<std::pair<TransactionId, cfdp::MetadataRecvdParams>>().swap(metadataRecvd);
+  std::queue<std::pair<TransactionId, cfdp::TransactionFinishedParams>>().swap(finishedRecvd);
 }
 
 }  // namespace cfdp
diff --git a/unittests/mocks/cfdp/UserMock.h b/unittests/mocks/cfdp/UserMock.h
index 7d9cfef8..e2a4a483 100644
--- a/unittests/mocks/cfdp/UserMock.h
+++ b/unittests/mocks/cfdp/UserMock.h
@@ -23,8 +23,9 @@ class UserMock : public UserBase {
   void resumedIndication(const TransactionId& id, size_t progress) override;
   void faultIndication(const TransactionId& id, ConditionCode code, size_t progress) override;
 
-  std::queue<MetadataRecvdParams> metadataRecvd;
+  std::queue<std::pair<TransactionId, MetadataRecvdParams>> metadataRecvd;
   std::queue<TransactionId> eofsRevd;
+  std::queue<std::pair<TransactionId, TransactionFinishedParams>> finishedRecvd;
   void reset();
 };