From ef0e3f99e4a7669e6e0f645be786ababb1b819a8 Mon Sep 17 00:00:00 2001
From: Rajkumar Kanagaraj <rajkumar.kanagaraj@arm.com>
Date: Mon, 5 Jul 2021 06:37:21 -0700
Subject: [PATCH] CMake: Move netsocket stub headers to the netsocket doubles
 dir

Previously all the netsocket stubs headers under mbed-stubs-headers,
so this PR move all netsocket stubs headers under
netsocket/tests/UNITTESTS/double directory and update CMake to include
stubs headers into mbed-stubs-netsocket library to make netsocket stubs
to be self-contained.
---
 .../framework/device/cellularcontext/CMakeLists.txt          | 1 +
 .../netsocket/tests/UNITTESTS/doubles/CMakeLists.txt         | 5 +++++
 .../tests/UNITTESTS/doubles}/ControlPlane_netif_stub.h       | 0
 .../netsocket/tests/UNITTESTS/doubles}/EMAC_mock.h           | 0
 .../netsocket/tests/UNITTESTS/doubles}/NetworkStack_stub.h   | 0
 .../tests/UNITTESTS/doubles}/OnboardNetworkStack_mock.h      | 0
 .../UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt   | 1 +
 7 files changed, 7 insertions(+)
 rename {UNITTESTS/stubs => connectivity/netsocket/tests/UNITTESTS/doubles}/ControlPlane_netif_stub.h (100%)
 rename {UNITTESTS/stubs => connectivity/netsocket/tests/UNITTESTS/doubles}/EMAC_mock.h (100%)
 rename {UNITTESTS/stubs => connectivity/netsocket/tests/UNITTESTS/doubles}/NetworkStack_stub.h (100%)
 rename {UNITTESTS/stubs => connectivity/netsocket/tests/UNITTESTS/doubles}/OnboardNetworkStack_mock.h (100%)

diff --git a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
index d79f4de0b25..9d8c2aa34a7 100644
--- a/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
+++ b/connectivity/cellular/tests/UNITTESTS/framework/device/cellularcontext/CMakeLists.txt
@@ -40,6 +40,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
+        mbed-stubs-netsocket
         mbed-stubs-headers
         gmock_main
 )
diff --git a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
index 05983abbc7c..634caa0b3df 100644
--- a/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -10,6 +10,11 @@ target_include_directories(mbed-headers-netsocket
 
 add_library(mbed-stubs-netsocket)
 
+target_include_directories(mbed-stubs-netsocket
+    PUBLIC
+        .
+)
+
 target_sources(mbed-stubs-netsocket
     PRIVATE
         CellularInterface_stub.cpp
diff --git a/UNITTESTS/stubs/ControlPlane_netif_stub.h b/connectivity/netsocket/tests/UNITTESTS/doubles/ControlPlane_netif_stub.h
similarity index 100%
rename from UNITTESTS/stubs/ControlPlane_netif_stub.h
rename to connectivity/netsocket/tests/UNITTESTS/doubles/ControlPlane_netif_stub.h
diff --git a/UNITTESTS/stubs/EMAC_mock.h b/connectivity/netsocket/tests/UNITTESTS/doubles/EMAC_mock.h
similarity index 100%
rename from UNITTESTS/stubs/EMAC_mock.h
rename to connectivity/netsocket/tests/UNITTESTS/doubles/EMAC_mock.h
diff --git a/UNITTESTS/stubs/NetworkStack_stub.h b/connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.h
similarity index 100%
rename from UNITTESTS/stubs/NetworkStack_stub.h
rename to connectivity/netsocket/tests/UNITTESTS/doubles/NetworkStack_stub.h
diff --git a/UNITTESTS/stubs/OnboardNetworkStack_mock.h b/connectivity/netsocket/tests/UNITTESTS/doubles/OnboardNetworkStack_mock.h
similarity index 100%
rename from UNITTESTS/stubs/OnboardNetworkStack_mock.h
rename to connectivity/netsocket/tests/UNITTESTS/doubles/OnboardNetworkStack_mock.h
diff --git a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
index 238ff60ca78..98da637f74f 100644
--- a/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
+++ b/connectivity/netsocket/tests/UNITTESTS/netsocket/CellularNonIPSocket/CMakeLists.txt
@@ -27,6 +27,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers-cellular
         mbed-stubs
         mbed-stubs-cellular
+        mbed-stubs-netsocket
         mbed-stubs-headers
         gmock_main
 )