services/files/file_impl_unittest.cc - Issue 1150563003: Rename InterfacePtr's WaitForIncomingMethodCall() -> WaitForIncomingResponse().

Unified Diff: services/files/file_impl_unittest.cc

Issue 1150563003: Rename InterfacePtr's WaitForIncomingMethodCall() -> WaitForIncomingResponse(). (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 7 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

Index: services/files/file_impl_unittest.cc

diff --git a/services/files/file_impl_unittest.cc b/services/files/file_impl_unittest.cc

index 43b4ddbcb1e293cafba951be3ebf96511b0d6fb5..d806e3606e0dc93fe29f0ac4d6eb7c31ea012a2f 100644

--- a/services/files/file_impl_unittest.cc

+++ b/services/files/file_impl_unittest.cc

@@ -25,7 +25,7 @@ TEST_F(FileImplTest, CreateWriteCloseRenameOpenRead) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -39,21 +39,21 @@ TEST_F(FileImplTest, CreateWriteCloseRenameOpenRead) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(bytes_to_write.size(), num_bytes_written);

// Close it.

error = ERROR_INTERNAL;

file->Close(Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

}

// Rename it.

error = ERROR_INTERNAL;

directory->Rename("my_file", "your_file", Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

{

@@ -62,14 +62,14 @@ TEST_F(FileImplTest, CreateWriteCloseRenameOpenRead) {

error = ERROR_INTERNAL;

directory->OpenFile("your_file", GetProxy(&file), kOpenFlagRead,

Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

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));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_EQ(3u, bytes_read.size());

EXPECT_EQ(static_cast<uint8_t>('e'), bytes_read[0]);

@@ -98,7 +98,7 @@ TEST_F(FileImplTest, CantWriteInReadMode) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -106,14 +106,14 @@ TEST_F(FileImplTest, CantWriteInReadMode) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(bytes_to_write.size(), num_bytes_written);

// Close it.

error = ERROR_INTERNAL;

file->Close(Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

}

@@ -123,7 +123,7 @@ TEST_F(FileImplTest, CantWriteInReadMode) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,

Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Try to write in read mode; it should fail.

@@ -131,14 +131,14 @@ TEST_F(FileImplTest, CantWriteInReadMode) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_UNKNOWN, error);

EXPECT_EQ(0u, num_bytes_written);

// Close it.

error = ERROR_INTERNAL;

file->Close(Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

}

@@ -155,13 +155,13 @@ TEST_F(FileImplTest, OpenExclusive) {

directory->OpenFile("temp_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate |kOpenFlagExclusive,

Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Close it.

error = ERROR_INTERNAL;

file->Close(Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

}

@@ -172,7 +172,7 @@ TEST_F(FileImplTest, OpenExclusive) {

directory->OpenFile("temp_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate | kOpenFlagExclusive,

Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_UNKNOWN, error);

}

@@ -188,7 +188,7 @@ TEST_F(FileImplTest, OpenInAppendMode) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -202,14 +202,14 @@ TEST_F(FileImplTest, OpenInAppendMode) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(bytes_to_write.size(), num_bytes_written);

// Close it.

error = ERROR_INTERNAL;

file->Close(Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

}

@@ -219,7 +219,7 @@ TEST_F(FileImplTest, OpenInAppendMode) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagAppend, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -235,14 +235,14 @@ TEST_F(FileImplTest, OpenInAppendMode) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(bytes_to_write.size(), num_bytes_written);

// Close it.

error = ERROR_INTERNAL;

file->Close(Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

}

@@ -252,14 +252,14 @@ TEST_F(FileImplTest, OpenInAppendMode) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,

Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

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));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_EQ(12u, bytes_read.size());

EXPECT_EQ(static_cast<uint8_t>('l'), bytes_read[3]);

@@ -280,7 +280,7 @@ TEST_F(FileImplTest, OpenInTruncateMode) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -294,14 +294,14 @@ TEST_F(FileImplTest, OpenInTruncateMode) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(bytes_to_write.size(), num_bytes_written);

// Close it.

error = ERROR_INTERNAL;

file->Close(Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

}

@@ -311,7 +311,7 @@ TEST_F(FileImplTest, OpenInTruncateMode) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagTruncate, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -327,14 +327,14 @@ TEST_F(FileImplTest, OpenInTruncateMode) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(bytes_to_write.size(), num_bytes_written);

// Close it.

error = ERROR_INTERNAL;

file->Close(Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

}

@@ -344,14 +344,14 @@ TEST_F(FileImplTest, OpenInTruncateMode) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file), kOpenFlagRead,

Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

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));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_EQ(7u, bytes_read.size());

