From 40fcdb731bd3c0ab2b4a69730b260ed46bc60ea1 Mon Sep 17 00:00:00 2001
From: Antti Kauppila <antti.kauppila@arm.com>
Date: Wed, 11 Dec 2019 10:53:04 +0200
Subject: [PATCH] Unittest cleanup made CellularDevice still had the old way of
 defining built time defines and is now removed. Other unittests needed some
 minor fixes after this.

---
 .../cellular/framework/AT/at_cellularcontext/unittest.cmake    | 1 +
 .../framework/AT/at_cellularinformation/unittest.cmake         | 1 +
 .../cellular/framework/AT/at_cellularnetwork/unittest.cmake    | 1 +
 .../cellular/framework/AT/at_cellularsms/unittest.cmake        | 1 +
 .../cellular/framework/AT/at_cellularstack/unittest.cmake      | 1 +
 .../features/cellular/framework/AT/athandler/unittest.cmake    | 1 +
 .../cellular/framework/device/cellulardevice/unittest.cmake    | 3 ---
 .../netsocket/cellular/CellularNonIPSocket/unittest.cmake      | 1 +
 UNITTESTS/stubs/UARTSerial_stub.cpp                            | 2 ++
 9 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake
index d087aec36b..ef85569424 100644
--- a/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake
@@ -50,4 +50,5 @@ set(unittest-test-flags
   -DDEVICE_INTERRUPTIN=1
   -DMBED_CONF_CELLULAR_USE_SMS=1
   -DMBED_CONF_NSAPI_DEFAULT_CELLULAR_APN=NULL
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake
index 647d4760da..31e7193ba7 100644
--- a/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/AT/at_cellularinformation/unittest.cmake
@@ -40,4 +40,5 @@ set(unittest-test-sources
 set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake
index 7282ec28a7..1345b5577d 100644
--- a/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/unittest.cmake
@@ -42,4 +42,5 @@ set(unittest-test-sources
 set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake
index 5804e5965b..2bcd59b2ca 100644
--- a/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/AT/at_cellularsms/unittest.cmake
@@ -44,4 +44,5 @@ set(unittest-test-flags
   -DMBED_CONF_CELLULAR_USE_SMS=1
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
index e2a7c71231..b08b27ebbf 100644
--- a/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/AT/at_cellularstack/unittest.cmake
@@ -49,5 +49,6 @@ set(unittest-test-sources
 set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
 
diff --git a/UNITTESTS/features/cellular/framework/AT/athandler/unittest.cmake b/UNITTESTS/features/cellular/framework/AT/athandler/unittest.cmake
index ca88840f79..164ea716ff 100644
--- a/UNITTESTS/features/cellular/framework/AT/athandler/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/AT/athandler/unittest.cmake
@@ -45,4 +45,5 @@ set(unittest-test-flags
   -DOS_STACK_SIZE=2048
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake b/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake
index 65468996c3..c8c7b7d614 100644
--- a/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake
+++ b/UNITTESTS/features/cellular/framework/device/cellulardevice/unittest.cmake
@@ -49,6 +49,3 @@ set(unittest-test-flags
   -DDEVICE_INTERRUPTIN=1
 )
 
-# defines
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMDMRTS=PTC0 -DMDMCTS=PTC1 -DMDMTXD=NC -DMDMRXD=NC -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200 -DCELLULAR_DEVICE=myCellularDevice -DDEVICE_SERIAL_FC=1")
diff --git a/UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/unittest.cmake b/UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/unittest.cmake
index 066a1986bf..2b098a9ef5 100644
--- a/UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/unittest.cmake
+++ b/UNITTESTS/features/netsocket/cellular/CellularNonIPSocket/unittest.cmake
@@ -26,4 +26,5 @@ set(unittest-test-sources
 set(unittest-test-flags
   -DDEVICE_SERIAL=1
   -DDEVICE_INTERRUPTIN=1
+  -DMBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE=115200
 )
diff --git a/UNITTESTS/stubs/UARTSerial_stub.cpp b/UNITTESTS/stubs/UARTSerial_stub.cpp
index 7b03671fe6..1d5087bb9f 100644
--- a/UNITTESTS/stubs/UARTSerial_stub.cpp
+++ b/UNITTESTS/stubs/UARTSerial_stub.cpp
@@ -130,9 +130,11 @@ int UARTSerial::enable_output(bool enabled)
     return 0;
 }
 
+#if DEVICE_SERIAL_FC
 void UARTSerial::set_flow_control(mbed::SerialBase::Flow, PinName, PinName)
 {
 
 }
+#endif
 
 }