Cell refactor power api

UNITTESTS/features/cellular/framework/AT/at_cellulardevice/at_cellulardevicetest.cpp

@@ -222,18 +222,71 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_modem_debug_on)
     dev.close_sms();
 }
 
-TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_get_send_delay)
+TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_init)
 {
     FileHandle_stub fh1;
     AT_CellularDevice dev(&fh1);
-    EXPECT_TRUE(0 == dev.get_send_delay());
+    EXPECT_EQ(dev.init(), NSAPI_ERROR_OK);
+}
+
+TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_reset)
+{
+    FileHandle_stub fh1;
+    AT_CellularDevice dev(&fh1);
+    EXPECT_EQ(dev.reset(), NSAPI_ERROR_OK);
 }
 
-TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_init_module)
+TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_shutdown)
 {
     FileHandle_stub fh1;
     AT_CellularDevice dev(&fh1);
-    EXPECT_TRUE(NSAPI_ERROR_OK == dev.init_module());
+    EXPECT_EQ(dev.shutdown(), NSAPI_ERROR_OK);
+}
+
+TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_is_ready)
+{
+    EventQueue que;
+    FileHandle_stub fh1;
+    ATHandler at(&fh1, que, 0, ",");
+
+    AT_CellularDevice dev(&fh1);
+    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.is_ready());
+}
+
+TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_set_power_save_mode)
+{
+    EventQueue que;
+    FileHandle_stub fh1;
+    ATHandler at(&fh1, que, 0, ",");
+
+    AT_CellularDevice dev(&fh1);
+    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(0, 0));
+
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(10, 0));
+
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(912, 0));
+
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(1834, 1834));
+
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(18345, 18345));
+
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(101234, 101234));
+
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(1012345, 1012345));
+
+    EXPECT_TRUE(NSAPI_ERROR_OK == dev.set_power_save_mode(39612345, 39612345));
+
+    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
+    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == dev.set_power_save_mode(0));
+}
+
+TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_get_send_delay)
+{
+    FileHandle_stub fh1;
+    AT_CellularDevice dev(&fh1);
+    EXPECT_TRUE(0 == dev.get_send_delay());
 }
 
 TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_create_delete_context)
@@ -333,3 +386,17 @@ TEST_F(TestAT_CellularDevice, TestAT_CellularDevice_get_sim_state)
 
     delete dev;
 }
+
+static void device_ready_cb()
+{
+}
+
+TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_set_ready_cb)
+{
+    EventQueue que;
+    FileHandle_stub fh1;
+    AT_CellularDevice *dev = new AT_CellularDevice(&fh1);
+
+    EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == dev->set_ready_cb(&device_ready_cb));
+    EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == dev->set_ready_cb(0));
+}

UNITTESTS/features/cellular/framework/AT/at_cellularnetwork/at_cellularnetworktest.cpp

@@ -681,3 +681,16 @@ TEST_F(TestAT_CellularNetwork, test_get_connection_status)
     EXPECT_TRUE(NSAPI_STATUS_DISCONNECTED == cn.get_connection_status());
 }
 
+TEST_F(TestAT_CellularNetwork, test_AT_CellularNetwork_set_receive_period)
+{
+    EventQueue que;
+    FileHandle_stub fh1;
+    ATHandler at(&fh1, que, 0, ",");
+
+    AT_CellularNetwork cn(at);
+    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
+    EXPECT_TRUE(NSAPI_ERROR_OK == cn.set_receive_period(1, CellularNetwork::EDRXUTRAN_Iu_mode, 3));
+
+    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
+    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == cn.set_receive_period(1, CellularNetwork::EDRXUTRAN_Iu_mode, 3));
+}

UNITTESTS/features/cellular/framework/AT/at_cellularpower/at_cellularpowertest.cpp

