Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(743)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: services/files/file_impl_unittest.cc

Issue 1375313006: For c++, Generate enum classes instead of enum from mojom. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « services/files/file_impl.cc ('k') | services/files/files_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/files/file_impl_unittest.cc
diff --git a/services/files/file_impl_unittest.cc b/services/files/file_impl_unittest.cc
index d806e3606e0dc93fe29f0ac4d6eb7c31ea012a2f..ef521f4244dfe9d3639ed08f3c80bce327697e21 100644
--- a/services/files/file_impl_unittest.cc
+++ b/services/files/file_impl_unittest.cc
@@ -22,11 +22,11 @@ TEST_F(FileImplTest, CreateWriteCloseRenameOpenRead) {
{
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
std::vector<uint8_t> bytes_to_write;
@@ -35,42 +35,42 @@ TEST_F(FileImplTest, CreateWriteCloseRenameOpenRead) {
bytes_to_write.push_back(static_cast<uint8_t>('l'));
bytes_to_write.push_back(static_cast<uint8_t>('l'));
bytes_to_write.push_back(static_cast<uint8_t>('o'));
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Close(Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
}
// Rename it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->Rename("my_file", "your_file", Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
{
// Open my_file again.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("your_file", GetProxy(&file), kOpenFlagRead,
Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Read from it.
Array<uint8_t> bytes_read;
- error = ERROR_INTERNAL;
- file->Read(3, 1, WHENCE_FROM_START, Capture(&error, &bytes_read));
+ error = Error::INTERNAL;
+ file->Read(3, 1, Whence::FROM_START, Capture(&error, &bytes_read));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_EQ(3u, bytes_read.size());
EXPECT_EQ(static_cast<uint8_t>('e'), bytes_read[0]);
EXPECT_EQ(static_cast<uint8_t>('l'), bytes_read[1]);
@@ -95,51 +95,51 @@ TEST_F(FileImplTest, CantWriteInReadMode) {
{
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Close(Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
}
{
// Open my_file again, this time with read only mode.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,
Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Try to write in read mode; it should fail.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_UNKNOWN, error);
+ EXPECT_EQ(Error::UNKNOWN, error);
EXPECT_EQ(0u, num_bytes_written);
// Close it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Close(Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
}
}
@@ -151,29 +151,29 @@ TEST_F(FileImplTest, OpenExclusive) {
{
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("temp_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate |kOpenFlagExclusive,
Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Close it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Close(Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
}
{
// Try to open my_file again in exclusive mode; it should fail.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("temp_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate | kOpenFlagExclusive,
Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_UNKNOWN, error);
+ EXPECT_EQ(Error::UNKNOWN, error);
}
}
@@ -185,11 +185,11 @@ TEST_F(FileImplTest, OpenInAppendMode) {
{
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
std::vector<uint8_t> bytes_to_write;
@@ -198,29 +198,29 @@ TEST_F(FileImplTest, OpenInAppendMode) {
bytes_to_write.push_back(static_cast<uint8_t>('l'));
bytes_to_write.push_back(static_cast<uint8_t>('l'));
bytes_to_write.push_back(static_cast<uint8_t>('o'));
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Close(Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
}
{
// Append to my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagAppend, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
std::vector<uint8_t> bytes_to_write;
@@ -231,36 +231,36 @@ TEST_F(FileImplTest, OpenInAppendMode) {
bytes_to_write.push_back(static_cast<uint8_t>('b'));
bytes_to_write.push_back(static_cast<uint8_t>('y'));
bytes_to_write.push_back(static_cast<uint8_t>('e'));
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Close(Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
}
{
// Open my_file again.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,
Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Read from it.
Array<uint8_t> bytes_read;
- error = ERROR_INTERNAL;
- file->Read(12, 0, WHENCE_FROM_START, Capture(&error, &bytes_read));
+ error = Error::INTERNAL;
+ file->Read(12, 0, Whence::FROM_START, Capture(&error, &bytes_read));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_EQ(12u, bytes_read.size());
EXPECT_EQ(static_cast<uint8_t>('l'), bytes_read[3]);
EXPECT_EQ(static_cast<uint8_t>('o'), bytes_read[4]);
@@ -277,11 +277,11 @@ TEST_F(FileImplTest, OpenInTruncateMode) {
{
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
std::vector<uint8_t> bytes_to_write;
@@ -290,29 +290,29 @@ TEST_F(FileImplTest, OpenInTruncateMode) {
bytes_to_write.push_back(static_cast<uint8_t>('l'));
bytes_to_write.push_back(static_cast<uint8_t>('l'));
bytes_to_write.push_back(static_cast<uint8_t>('o'));
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Close(Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
}
{
// Append to my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagTruncate, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
std::vector<uint8_t> bytes_to_write;
@@ -323,36 +323,36 @@ TEST_F(FileImplTest, OpenInTruncateMode) {
bytes_to_write.push_back(static_cast<uint8_t>('b'));
bytes_to_write.push_back(static_cast<uint8_t>('y'));
bytes_to_write.push_back(static_cast<uint8_t>('e'));
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
// Close it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Close(Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
}
{
// Open my_file again.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,
Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Read from it.
Array<uint8_t> bytes_read;
- error = ERROR_INTERNAL;
- file->Read(7, 0, WHENCE_FROM_START, Capture(&error, &bytes_read));
+ error = Error::INTERNAL;
+ file->Read(7, 0, Whence::FROM_START, Capture(&error, &bytes_read));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_EQ(7u, bytes_read.size());
EXPECT_EQ(static_cast<uint8_t>('g'), bytes_read[0]);
EXPECT_EQ(static_cast<uint8_t>('o'), bytes_read[1]);
@@ -370,20 +370,20 @@ TEST_F(FileImplTest, StatTouch) {
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Stat it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
FileInformationPtr file_info;
file->Stat(Capture(&error, &file_info));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_FALSE(file_info.is_null());
- EXPECT_EQ(FILE_TYPE_REGULAR_FILE, file_info->type);
+ EXPECT_EQ(FileType::REGULAR_FILE, file_info->type);
EXPECT_EQ(0, file_info->size);
ASSERT_FALSE(file_info->atime.is_null());
EXPECT_GT(file_info->atime->seconds, 0); // Expect that it's not 1970-01-01.
@@ -392,7 +392,7 @@ TEST_F(FileImplTest, StatTouch) {
int64_t first_mtime = file_info->mtime->seconds;
// Touch only the atime.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
TimespecOrNowPtr t(TimespecOrNow::New());
t->now = false;
t->timespec = Timespec::New();
@@ -400,14 +400,14 @@ TEST_F(FileImplTest, StatTouch) {
t->timespec->seconds = kPartyTime1;
file->Touch(t.Pass(), nullptr, Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Stat again.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file_info.reset();
file->Stat(Capture(&error, &file_info));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_FALSE(file_info.is_null());
ASSERT_FALSE(file_info->atime.is_null());
EXPECT_EQ(kPartyTime1, file_info->atime->seconds);
@@ -422,14 +422,14 @@ TEST_F(FileImplTest, StatTouch) {
t->timespec->seconds = kPartyTime2;
file->Touch(nullptr, t.Pass(), Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Stat again.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file_info.reset();
file->Stat(Capture(&error, &file_info));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_FALSE(file_info.is_null());
ASSERT_FALSE(file_info->atime.is_null());
EXPECT_EQ(kPartyTime1, file_info->atime->seconds);
@@ -448,78 +448,78 @@ TEST_F(FileImplTest, TellSeek) {
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
std::vector<uint8_t> bytes_to_write(1000, '!');
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
const int size = static_cast<int>(num_bytes_written);
// Tell.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
int64_t position = -1;
file->Tell(Capture(&error, &position));
ASSERT_TRUE(file.WaitForIncomingResponse());
// Should be at the end.
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(size, position);
// Seek back 100.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
position = -1;
- file->Seek(-100, WHENCE_FROM_CURRENT, Capture(&error, &position));
+ file->Seek(-100, Whence::FROM_CURRENT, Capture(&error, &position));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(size - 100, position);
// Tell.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
position = -1;
file->Tell(Capture(&error, &position));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(size - 100, position);
// Seek to 123 from start.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
position = -1;
- file->Seek(123, WHENCE_FROM_START, Capture(&error, &position));
+ file->Seek(123, Whence::FROM_START, Capture(&error, &position));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(123, position);
// Tell.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
position = -1;
file->Tell(Capture(&error, &position));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(123, position);
// Seek to 123 back from end.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
position = -1;
- file->Seek(-123, WHENCE_FROM_END, Capture(&error, &position));
+ file->Seek(-123, Whence::FROM_END, Capture(&error, &position));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(size - 123, position);
// Tell.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
position = -1;
file->Tell(Capture(&error, &position));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(size - 123, position);
// TODO(vtl): Check that seeking actually affects reading/writing.
@@ -533,12 +533,12 @@ TEST_F(FileImplTest, Dup) {
// Create my_file.
FilePtr file1;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file1),
kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate,
Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
std::vector<uint8_t> bytes_to_write;
@@ -547,28 +547,28 @@ TEST_F(FileImplTest, Dup) {
bytes_to_write.push_back(static_cast<uint8_t>('l'));
bytes_to_write.push_back(static_cast<uint8_t>('l'));
bytes_to_write.push_back(static_cast<uint8_t>('o'));
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file1->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file1->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file1.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(bytes_to_write.size(), num_bytes_written);
const int end_hello_pos = static_cast<int>(num_bytes_written);
// Dup it.
FilePtr file2;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file1->Dup(GetProxy(&file2), Capture(&error));
ASSERT_TRUE(file1.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// |file2| should have the same position.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
int64_t position = -1;
file2->Tell(Capture(&error, &position));
ASSERT_TRUE(file2.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(end_hello_pos, position);
// Write using |file2|.
@@ -578,35 +578,35 @@ TEST_F(FileImplTest, Dup) {
more_bytes_to_write.push_back(static_cast<uint8_t>('r'));
more_bytes_to_write.push_back(static_cast<uint8_t>('l'));
more_bytes_to_write.push_back(static_cast<uint8_t>('d'));
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
num_bytes_written = 0;
file2->Write(Array<uint8_t>::From(more_bytes_to_write), 0,
- WHENCE_FROM_CURRENT, Capture(&error, &num_bytes_written));
+ Whence::FROM_CURRENT, Capture(&error, &num_bytes_written));
ASSERT_TRUE(file2.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(more_bytes_to_write.size(), num_bytes_written);
const int end_world_pos = end_hello_pos + static_cast<int>(num_bytes_written);
// |file1| should have the same position.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
position = -1;
file1->Tell(Capture(&error, &position));
ASSERT_TRUE(file1.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(end_world_pos, position);
// Close |file1|.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file1->Close(Capture(&error));
ASSERT_TRUE(file1.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Read everything using |file2|.
Array<uint8_t> bytes_read;
- error = ERROR_INTERNAL;
- file2->Read(1000, 0, WHENCE_FROM_START, Capture(&error, &bytes_read));
+ error = Error::INTERNAL;
+ file2->Read(1000, 0, Whence::FROM_START, Capture(&error, &bytes_read));
ASSERT_TRUE(file2.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_EQ(static_cast<size_t>(end_world_pos), bytes_read.size());
// Just check the first and last bytes.
EXPECT_EQ(static_cast<uint8_t>('h'), bytes_read[0]);
@@ -625,43 +625,43 @@ TEST_F(FileImplTest, Truncate) {
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagWrite | kOpenFlagCreate, Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Write to it.
std::vector<uint8_t> bytes_to_write(kInitialSize, '!');
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
uint32_t num_bytes_written = 0;
- file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,
+ file->Write(Array<uint8_t>::From(bytes_to_write), 0, Whence::FROM_CURRENT,
Capture(&error, &num_bytes_written));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
EXPECT_EQ(kInitialSize, num_bytes_written);
// Stat it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
FileInformationPtr file_info;
file->Stat(Capture(&error, &file_info));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_FALSE(file_info.is_null());
EXPECT_EQ(kInitialSize, file_info->size);
// Truncate it.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file->Truncate(kTruncatedSize, Capture(&error));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Stat again.
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
file_info.reset();
file->Stat(Capture(&error, &file_info));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
ASSERT_FALSE(file_info.is_null());
EXPECT_EQ(kTruncatedSize, file_info->size);
}
@@ -673,18 +673,18 @@ TEST_F(FileImplTest, Ioctl) {
// Create my_file.
FilePtr file;
- error = ERROR_INTERNAL;
+ error = Error::INTERNAL;
directory->OpenFile("my_file", GetProxy(&file),
kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate,
Capture(&error));
ASSERT_TRUE(directory.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_OK, error);
+ EXPECT_EQ(Error::OK, error);
// Normal files don't support any ioctls.
Array<uint32_t> out_values;
file->Ioctl(0, Array<uint32_t>(), Capture(&error, &out_values));
ASSERT_TRUE(file.WaitForIncomingResponse());
- EXPECT_EQ(ERROR_UNAVAILABLE, error);
+ EXPECT_EQ(Error::UNAVAILABLE, error);
EXPECT_TRUE(out_values.is_null());
}
« no previous file with comments | « services/files/file_impl.cc ('k') | services/files/files_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698