Cellular: Move power on/off to device and remove CellularPower

Author: Ari Parkkila

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

@@ -27,7 +27,6 @@ set(unittest-test-sources
   stubs/AT_CellularDevice_stub.cpp
   stubs/AT_CellularStack_stub.cpp
   stubs/AT_CellularNetwork_stub.cpp
-  stubs/AT_CellularPower_stub.cpp
   stubs/CellularDevice_stub.cpp
   stubs/CellularStateMachine_stub.cpp
   stubs/equeue_stub.c

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

@@ -58,19 +58,18 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_get_at_handler)
     AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
     EXPECT_TRUE(dev.open_information(&fh3));
     ATHandler_stub::fh_value = &fh1;
-    EXPECT_TRUE(dev.open_power(&fh1)); // AT fh1 ref count 3
 
     ATHandler_stub::fh_value = NULL;
 
-    AT_CellularDevice *dev2 = new AT_CellularDevice(&fh1); // AT fh1 ref count 4
-    EXPECT_TRUE(dev2->open_information(&fh1)); // AT fh1 ref count 5
-    ATHandler *at = dev2->get_at_handler(); // AT fh1 ref count 6
-    EXPECT_TRUE(at->get_ref_count() == 6);
-    delete dev2; // AT fh1 2 refs deleted -> ref count 4
-    EXPECT_TRUE(at->get_ref_count() == 4);
-    AT_CellularDevice dev3(&fh1); // AT fh1 ref count 5
-    EXPECT_TRUE(dev3.release_at_handler(at) == NSAPI_ERROR_OK); // AT fh1 ref count 4
-    EXPECT_TRUE(ATHandler_stub::ref_count == 4);
+    AT_CellularDevice *dev2 = new AT_CellularDevice(&fh1); // AT fh1 ref count 3
+    EXPECT_TRUE(dev2->open_information(&fh1)); // AT fh1 ref count 4
+    ATHandler *at = dev2->get_at_handler(); // AT fh1 ref count 5
+    EXPECT_TRUE(at->get_ref_count() == 5);
+    delete dev2; // AT fh1 2 refs deleted -> ref count 3
+    EXPECT_TRUE(at->get_ref_count() == 3);
+    AT_CellularDevice dev3(&fh1); // AT fh1 ref count 4
+    EXPECT_TRUE(dev3.release_at_handler(at) == NSAPI_ERROR_OK); // AT fh1 ref count 3
+    EXPECT_TRUE(ATHandler_stub::ref_count == 3);
 }
 
 TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_open_network)
@@ -99,19 +98,6 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_open_sms)
     EXPECT_TRUE(sms1 == sms);
 }
 
-TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_open_power)
-{
-    FileHandle_stub fh1;
-    AT_CellularDevice dev(&fh1);
-
-    CellularPower *pwr = dev.open_power(NULL);
-    CellularPower *pwr1 = dev.open_power(&fh1);
-
-    EXPECT_TRUE(pwr);
-    EXPECT_TRUE(pwr1);
-    EXPECT_TRUE(pwr1 == pwr);
-}
-
 TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_open_information)
 {
     FileHandle_stub fh1;
@@ -151,19 +137,6 @@ TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_close_sms)
     EXPECT_TRUE(ATHANDLER_REF_COUNT_AT_DESTRUCTOR == kATHandler_destructor_ref_ount);
 }
 
-TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_close_power)
-{
-    FileHandle_stub fh1;
-    AT_CellularDevice dev(&fh1);
-
-    EXPECT_TRUE(dev.open_power(&fh1));
-    AT_CellularBase_stub::handler_value = AT_CellularBase_stub::handler_at_constructor_value;
-    EXPECT_TRUE(ATHandler_stub::ref_count == 2);
-
-    dev.close_power();
-    EXPECT_TRUE(ATHANDLER_REF_COUNT_AT_DESTRUCTOR == kATHandler_destructor_ref_ount);
-}
-
 TEST_F(TestAT_CellularDevice, test_AT_CellularDevice_close_information)
 {
     FileHandle_stub fh1;

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

@@ -28,7 +28,6 @@ set(unittest-test-sources
   stubs/AT_CellularNetwork_stub.cpp
   stubs/ATHandler_stub.cpp
   stubs/AT_CellularSMS_stub.cpp
-  stubs/AT_CellularPower_stub.cpp
   stubs/AT_CellularInformation_stub.cpp
   stubs/CellularUtil_stub.cpp
   stubs/AT_CellularBase_stub.cpp

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

@@ -20,7 +20,6 @@
 #include "CellularDevice.h"
 #include "AT_CellularDevice_stub.h"
 #include "FileHandle_stub.h"
-#include "AT_CellularPower_stub.h"
 #include "AT_CellularNetwork_stub.h"
 #include "myCellularDevice.h"
 #include "Thread_stub.h"
@@ -48,7 +47,6 @@ class TestCellularStateMachine : public testing::Test {
     void SetUp()
     {
         Thread_stub::osStatus_value = osOK;
-        AT_CellularPower_stub::fail_counter = 0;
     }
 
     void TearDown()
@@ -268,8 +266,6 @@ TEST_F(TestCellularStateMachine, test_stop)
     equeue_stub.void_ptr = &ptr;
     equeue_stub.call_cb_immediately = true;
 
-    AT_CellularPower_stub::fail_counter = 1;
-
     ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_power_on());
 
     ut.stop(); // thread and power are created, now stop will delete them
@@ -281,7 +277,6 @@ TEST_F(TestCellularStateMachine, test_stop)
     ASSERT_EQ(NSAPI_ERROR_OK, err);
 
     ut.set_cellular_callback(&cellular_callback);
-    AT_CellularPower_stub::fail_counter = 1;
 
     ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_device_ready());
 
@@ -316,7 +311,6 @@ TEST_F(TestCellularStateMachine, test_run_to_state)
     equeue_stub.call_cb_immediately = true;
 
     ut.set_cellular_callback(&cellular_callback);
-    AT_CellularPower_stub::fail_counter = 0;
 
     ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_power_on());
     UT_CellularState current_state;