EXPECT_EQ(static_cast<uint8_t>('g'), bytes_read[0]);

@@ -373,14 +373,14 @@ TEST_F(FileImplTest, StatTouch) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Stat it.

error = ERROR_INTERNAL;

FileInformationPtr file_info;

file->Stat(Capture(&error, &file_info));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_FALSE(file_info.is_null());

EXPECT_EQ(FILE_TYPE_REGULAR_FILE, file_info->type);

@@ -399,14 +399,14 @@ TEST_F(FileImplTest, StatTouch) {

const int64_t kPartyTime1 = 1234567890; // Party like it's 2009-02-13.

t->timespec->seconds = kPartyTime1;

file->Touch(t.Pass(), nullptr, Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Stat again.

error = ERROR_INTERNAL;

file_info.reset();

file->Stat(Capture(&error, &file_info));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_FALSE(file_info.is_null());

ASSERT_FALSE(file_info->atime.is_null());

@@ -421,14 +421,14 @@ TEST_F(FileImplTest, StatTouch) {

const int64_t kPartyTime2 = 1425059525; // No time like the present.

t->timespec->seconds = kPartyTime2;

file->Touch(nullptr, t.Pass(), Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Stat again.

error = ERROR_INTERNAL;

file_info.reset();

file->Stat(Capture(&error, &file_info));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_FALSE(file_info.is_null());

ASSERT_FALSE(file_info->atime.is_null());

@@ -451,7 +451,7 @@ TEST_F(FileImplTest, TellSeek) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -460,7 +460,7 @@ TEST_F(FileImplTest, TellSeek) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(bytes_to_write.size(), num_bytes_written);

const int size = static_cast<int>(num_bytes_written);

@@ -469,7 +469,7 @@ TEST_F(FileImplTest, TellSeek) {

error = ERROR_INTERNAL;

int64_t position = -1;

file->Tell(Capture(&error, &position));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

// Should be at the end.

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(size, position);

@@ -478,7 +478,7 @@ TEST_F(FileImplTest, TellSeek) {

error = ERROR_INTERNAL;

position = -1;

file->Seek(-100, WHENCE_FROM_CURRENT, Capture(&error, &position));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(size - 100, position);

@@ -486,7 +486,7 @@ TEST_F(FileImplTest, TellSeek) {

error = ERROR_INTERNAL;

position = -1;

file->Tell(Capture(&error, &position));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(size - 100, position);

@@ -494,7 +494,7 @@ TEST_F(FileImplTest, TellSeek) {

error = ERROR_INTERNAL;

position = -1;

file->Seek(123, WHENCE_FROM_START, Capture(&error, &position));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(123, position);

@@ -502,7 +502,7 @@ TEST_F(FileImplTest, TellSeek) {

error = ERROR_INTERNAL;

position = -1;

file->Tell(Capture(&error, &position));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(123, position);

@@ -510,7 +510,7 @@ TEST_F(FileImplTest, TellSeek) {

error = ERROR_INTERNAL;

position = -1;

file->Seek(-123, WHENCE_FROM_END, Capture(&error, &position));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(size - 123, position);

@@ -518,7 +518,7 @@ TEST_F(FileImplTest, TellSeek) {

error = ERROR_INTERNAL;

position = -1;

file->Tell(Capture(&error, &position));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(size - 123, position);

@@ -537,7 +537,7 @@ TEST_F(FileImplTest, Dup) {

directory->OpenFile("my_file", GetProxy(&file1),

kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate,

Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -551,7 +551,7 @@ TEST_F(FileImplTest, Dup) {

uint32_t num_bytes_written = 0;

file1->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file1.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file1.WaitForIncomingResponse());

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);

@@ -560,14 +560,14 @@ TEST_F(FileImplTest, Dup) {

FilePtr file2;

error = ERROR_INTERNAL;

file1->Dup(GetProxy(&file2), Capture(&error));

- ASSERT_TRUE(file1.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file1.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// |file2| should have the same position.

error = ERROR_INTERNAL;

int64_t position = -1;

file2->Tell(Capture(&error, &position));

- ASSERT_TRUE(file2.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file2.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(end_hello_pos, position);

@@ -582,7 +582,7 @@ TEST_F(FileImplTest, Dup) {

num_bytes_written = 0;

file2->Write(Array<uint8_t>::From(more_bytes_to_write), 0,

WHENCE_FROM_CURRENT, Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file2.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file2.WaitForIncomingResponse());

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);

@@ -591,21 +591,21 @@ TEST_F(FileImplTest, Dup) {

error = ERROR_INTERNAL;

position = -1;

file1->Tell(Capture(&error, &position));

- ASSERT_TRUE(file1.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file1.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(end_world_pos, position);

// Close |file1|.

error = ERROR_INTERNAL;

file1->Close(Capture(&error));

- ASSERT_TRUE(file1.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file1.WaitForIncomingResponse());

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));

- ASSERT_TRUE(file2.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file2.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_EQ(static_cast<size_t>(end_world_pos), bytes_read.size());

// Just check the first and last bytes.

@@ -628,7 +628,7 @@ TEST_F(FileImplTest, Truncate) {

error = ERROR_INTERNAL;

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagWrite | kOpenFlagCreate, Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Write to it.

@@ -637,7 +637,7 @@ TEST_F(FileImplTest, Truncate) {

uint32_t num_bytes_written = 0;

file->Write(Array<uint8_t>::From(bytes_to_write), 0, WHENCE_FROM_CURRENT,

Capture(&error, &num_bytes_written));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

EXPECT_EQ(kInitialSize, num_bytes_written);

@@ -645,7 +645,7 @@ TEST_F(FileImplTest, Truncate) {

error = ERROR_INTERNAL;

FileInformationPtr file_info;

file->Stat(Capture(&error, &file_info));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_FALSE(file_info.is_null());

EXPECT_EQ(kInitialSize, file_info->size);

@@ -653,14 +653,14 @@ TEST_F(FileImplTest, Truncate) {

// Truncate it.

error = ERROR_INTERNAL;

file->Truncate(kTruncatedSize, Capture(&error));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

// Stat again.

error = ERROR_INTERNAL;

file_info.reset();

file->Stat(Capture(&error, &file_info));

- ASSERT_TRUE(file.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_OK, error);

ASSERT_FALSE(file_info.is_null());

EXPECT_EQ(kTruncatedSize, file_info->size);

@@ -677,13 +677,13 @@ TEST_F(FileImplTest, Ioctl) {

directory->OpenFile("my_file", GetProxy(&file),

kOpenFlagRead | kOpenFlagWrite | kOpenFlagCreate,

Capture(&error));

- ASSERT_TRUE(directory.WaitForIncomingMethodCall());

+ ASSERT_TRUE(directory.WaitForIncomingResponse());

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.WaitForIncomingMethodCall());

+ ASSERT_TRUE(file.WaitForIncomingResponse());

EXPECT_EQ(ERROR_UNAVAILABLE, error);

EXPECT_TRUE(out_values.is_null());

}

« no previous file with comments | « services/files/directory_impl_unittest.cc ('k') | services/files/files_test_base.cc » ('j') | no next file with comments »