Cellular refactor power and get_default_instance, also remove deprecated

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

@@ -18,7 +18,7 @@
 #include "gtest/gtest.h"
 #include "AT_CellularBase.h"
 #include "EventQueue.h"
-#include "AT_CellularBase.h"
+#include "AT_CellularNetwork.h"
 #include "ATHandler_stub.h"
 #include "FileHandle_stub.h"
 #include <string.h>
@@ -33,28 +33,25 @@ class my_base : public AT_CellularBase {
  }
  bool check_not_supported()
  {
- static const AT_CellularBase::SupportedFeature unsupported_features[] = {
- AT_CellularBase::AT_CGSN_WITH_TYPE,
- AT_CellularBase::SUPPORTED_FEATURE_END_MARK
+ static const intptr_t cellular_properties[AT_CellularBase::PROPERTY_MAX] = {
+ AT_CellularNetwork::RegistrationModeDisable,// C_EREG
+ AT_CellularNetwork::RegistrationModeLAC, // C_GREG
+ AT_CellularNetwork::RegistrationModeLAC, // C_REG
+ 0, // AT_CGSN_WITH_TYPE
+ 1, // AT_CGDATA
+ 1, // AT_CGAUTH
+ 1, // PROPERTY_IPV4_STACK
+ 0, // PROPERTY_IPV6_STACK
+ 0, // PROPERTY_IPV4V6_STACK
  };
- set_unsupported_features(unsupported_features);
- return is_supported(AT_CGSN_WITH_TYPE);
- }
 
- bool check_supported()
- {
- set_unsupported_features(NULL);
- return is_supported(AT_CGSN_WITH_TYPE);
+ set_cellular_properties(cellular_properties);
+ return get_property(PROPERTY_AT_CGSN_WITH_TYPE);
  }
 
- bool check_supported_not_found()
+ bool check_supported()
  {
- static const AT_CellularBase::SupportedFeature unsupported_features[] = {
- AT_CellularBase::AT_CGSN_WITH_TYPE,
- AT_CellularBase::SUPPORTED_FEATURE_END_MARK
- };
- set_unsupported_features(unsupported_features);
- return is_supported(SUPPORTED_FEATURE_END_MARK);
+ return get_property(PROPERTY_AT_CGDATA);
  }
 };
 
@@ -109,19 +106,25 @@ TEST_F(TestAT_CellularBase, test_AT_CellularBase_get_device_error)
  ATHandler_stub::device_err_value.errCode = 0;
 }
 
-TEST_F(TestAT_CellularBase, test_AT_CellularBase_set_unsupported_features)
+TEST_F(TestAT_CellularBase, test_AT_CellularBase_set_cellular_properties)
 {
  EventQueue eq;
  FileHandle_stub fh;
  ATHandler ah(&fh, eq, 0, ",");
  AT_CellularBase at(ah);
 
- static const AT_CellularBase::SupportedFeature unsupported_features[] = {
- AT_CellularBase::AT_CGSN_WITH_TYPE,
- AT_CellularBase::SUPPORTED_FEATURE_END_MARK
+ static const intptr_t cellular_properties[AT_CellularBase::PROPERTY_MAX] = {
+ AT_CellularNetwork::RegistrationModeDisable,// C_EREG
+ AT_CellularNetwork::RegistrationModeLAC, // C_GREG
+ AT_CellularNetwork::RegistrationModeLAC, // C_REG
+ 0, // AT_CGSN_WITH_TYPE
+ 1, // AT_CGDATA
+ 1, // AT_CGAUTH
+ 1, // PROPERTY_IPV4_STACK
+ 0, // PROPERTY_IPV6_STACK
+ 0, // PROPERTY_IPV4V6_STACK
  };
-
- at.set_unsupported_features(unsupported_features);
+ at.set_cellular_properties(cellular_properties);
 }
 
 TEST_F(TestAT_CellularBase, test_AT_CellularBase_is_supported)
@@ -131,7 +134,6 @@ TEST_F(TestAT_CellularBase, test_AT_CellularBase_is_supported)
  ATHandler ah(&fh, eq, 0, ",");
  my_base my_at(ah);
 
- EXPECT_TRUE(true == my_at.check_supported());
- EXPECT_TRUE(true == my_at.check_supported_not_found());
- EXPECT_TRUE(false == my_at.check_not_supported());
+ EXPECT_EQ(true, my_at.check_supported());
+ EXPECT_EQ(false, my_at.check_not_supported());
 }

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

@@ -27,7 +27,7 @@
 #include "Semaphore_stub.h"
 #include "CellularDevice_stub.h"
 #include "equeue_stub.h"
-#include "CellularSIM.h"
+#include "AT_CellularBase_stub.h"
 
 using namespace mbed;
 using namespace events;
@@ -115,12 +115,12 @@ 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) {}
- virtual ~my_AT_CTX() {}
- virtual bool stack_type_supported(nsapi_ip_stack_t stack_type)
+ AT_CellularContext(at, device, apn), _st(at)
  {
- return false;
+ AT_CellularBase_stub::supported_bool = false;
  }
+ virtual ~my_AT_CTX() {}
+
  virtual NetworkStack *get_stack()
  {
  return &_st;
@@ -528,7 +528,7 @@ TEST_F(TestAT_CellularContext, set_sim_ready)
  cell_callback_data_t data;
  data.error = NSAPI_ERROR_OK;
  ctx.cellular_callback((nsapi_event_t)CellularDeviceReady, (intptr_t)&data);
- data.status_data = CellularSIM::SimStateReady;
+ data.status_data = CellularDevice::SimStateReady;
  ctx.cellular_callback((nsapi_event_t)CellularSIMStatusChanged, (intptr_t)&data);
 }
 

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

@@ -9,6 +9,7 @@ set(unittest-includes ${unittest-includes}
  ../features/cellular/framework/common
  ../features/cellular/framework/AT
  ../features/cellular/framework/device
+ ../features/netsocket/cellular
 )
 
 # Source files
@@ -36,4 +37,6 @@ set(unittest-test-sources
  stubs/randLIB_stub.cpp
  stubs/Semaphore_stub.cpp
  stubs/us_ticker_stub.cpp
+ stubs/UARTSerial_stub.cpp
+ stubs/SerialBase_stub.cpp
 )