@@ -41,10 +41,6 @@ class TestAT_CellularPower : public testing::Test {
 // *INDENT-ON*
 
 
-static void device_ready_cb()
-{
-}
-
 TEST_F(TestAT_CellularPower, Create)
 {
 
@@ -78,124 +74,3 @@ TEST_F(TestAT_CellularPower, test_AT_CellularPower_off)
     AT_CellularPower pow(at);
     EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == pow.off());
 }
-
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_set_at_mode)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.set_at_mode());
-
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
-    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.set_at_mode());
-}
-
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_set_power_level)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.set_power_level(6));
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.set_power_level(1, 1));
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.set_power_level(1, 0));
-
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
-    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.set_power_level(6));
-}
-
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_reset)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.reset());
-
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
-    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.reset());
-}
-
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_opt_power_save_mode)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(0, 0));
-
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(10, 0));
-
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(912, 0));
-
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(1834, 1834));
-
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(18345, 18345));
-
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(101234, 101234));
-
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(1012345, 1012345));
-
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_power_save_mode(39612345, 39612345));
-
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
-    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.opt_power_save_mode(0, 0));
-}
-
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_opt_receive_period)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_OK;
-    EXPECT_TRUE(NSAPI_ERROR_OK == pow.opt_receive_period(1, CellularPower::EDRXUTRAN_Iu_mode, 3));
-
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_DEVICE_ERROR;
-    EXPECT_TRUE(NSAPI_ERROR_DEVICE_ERROR == pow.opt_receive_period(1, CellularPower::EDRXUTRAN_Iu_mode, 3));
-}
-
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_is_device_ready)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    ATHandler_stub::nsapi_error_value = NSAPI_ERROR_AUTH_FAILURE;
-    EXPECT_TRUE(NSAPI_ERROR_AUTH_FAILURE == pow.is_device_ready());
-}
-
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_set_device_ready_urc_cb)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == pow.set_device_ready_urc_cb(&device_ready_cb));
-    EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == pow.set_device_ready_urc_cb(NULL));
-}
-
-TEST_F(TestAT_CellularPower, test_AT_CellularPower_remove_device_ready_urc_cb)
-{
-    EventQueue que;
-    FileHandle_stub fh1;
-    ATHandler at(&fh1, que, 0, ",");
-
-    AT_CellularPower pow(at);
-    EXPECT_TRUE(NSAPI_ERROR_UNSUPPORTED == pow.set_device_ready_urc_cb(&device_ready_cb));
-
-    pow.remove_device_ready_urc_cb(NULL);
-    pow.remove_device_ready_urc_cb(&device_ready_cb);
-}

UNITTESTS/features/cellular/framework/AT/athandler/athandlertest.cpp

@@ -142,8 +142,7 @@ TEST_F(TestATHandler, test_ATHandler_remove_urc_handler)
     mbed::Callback<void()> cb(&urc_callback);
     at.set_urc_handler(ch, cb);
 
-    //This does nothing!!!
-    at.remove_urc_handler(ch);
+    at.set_urc_handler(ch, 0);
 }
 
 TEST_F(TestATHandler, test_ATHandler_get_last_error)
@@ -964,10 +963,10 @@ TEST_F(TestATHandler, test_ATHandler_resp_start)
     filehandle_stub_table = table9;
     filehandle_stub_table_pos = 0;
 
+    at.set_urc_handler("urc: ", &urc_callback);
     at.set_urc_handler("urc: ", NULL);
     at.resp_start();
-    // Match URC consumes to CRLF -> nothing to read after that -> ERROR
-    EXPECT_TRUE(at.get_last_error() == NSAPI_ERROR_DEVICE_ERROR);
+    EXPECT_EQ(at.get_last_error(), NSAPI_ERROR_OK);
 
     char table10[] = "urc: info\r\ngarbage\r\nprefix: info\r\nOK\r\n\0";
     at.flush();

UNITTESTS/features/cellular/framework/device/cellulardevice/cellulardevicetest.cpp

@@ -228,3 +228,15 @@ TEST_F(TestCellularDevice, test_cellular_callback)
 
     delete dev;
 }
