| Index: shell/data_pipe_peek_unittest.cc
|
| diff --git a/mojo/shell/data_pipe_peek_unittest.cc b/shell/data_pipe_peek_unittest.cc
|
| similarity index 86%
|
| rename from mojo/shell/data_pipe_peek_unittest.cc
|
| rename to shell/data_pipe_peek_unittest.cc
|
| index d0473657369ad60338dfa1699467289c2e646edf..ec96490575d9c7e7cb7a39bc851f0a5550598e65 100644
|
| --- a/mojo/shell/data_pipe_peek_unittest.cc
|
| +++ b/shell/data_pipe_peek_unittest.cc
|
| @@ -2,9 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/shell/data_pipe_peek.h"
|
| +#include "shell/data_pipe_peek.h"
|
|
|
| -#include "mojo/shell/context.h"
|
| +#include "shell/context.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace mojo {
|
| @@ -23,7 +23,7 @@ TEST(DataPipePeek, PeekNBytes) {
|
| const char* s4 = "1234";
|
| uint32_t num_bytes4 = 4;
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| - WriteDataRaw(producer, s4, &num_bytes4, MOJO_WRITE_DATA_FLAG_NONE));
|
| + WriteDataRaw(producer, s4, &num_bytes4, MOJO_WRITE_DATA_FLAG_NONE));
|
| EXPECT_EQ(4u, num_bytes4);
|
|
|
| // We're not consuming data, so peeking for 4 bytes should always succeed.
|
| @@ -33,7 +33,7 @@ TEST(DataPipePeek, PeekNBytes) {
|
| EXPECT_TRUE(BlockingPeekNBytes(consumer, &bytes, num_bytes4, timeout));
|
| EXPECT_EQ(bytes, std::string(s4));
|
|
|
| - timeout = 1000; // 1ms
|
| + timeout = 1000; // 1ms
|
| EXPECT_TRUE(BlockingPeekNBytes(consumer, &bytes, num_bytes4, timeout));
|
| EXPECT_EQ(bytes, std::string(s4));
|
|
|
| @@ -51,11 +51,11 @@ TEST(DataPipePeek, PeekNBytes) {
|
| timeout = 0;
|
| EXPECT_FALSE(BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
|
|
|
| - timeout = 500; // Should cause peek to timeout after about 0.5ms.
|
| + timeout = 500; // Should cause peek to timeout after about 0.5ms.
|
| EXPECT_FALSE(BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
|
|
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| - WriteDataRaw(producer, s1, &bytes1, MOJO_WRITE_DATA_FLAG_NONE));
|
| + WriteDataRaw(producer, s1, &bytes1, MOJO_WRITE_DATA_FLAG_NONE));
|
| EXPECT_EQ(1u, bytes1);
|
|
|
| EXPECT_TRUE(BlockingPeekNBytes(consumer, &bytes, num_bytes5, timeout));
|
| @@ -80,7 +80,7 @@ TEST(DataPipePeek, PeekLine) {
|
| const char* s4 = "1234";
|
| uint32_t num_bytes4 = 4;
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| - WriteDataRaw(producer, s4, &num_bytes4, MOJO_WRITE_DATA_FLAG_NONE));
|
| + WriteDataRaw(producer, s4, &num_bytes4, MOJO_WRITE_DATA_FLAG_NONE));
|
| EXPECT_EQ(4u, num_bytes4);
|
|
|
| // Peeking for a line should fail.
|
| @@ -95,7 +95,7 @@ TEST(DataPipePeek, PeekLine) {
|
| uint32_t bytes1 = 1;
|
| const char* s1 = "\n";
|
| EXPECT_EQ(MOJO_RESULT_OK,
|
| - WriteDataRaw(producer, s1, &bytes1, MOJO_WRITE_DATA_FLAG_NONE));
|
| + WriteDataRaw(producer, s1, &bytes1, MOJO_WRITE_DATA_FLAG_NONE));
|
| EXPECT_EQ(1u, bytes1);
|
|
|
| EXPECT_TRUE(BlockingPeekLine(consumer, &str, max_str_length, timeout));
|
|
|