Merge pull request #11992 from AnttiKauppila/feature-cellular

Feature cellular: Optimising memory footprint

Author: Antti Kauppila

UNITTESTS/features/cellular/framework/AT/at_cellularbase/at_cellularbasetest.cpp

@@ -26,8 +26,8 @@
 #include "AT_CellularStack.h"
 #include "Semaphore_stub.h"
 #include "CellularDevice_stub.h"
+#include "AT_CellularDevice_stub.h"
 #include "equeue_stub.h"
-#include "AT_CellularBase_stub.h"
 #include "CellularUtil_stub.h"
 #include "PinNames.h"
 
@@ -76,7 +76,7 @@ class TestAT_CellularContext : public testing::Test {
 // *INDENT-ON*
 class my_stack : public AT_CellularStack {
 public:
-    my_stack(ATHandler &atHandler) : AT_CellularStack(atHandler, 1, IPV4_STACK) {}
+    my_stack(ATHandler &atHandler, AT_CellularDevice &device) : AT_CellularStack(atHandler, 1, IPV4_STACK, device) {}
     virtual int get_max_socket_count()
     {
         return 1;
@@ -117,9 +117,9 @@ class my_stack : public AT_CellularStack {
 class my_AT_CTX : public AT_CellularContext {
 public:
     my_AT_CTX(ATHandler &at, CellularDevice *device, const char *apn = MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN) :
-        AT_CellularContext(at, device, apn), _st(at)
+        AT_CellularContext(at, device, apn), _st(at, *get_device())
     {
-        AT_CellularBase_stub::supported_bool = false;
+        AT_CellularDevice_stub::supported_bool = false;
     }
     virtual ~my_AT_CTX() {}
 
@@ -152,7 +152,7 @@ class my_AT_CTX : public AT_CellularContext {
 class my_AT_CTXIPV6 : public AT_CellularContext {
 public:
     my_AT_CTXIPV6(ATHandler &at, CellularDevice *device, const char *apn = MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN) :
-        AT_CellularContext(at, device, apn), _st(at) {}
+        AT_CellularContext(at, device, apn), _st(at, *get_device()) {}
     virtual ~my_AT_CTXIPV6() {}
     virtual NetworkStack *get_stack()
     {
@@ -579,13 +579,13 @@ TEST_F(TestAT_CellularContext, connect_disconnect_sync)
     ATHandler_stub::read_string_index = 2;
     ASSERT_EQ(ctx1.connect(),  NSAPI_ERROR_OK);
 
-    AT_CellularBase_stub::supported_bool = true;
+    AT_CellularDevice_stub::supported_bool = true;
     ASSERT_EQ(ctx1.disconnect(), NSAPI_ERROR_OK);
     ATHandler_stub::resp_info_true_counter = 1;
     ATHandler_stub::read_string_table[1] = (char *)"IPV4V6";
     ATHandler_stub::read_string_index = 2;
     ASSERT_EQ(ctx1.connect(),  NSAPI_ERROR_OK);
-    AT_CellularBase_stub::supported_bool = false;
+    AT_CellularDevice_stub::supported_bool = false;
 
     ASSERT_EQ(ctx1.disconnect(), NSAPI_ERROR_OK);
     ATHandler_stub::resp_info_true_counter = 1;

UNITTESTS/features/cellular/framework/AT/at_cellularbase/unittest.cmake

@@ -21,7 +21,6 @@ set(unittest-sources
 set(unittest-test-sources
   features/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp
   stubs/ATHandler_stub.cpp
-  stubs/AT_CellularBase_stub.cpp
   stubs/AT_CellularDevice_stub.cpp
   stubs/AT_CellularStack_stub.cpp
   stubs/AT_CellularNetwork_stub.cpp

UNITTESTS/features/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp

@@ -18,7 +18,7 @@
 #include <string.h>
 #include "AT_CellularDevice.h"
 #include "ATHandler_stub.h"
-#include "AT_CellularBase_stub.h"
+#include "AT_CellularDevice_stub.h"
 
 using namespace mbed;
 using namespace events;
@@ -70,7 +70,6 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_get_at_handler)
     EXPECT_TRUE(dev.open_network(&fh1)); // AT fh1 ref count 2
     dev.modem_debug_on(true);
     EXPECT_TRUE(dev.open_sms(&fh2));
-    AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
     EXPECT_TRUE(dev.open_information(&fh3));
     ATHandler_stub::fh_value = &fh1;
 
@@ -132,7 +131,6 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_close_network)
     AT_CellularDevice dev(&fh1);
 
     EXPECT_TRUE(dev.open_network(&fh1));
-    AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
     EXPECT_EQ(ATHandler_stub::ref_count, 1);
 
     dev.close_network();
@@ -144,7 +142,6 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_close_sms)
     AT_CellularDevice dev(&fh1);
 
     EXPECT_TRUE(dev.open_sms(&fh1));
-    AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
     EXPECT_EQ(ATHandler_stub::ref_count, 1);
 
     dev.close_sms();
@@ -159,16 +156,11 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_close_information)
     EXPECT_TRUE(dev.open_information(&fh1));
 
     ATHandler_stub::fh_value = NULL;
-    AT_CellularBase_stub::handler_value = NULL;
     dev.close_information();
 
-    EventQueue que;
     ATHandler_stub::fh_value = &fh1;
-    ATHandler at(&fh1, que, 0, ",");
-    AT_CellularBase_stub::handler_value = &at;
 
     EXPECT_TRUE(dev.open_information(&fh1));
-    AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
 
     dev.close_information();
 

UNITTESTS/features/cellular/framework/AT/at_cellularcontext/unittest.cmake

@@ -29,7 +29,6 @@ set(unittest-test-sources
   stubs/AT_CellularSMS_stub.cpp
   stubs/AT_CellularInformation_stub.cpp
   stubs/CellularUtil_stub.cpp
-  stubs/AT_CellularBase_stub.cpp
   stubs/NetworkInterface_stub.cpp
   stubs/NetworkInterfaceDefaults_stub.cpp
   stubs/EventQueue_stub.cpp