From 5c36cda0d31ec22323041066dd4abff0073c8e32 Mon Sep 17 00:00:00 2001
From: Gurdal Oruklu <gurdal_oruklu@comcast.com>
Date: Tue, 10 Sep 2024 21:13:50 +0000
Subject: [PATCH] fixed L1 unit tests after addMount() API change

---
 tests/L1_testing/mocks/DobbyManagerMock.cpp        | 5 +++--
 tests/L1_testing/mocks/DobbyManagerMock.h          | 6 +++++-
 tests/L1_testing/mocks/dobbymanager/DobbyManager.h | 8 ++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/tests/L1_testing/mocks/DobbyManagerMock.cpp b/tests/L1_testing/mocks/DobbyManagerMock.cpp
index deb32bc4..0637e2d0 100755
--- a/tests/L1_testing/mocks/DobbyManagerMock.cpp
+++ b/tests/L1_testing/mocks/DobbyManagerMock.cpp
@@ -128,11 +128,12 @@ bool DobbyManager::wakeupContainer(int32_t cd)
 bool DobbyManager::addMount(int32_t cd, 
                         const std::string& source, 
                         const std::string& destination, 
-                        const std::string& mountFlags)
+                        const std::vector<std::string>& mountFlags,
+                        const std::string& mountData)
 {
    EXPECT_NE(impl, nullptr);
 
-    return impl->addMount(cd, source, destination, mountFlags);
+    return impl->addMount(cd, source, destination, mountFlags, mountData);
 }
 
 bool DobbyManager::removeMount(int32_t cd, const std::string& source)
diff --git a/tests/L1_testing/mocks/DobbyManagerMock.h b/tests/L1_testing/mocks/DobbyManagerMock.h
index 5eadb6b6..11eaee40 100644
--- a/tests/L1_testing/mocks/DobbyManagerMock.h
+++ b/tests/L1_testing/mocks/DobbyManagerMock.h
@@ -60,7 +60,11 @@ class  DobbyManagerMock : public DobbyManagerImpl {
 
     MOCK_METHOD(bool, wakeupContainer, (int32_t cd), (override));
 
-    MOCK_METHOD(bool, addMount, (int32_t cd, const std::string& source, const std::string& destination, const std::string& mountFlags), (override));
+    MOCK_METHOD(bool, addMount, (int32_t cd, 
+                                 const std::string& source, 
+                                 const std::string& destination, 
+                                 const std::vector<std::string>& mountFlags, 
+                                 const std::string& mountData), (override));
 
     MOCK_METHOD(bool, removeMount, (int32_t cd, const std::string& source), (override));
 
diff --git a/tests/L1_testing/mocks/dobbymanager/DobbyManager.h b/tests/L1_testing/mocks/dobbymanager/DobbyManager.h
index f2488a1c..f5d2e1c5 100644
--- a/tests/L1_testing/mocks/dobbymanager/DobbyManager.h
+++ b/tests/L1_testing/mocks/dobbymanager/DobbyManager.h
@@ -95,7 +95,7 @@ class DobbyManagerImpl {
 
     virtual bool wakeupContainer(int32_t cd) = 0;
     
-    virtual bool addMount(int32_t cd, const std::string& source, const std::string& destination, const std::string& mountFlags) = 0;
+    virtual bool addMount(int32_t cd, const std::string& source, const std::string& destination, const std::vector<std::string>& mountFlags, const std::string& mountData) = 0;
 
     virtual bool removeMount(int32_t cd, const std::string& source) = 0;
     
@@ -161,7 +161,11 @@ class DobbyManager {
     bool resumeContainer(int32_t cd);
     bool hibernateContainer(int32_t cd, const std::string& options);
     bool wakeupContainer(int32_t cd);
-    bool addMount(int32_t cd, const std::string& source, const std::string& destination, const std::string& mountFlags);
+    bool addMount(int32_t cd, 
+                  const std::string& source, 
+                  const std::string& destination, 
+                  const std::vector<std::string>& mountFlags,
+                  const std::string& mountData);
     bool removeMount(int32_t cd, const std::string& source);
     bool execInContainer(int32_t cd,
                                 const std::string& options,