+
+TEST_F(TestCellularDevice, test_shutdown)
+{
+    FileHandle_stub fh1;
+    CellularDevice *dev = new myCellularDevice(&fh1);
+    EXPECT_TRUE(dev);
+
+    CellularStateMachine_stub::nsapi_error_value = NSAPI_ERROR_OK;
+    ASSERT_EQ(dev->shutdown(), NSAPI_ERROR_OK);
+
+    delete dev;
+}

UNITTESTS/stubs/AT_CellularDevice_stub.cpp

@@ -28,6 +28,7 @@ AT_CellularDevice::AT_CellularDevice(FileHandle *fh) : CellularDevice(fh), _netw
     _modem_debug_on(false)
 {
     _atHandlers = new ATHandler(fh, _queue, 0, ",");
+    _at = _atHandlers;
 }
 
 AT_CellularDevice::~AT_CellularDevice()
@@ -143,7 +144,32 @@ void AT_CellularDevice::modem_debug_on(bool on)
 
 }
 
-nsapi_error_t AT_CellularDevice::init_module()
+nsapi_error_t AT_CellularDevice::is_ready()
+{
+    return NSAPI_ERROR_OK;
+}
+
+nsapi_error_t AT_CellularDevice::set_ready_cb(mbed::Callback<void()> callback)
+{
+    return NSAPI_ERROR_UNSUPPORTED;
+}
+
+nsapi_error_t AT_CellularDevice::set_power_save_mode(int periodic_time, int active_time)
+{
+    return NSAPI_ERROR_UNSUPPORTED;
+}
+
+nsapi_error_t AT_CellularDevice::init()
+{
+    return NSAPI_ERROR_OK;
+}
+
+nsapi_error_t AT_CellularDevice::reset()
+{
+    return NSAPI_ERROR_OK;
+}
+
+nsapi_error_t AT_CellularDevice::shutdown()
 {
     return NSAPI_ERROR_OK;
 }

UNITTESTS/stubs/AT_CellularNetwork_stub.cpp

@@ -150,3 +150,8 @@ bool AT_CellularNetwork::is_active_context()
 {
     return true;
 }
+
+nsapi_error_t AT_CellularNetwork::set_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value)
+{
+    return NSAPI_ERROR_OK;
+}

UNITTESTS/stubs/AT_CellularPower_stub.cpp

@@ -39,43 +39,3 @@ nsapi_error_t AT_CellularPower::off()
 {
     return NSAPI_ERROR_OK;
 }
-
-nsapi_error_t AT_CellularPower::set_at_mode()
-{
-    return NSAPI_ERROR_OK;
-}
-
-nsapi_error_t AT_CellularPower::set_power_level(int func_level, int do_reset)
-{
-    return NSAPI_ERROR_OK;
-}
-
-nsapi_error_t AT_CellularPower::reset()
-{
-    return NSAPI_ERROR_OK;
-}
-
-nsapi_error_t AT_CellularPower::opt_power_save_mode(int periodic_time, int active_time)
-{
-    return NSAPI_ERROR_OK;
-}
-
-nsapi_error_t AT_CellularPower::opt_receive_period(int mode, EDRXAccessTechnology act_type, uint8_t edrx_value)
-{
-    return NSAPI_ERROR_OK;
-}
-
-nsapi_error_t AT_CellularPower::set_device_ready_urc_cb(mbed::Callback<void()> callback)
-{
-    return NSAPI_ERROR_OK;
-}
-
-void AT_CellularPower::remove_device_ready_urc_cb(mbed::Callback<void()> callback)
-{
-
-}
-
-nsapi_error_t AT_CellularPower::is_device_ready()
-{
-    return NSAPI_ERROR_OK;
-}

UNITTESTS/stubs/CellularDevice_stub.cpp

@@ -97,3 +97,9 @@ nsapi_error_t CellularDevice::get_sim_state(SimState &state)
 {
     return NSAPI_ERROR_OK;
 }
+
+nsapi_error_t CellularDevice::shutdown()
+{
+    return NSAPI_ERROR_OK;
+}
+