@@ -326,37 +320,32 @@ TEST_F(TestCellularStateMachine, test_run_to_state)
     ASSERT_EQ(UT_STATE_POWER_ON, target_state);
     ut.reset();
 
-    AT_CellularPower_stub::set_at_fail_counter = 1;
     ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_device_ready());
     (void)ut.get_current_status(current_state, target_state);
     ASSERT_EQ(UT_STATE_DEVICE_READY, current_state);
     ASSERT_EQ(UT_STATE_DEVICE_READY, target_state);
     ut.ready_urc_cb();
     ut.reset();
 
-    AT_CellularPower_stub::fail_counter = 1;
     ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_device_ready());
     (void)ut.get_current_status(current_state, target_state);
     ASSERT_EQ(UT_STATE_DEVICE_READY, current_state);
     ASSERT_EQ(UT_STATE_DEVICE_READY, target_state);
     ut.reset();
 
-     AT_CellularPower_stub::fail_counter = 2;
     ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_device_ready());
     (void)ut.get_current_status(current_state, target_state);
     ASSERT_EQ(UT_STATE_DEVICE_READY, current_state);
     ASSERT_EQ(UT_STATE_DEVICE_READY, target_state);
     ut.reset();
 
-     AT_CellularPower_stub::fail_counter = 3;
     ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_device_ready());
     (void)ut.get_current_status(current_state, target_state);
     ASSERT_EQ(UT_STATE_DEVICE_READY, current_state);
     ASSERT_EQ(UT_STATE_DEVICE_READY, target_state);
     ut.reset();
 
     AT_CellularDevice_stub::init_module_failure_count = 1;
-    AT_CellularPower_stub::fail_counter = 0;
     AT_CellularNetwork_stub::set_registration_urc_fail_counter = 4;
     ASSERT_EQ(NSAPI_ERROR_OK, ut.run_to_device_sim_ready());
     (void) ut.get_current_status(current_state, target_state);

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

@@ -28,7 +28,6 @@ set(unittest-test-sources
   stubs/SerialBase_stub.cpp
   stubs/ATHandler_stub.cpp
   stubs/AT_CellularNetwork_stub.cpp
-  stubs/AT_CellularPower_stub.cpp
   stubs/AT_CellularBase_stub.cpp
   stubs/AT_CellularContext_stub.cpp
   stubs/AT_CellularDevice_stub.cpp

UNITTESTS/features/cellular/framework/device/cellularstatemachine/cellularstatemachinetest.cpp

@@ -17,7 +17,6 @@
 
 #include "AT_CellularDevice_stub.h"
 #include "AT_CellularNetwork.h"
-#include "AT_CellularPower.h"
 #include "AT_CellularContext.h"
 #include "ATHandler.h"
 
@@ -34,15 +33,24 @@ int AT_CellularDevice_stub::get_sim_failure_count = 0;
 bool AT_CellularDevice_stub::pin_needed = false;
 
 AT_CellularDevice::AT_CellularDevice(FileHandle *fh) : CellularDevice(fh), _network(0), _sms(0),
-    _power(0), _information(0), _context_list(0), _default_timeout(DEFAULT_AT_TIMEOUT),
+    _information(0), _context_list(0), _default_timeout(DEFAULT_AT_TIMEOUT),
     _modem_debug_on(false)
 {
 }
 
 AT_CellularDevice::~AT_CellularDevice()
 {
     delete _network;
-    delete _power;
+}
+
+nsapi_error_t AT_CellularDevice::power_on()
+{
+    return NSAPI_ERROR_UNSUPPORTED;
+}
+
+nsapi_error_t AT_CellularDevice::power_off()
+{
+    return NSAPI_ERROR_UNSUPPORTED;
 }
 
 ATHandler *AT_CellularDevice::get_at_handler(FileHandle *fileHandle)
@@ -87,11 +95,6 @@ CellularSMS *AT_CellularDevice::open_sms(FileHandle *fh)
     return NULL;
 }
 
-CellularPower *AT_CellularDevice::open_power(FileHandle *fh)
-{
-        return new AT_CellularPower(*ATHandler::get_instance(fh, _queue, _default_timeout, "\r", get_send_delay(), _modem_debug_on));
-}
-
 CellularInformation *AT_CellularDevice::open_information(FileHandle *fh)
 {
     return NULL;
@@ -105,10 +108,6 @@ void AT_CellularDevice::close_sms()
 {
 }
 
-void AT_CellularDevice::close_power()
-{
-}
-
 void AT_CellularDevice::close_information()
 {
 }
@@ -142,11 +141,6 @@ AT_CellularSMS *AT_CellularDevice::open_sms_impl(ATHandler &at)
     return NULL;
 }
 
-AT_CellularPower *AT_CellularDevice::open_power_impl(ATHandler &at)
-{
-    return NULL;
-}
-
 AT_CellularInformation *AT_CellularDevice::open_information_impl(ATHandler &at)
 {
     return NULL;