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

Unified Diff: mojo/runner/data_pipe_peek_unittest.cc

Issue 1107233002: Move runner stuff into a runner namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 8 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 | « mojo/runner/context.cc ('k') | mojo/runner/desktop/launcher_process.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/data_pipe_peek_unittest.cc
diff --git a/mojo/runner/data_pipe_peek_unittest.cc b/mojo/runner/data_pipe_peek_unittest.cc
index 6fc2b7d5838bc0979c65c7841ed9b2d0b1e372e6..42c21774bf69621f5365ce47fe57eefa5b2a69a8 100644
--- a/mojo/runner/data_pipe_peek_unittest.cc
+++ b/mojo/runner/data_pipe_peek_unittest.cc
@@ -8,7 +8,7 @@
#include "testing/gtest/include/gtest/gtest.h"
namespace mojo {
-namespace shell {
+namespace runner {
namespace {
TEST(DataPipePeek, PeekNBytes) {
@@ -30,15 +30,15 @@ TEST(DataPipePeek, PeekNBytes) {
std::string bytes;
MojoDeadline timeout = 0;
- EXPECT_TRUE(BlockingPeekNBytes(consumer, &bytes, num_bytes4, timeout));
+ EXPECT_TRUE(shell::BlockingPeekNBytes(consumer, &bytes, num_bytes4, timeout));
EXPECT_EQ(bytes, std::string(s4));
timeout = 1000; // 1ms
- EXPECT_TRUE(BlockingPeekNBytes(consumer, &bytes, num_bytes4, timeout));
+ EXPECT_TRUE(shell::BlockingPeekNBytes(consumer, &bytes, num_bytes4, timeout));
EXPECT_EQ(bytes, std::string(s4));
timeout = MOJO_DEADLINE_INDEFINITE;
- EXPECT_TRUE(BlockingPeekNBytes(consumer, &bytes, num_bytes4, timeout));
+ EXPECT_TRUE(shell::BlockingPeekNBytes(consumer, &bytes, num_bytes4, timeout));
EXPECT_EQ(bytes, std::string(s4));
// Peeking for 5 bytes should fail, until another byte is written.
@@ -49,23 +49,26 @@ TEST(DataPipePeek, PeekNBytes) {
const char* s5 = "12345";
timeout = 0;
- EXPECT_FALSE(BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
+ EXPECT_FALSE(
+ shell::BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
timeout = 500; // Should cause peek to timeout after about 0.5ms.
- EXPECT_FALSE(BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
+ EXPECT_FALSE(
+ shell::BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
EXPECT_EQ(MOJO_RESULT_OK,
WriteDataRaw(producer, s1, &bytes1, MOJO_WRITE_DATA_FLAG_NONE));
EXPECT_EQ(1u, bytes1);
- EXPECT_TRUE(BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
+ EXPECT_TRUE(shell::BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
EXPECT_EQ(bytes, std::string(s5));
// If the consumer side of the pipe is closed, peek should fail.
data_pipe.consumer_handle.reset();
timeout = 0;
- EXPECT_FALSE(BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
+ EXPECT_FALSE(
+ shell::BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
}
TEST(DataPipePeek, PeekLine) {
@@ -88,7 +91,8 @@ TEST(DataPipePeek, PeekLine) {
std::string str;
size_t max_str_length = 5;
MojoDeadline timeout = 0;
- EXPECT_FALSE(BlockingPeekLine(consumer, &str, max_str_length, timeout));
+ EXPECT_FALSE(
+ shell::BlockingPeekLine(consumer, &str, max_str_length, timeout));
// Writing a newline should cause PeekLine to succeed.
@@ -98,16 +102,17 @@ TEST(DataPipePeek, PeekLine) {
WriteDataRaw(producer, s1, &bytes1, MOJO_WRITE_DATA_FLAG_NONE));
EXPECT_EQ(1u, bytes1);
- EXPECT_TRUE(BlockingPeekLine(consumer, &str, max_str_length, timeout));
+ EXPECT_TRUE(shell::BlockingPeekLine(consumer, &str, max_str_length, timeout));
EXPECT_EQ(str, std::string(s4) + "\n");
// If the max_line_length parameter is less than the length of the
// newline terminated string, then peek should fail.
max_str_length = 3;
- EXPECT_FALSE(BlockingPeekLine(consumer, &str, max_str_length, timeout));
+ EXPECT_FALSE(
+ shell::BlockingPeekLine(consumer, &str, max_str_length, timeout));
}
} // namespace
-} // namespace shell
+} // namespace runner
} // namespace mojo
« no previous file with comments | « mojo/runner/context.cc ('k') | mojo/runner/desktop/launcher_process.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698