diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-16 11:08:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-16 11:08:29 +0000 |
| commit | dd5816953de6aebc51aa4cc6f69945fbb9cd4b2a (patch) | |
| tree | 8db9bc4aa940a8b3a44cf31dacd3a7f932eadc80 /adb/adb_io_test.cpp | |
| parent | acf0a8b3f632fe90132b9ce457a2237160f8cb9a (diff) | |
| parent | a7870d88167f619e758b5bcd15b410d16da7c16b (diff) | |
| download | system_core-dd5816953de6aebc51aa4cc6f69945fbb9cd4b2a.tar.gz system_core-dd5816953de6aebc51aa4cc6f69945fbb9cd4b2a.tar.bz2 system_core-dd5816953de6aebc51aa4cc6f69945fbb9cd4b2a.zip | |
Merge "Revert "Create libbase.""
Diffstat (limited to 'adb/adb_io_test.cpp')
| -rw-r--r-- | adb/adb_io_test.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/adb/adb_io_test.cpp b/adb/adb_io_test.cpp index 0c69bc94b..330d9ce5c 100644 --- a/adb/adb_io_test.cpp +++ b/adb/adb_io_test.cpp @@ -24,7 +24,7 @@ #include <string> -#include "base/file.h" +#include "utils/file.h" class TemporaryFile { public: @@ -55,7 +55,7 @@ TEST(io, ReadFdExactly_whole) { TemporaryFile tf; ASSERT_NE(-1, tf.fd); - ASSERT_TRUE(android::base::WriteStringToFd(expected, tf.fd)) << strerror(errno); + ASSERT_TRUE(android::WriteStringToFd(expected, tf.fd)) << strerror(errno); ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0)); // Test reading the whole file. @@ -69,7 +69,7 @@ TEST(io, ReadFdExactly_eof) { TemporaryFile tf; ASSERT_NE(-1, tf.fd); - ASSERT_TRUE(android::base::WriteStringToFd(expected, tf.fd)) << strerror(errno); + ASSERT_TRUE(android::WriteStringToFd(expected, tf.fd)) << strerror(errno); ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0)); // Test that not having enough data will fail. @@ -83,7 +83,7 @@ TEST(io, ReadFdExactly_partial) { TemporaryFile tf; ASSERT_NE(-1, tf.fd); - ASSERT_TRUE(android::base::WriteStringToFd(input, tf.fd)) << strerror(errno); + ASSERT_TRUE(android::WriteStringToFd(input, tf.fd)) << strerror(errno); ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0)); // Test reading a partial file. @@ -106,7 +106,7 @@ TEST(io, WriteFdExactly_whole) { ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0)); std::string s; - ASSERT_TRUE(android::base::ReadFdToString(tf.fd, &s)); + ASSERT_TRUE(android::ReadFdToString(tf.fd, &s)); EXPECT_STREQ(expected, s.c_str()); } @@ -123,7 +123,7 @@ TEST(io, WriteFdExactly_partial) { expected.pop_back(); std::string s; - ASSERT_TRUE(android::base::ReadFdToString(tf.fd, &s)); + ASSERT_TRUE(android::ReadFdToString(tf.fd, &s)); EXPECT_EQ(expected, s); } @@ -137,6 +137,6 @@ TEST(io, WriteStringFully) { ASSERT_EQ(0, lseek(tf.fd, SEEK_SET, 0)); std::string s; - ASSERT_TRUE(android::base::ReadFdToString(tf.fd, &s)); + ASSERT_TRUE(android::ReadFdToString(tf.fd, &s)); EXPECT_STREQ(str, s.c_str()); } |