ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #11488 from kivaisan/fix_cellular_get_interface_name 

Cellular: Fix get_interface_name to not include leading zero
pull/11526/head
Martin Kojtal 2019-09-19 12:43:45 +02:00 committed by GitHub
parent 4f7339af78 ab71b2dba8
commit 1afece7f1b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
UNITTESTS/features/cellular/framework/AT/at_cellularcontext/at_cellularcontexttest.cpp
View File

@ -178,6 +178,18 @@ public:
int _op;
};
class AT_CTX_cid: public AT_CellularContext {
public:
AT_CTX_cid(ATHandler &at, CellularDevice *device, const char *apn = MBED_CONF_NSAPI_DEFAULT_CELLULAR_APN) :
AT_CellularContext(at, device, apn) {}
virtual ~AT_CTX_cid() {}
void set_cid(int cid)
{
_cid = cid;
}
};
static int network_cb_count;
static void network_cb(nsapi_event_t ev, intptr_t intptr)
{
@ -250,6 +262,22 @@ TEST_F(TestAT_CellularContext, get_ip_address)
EXPECT_TRUE(ip != NULL);
}
TEST_F(TestAT_CellularContext, get_interface_name)
{
EventQueue que;
FileHandle_stub fh1;
ATHandler at(&fh1, que, 0, ",");
AT_CellularDevice dev(&fh1);
AT_CTX_cid ctx(at, &dev);
char ifn[5];
EXPECT_TRUE(NULL == ctx.get_interface_name(ifn));
ctx.set_cid(1);
EXPECT_STREQ("ce1", ctx.get_interface_name(ifn));
EXPECT_STREQ("ce1", ifn);
}
TEST_F(TestAT_CellularContext, attach)
{
EventQueue que;
@ -746,5 +774,4 @@ TEST_F(TestAT_CellularContext, get_timeout_for_operation)
ctx1._op = -1;
EXPECT_EQ(1800 * 1000, ctx1.do_op());
}

2
features/cellular/framework/AT/AT_CellularContext.cpp
View File

@ -244,7 +244,7 @@ char *AT_CellularContext::get_interface_name(char *interface_name)
return NULL;
}
MBED_ASSERT(interface_name);
sprintf(interface_name, "ce%02d", _cid);
sprintf(interface_name, "ce%d", _cid);
return interface_name;
}