tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

adb: sysdeps_test: improve smoke test.

Browse source 
Make sure that adb_poll sets revents for all of the structs passed in.
Also, zero initialize all of the adb_pollfd structs in the tests.

Change-Id: Ia639679a7e6f77483655f1552e89081c4673aa87
This commit is contained in:
Josh Gao 2016-02-19 18:14:20 -08:00
parent 44b08c722d
commit 2275f7da73
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
adb/sysdeps_test.cpp
View file

@ -122,12 +122,14 @@ class sysdeps_poll : public ::testing::Test {
};
TEST_F(sysdeps_poll, smoke) {
adb_pollfd pfd[2];
adb_pollfd pfd[2] = {};
pfd[0].fd = fds[0];
pfd[0].events = POLLRDNORM;
pfd[1].fd = fds[1];
pfd[1].events = POLLWRNORM;
pfd[0].revents = -1;
pfd[1].revents = -1;
EXPECT_EQ(1, adb_poll(pfd, 2, 0));
EXPECT_EQ(0, pfd[0].revents);
EXPECT_EQ(POLLWRNORM, pfd[1].revents);
@ -135,16 +137,18 @@ TEST_F(sysdeps_poll, smoke) {
ASSERT_TRUE(WriteFdExactly(fds[1], "foo", 4));
// Wait for the socketpair to be flushed.
pfd[0].revents = -1;
EXPECT_EQ(1, adb_poll(pfd, 1, 100));
EXPECT_EQ(POLLRDNORM, pfd[0].revents);
pfd[0].revents = -1;
pfd[1].revents = -1;
EXPECT_EQ(2, adb_poll(pfd, 2, 0));
EXPECT_EQ(POLLRDNORM, pfd[0].revents);
EXPECT_EQ(POLLWRNORM, pfd[1].revents);
}
TEST_F(sysdeps_poll, timeout) {
adb_pollfd pfd;
adb_pollfd pfd = {};
pfd.fd = fds[0];
pfd.events = POLLRDNORM;
@ -158,7 +162,7 @@ TEST_F(sysdeps_poll, timeout) {
}
TEST_F(sysdeps_poll, invalid_fd) {
adb_pollfd pfd[3];
adb_pollfd pfd[3] = {};
pfd[0].fd = fds[0];
pfd[0].events = POLLRDNORM;
pfd[1].fd = INT_MAX;
@ -179,7 +183,7 @@ TEST_F(sysdeps_poll, invalid_fd) {
}
TEST_F(sysdeps_poll, duplicate_fd) {
adb_pollfd pfd[2];
adb_pollfd pfd[2] = {};
pfd[0].fd = fds[0];
pfd[0].events = POLLRDNORM;
pfd[1] = pfd[0];
@ -196,7 +200,7 @@ TEST_F(sysdeps_poll, duplicate_fd) {
}
TEST_F(sysdeps_poll, disconnect) {
adb_pollfd pfd;
adb_pollfd pfd = {};
pfd.fd = fds[0];
pfd.events = POLLIN;