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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: services/clipboard/clipboard_apptest.cc

Issue 779063003: Move //services/clipboard code out of namespace mojo (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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/clipboard/BUILD.gn ('k') | services/clipboard/clipboard_standalone_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/clipboard/clipboard_apptest.cc
diff --git a/services/clipboard/clipboard_apptest.cc b/services/clipboard/clipboard_apptest.cc
index 2e7888864fed7cbb4546f7fc9fb626662804893b..16d996b9c9ab76f864f5989b858f657c5e7acee4 100644
--- a/services/clipboard/clipboard_apptest.cc
+++ b/services/clipboard/clipboard_apptest.cc
@@ -40,16 +40,20 @@ const char* kHtmlData = "<html>data</html>";
} // namespace
-namespace mojo {
+using mojo::Array;
+using mojo::Clipboard;
+using mojo::Map;
+using mojo::String;
Elliot Glaysher 2014/12/04 23:16:27 This should be above the anonymous namespace. (And
+
namespace service {
-class ClipboardAppTest : public test::ApplicationTestBase {
+class ClipboardAppTest : public mojo::test::ApplicationTestBase {
public:
ClipboardAppTest() : ApplicationTestBase() {}
~ClipboardAppTest() override {}
void SetUp() override {
- ApplicationTestBase::SetUp();
+ mojo::test::ApplicationTestBase::SetUp();
application_impl()->ConnectToService("mojo:clipboard", &clipboard_);
}
@@ -57,7 +61,7 @@ class ClipboardAppTest : public test::ApplicationTestBase {
base::RunLoop run_loop;
uint64_t sequence_num = 999999;
clipboard_->GetSequenceNumber(
- mojo::Clipboard::TYPE_COPY_PASTE,
+ Clipboard::TYPE_COPY_PASTE,
base::Bind(&CopyUint64AndEndRunloop, &sequence_num, &run_loop));
run_loop.Run();
return sequence_num;
@@ -68,7 +72,7 @@ class ClipboardAppTest : public test::ApplicationTestBase {
std::vector<std::string> types;
types.push_back(kUninitialized);
clipboard_->GetAvailableMimeTypes(
- mojo::Clipboard::TYPE_COPY_PASTE,
+ Clipboard::TYPE_COPY_PASTE,
base::Bind(&CopyVectorStringAndEndRunloop, &types, &run_loop));
run_loop.Run();
return types;
@@ -78,7 +82,7 @@ class ClipboardAppTest : public test::ApplicationTestBase {
base::RunLoop run_loop;
bool is_null = false;
clipboard_->ReadMimeType(
- mojo::Clipboard::TYPE_COPY_PASTE,
+ Clipboard::TYPE_COPY_PASTE,
mime_type,
base::Bind(&CopyStringAndEndRunloop, data, &is_null, &run_loop));
run_loop.Run();
@@ -87,13 +91,13 @@ class ClipboardAppTest : public test::ApplicationTestBase {
void SetStringText(const std::string& data) {
Map<String, Array<uint8_t>> mime_data;
- mime_data[mojo::Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(data);
- clipboard_->WriteClipboardData(mojo::Clipboard::TYPE_COPY_PASTE,
+ mime_data[Clipboard::MIME_TYPE_TEXT] = Array<uint8_t>::From(data);
+ clipboard_->WriteClipboardData(Clipboard::TYPE_COPY_PASTE,
mime_data.Pass());
}
protected:
- ClipboardPtr clipboard_;
+ mojo::ClipboardPtr clipboard_;
DISALLOW_COPY_AND_ASSIGN(ClipboardAppTest);
};
@@ -102,37 +106,37 @@ TEST_F(ClipboardAppTest, EmptyClipboardOK) {
EXPECT_EQ(0ul, GetSequenceNumber());
EXPECT_TRUE(GetAvailableFormatMimeTypes().empty());
std::string data;
- EXPECT_FALSE(GetDataOfType(mojo::Clipboard::MIME_TYPE_TEXT, &data));
+ EXPECT_FALSE(GetDataOfType(Clipboard::MIME_TYPE_TEXT, &data));
}
TEST_F(ClipboardAppTest, CanReadBackText) {
std::string data;
- EXPECT_FALSE(GetDataOfType(mojo::Clipboard::MIME_TYPE_TEXT, &data));
+ EXPECT_FALSE(GetDataOfType(Clipboard::MIME_TYPE_TEXT, &data));
EXPECT_EQ(0ul, GetSequenceNumber());
SetStringText(kPlainTextData);
EXPECT_EQ(1ul, GetSequenceNumber());
- EXPECT_TRUE(GetDataOfType(mojo::Clipboard::MIME_TYPE_TEXT, &data));
+ EXPECT_TRUE(GetDataOfType(Clipboard::MIME_TYPE_TEXT, &data));
EXPECT_EQ(kPlainTextData, data);
}
TEST_F(ClipboardAppTest, CanSetMultipleDataTypesAtOnce) {
Map<String, Array<uint8_t>> mime_data;
- mime_data[mojo::Clipboard::MIME_TYPE_TEXT] =
+ mime_data[Clipboard::MIME_TYPE_TEXT] =
Array<uint8_t>::From(std::string(kPlainTextData));
- mime_data[mojo::Clipboard::MIME_TYPE_HTML] =
+ mime_data[Clipboard::MIME_TYPE_HTML] =
Array<uint8_t>::From(std::string(kHtmlData));
- clipboard_->WriteClipboardData(mojo::Clipboard::TYPE_COPY_PASTE,
+ clipboard_->WriteClipboardData(Clipboard::TYPE_COPY_PASTE,
mime_data.Pass());
EXPECT_EQ(1ul, GetSequenceNumber());
std::string data;
- EXPECT_TRUE(GetDataOfType(mojo::Clipboard::MIME_TYPE_TEXT, &data));
+ EXPECT_TRUE(GetDataOfType(Clipboard::MIME_TYPE_TEXT, &data));
EXPECT_EQ(kPlainTextData, data);
- EXPECT_TRUE(GetDataOfType(mojo::Clipboard::MIME_TYPE_HTML, &data));
+ EXPECT_TRUE(GetDataOfType(Clipboard::MIME_TYPE_HTML, &data));
EXPECT_EQ(kHtmlData, data);
}
@@ -141,16 +145,15 @@ TEST_F(ClipboardAppTest, CanClearClipboardWithZeroArray) {
SetStringText(kPlainTextData);
EXPECT_EQ(1ul, GetSequenceNumber());
- EXPECT_TRUE(GetDataOfType(mojo::Clipboard::MIME_TYPE_TEXT, &data));
+ EXPECT_TRUE(GetDataOfType(Clipboard::MIME_TYPE_TEXT, &data));
EXPECT_EQ(kPlainTextData, data);
Map<String, Array<uint8_t>> mime_data;
- clipboard_->WriteClipboardData(mojo::Clipboard::TYPE_COPY_PASTE,
+ clipboard_->WriteClipboardData(Clipboard::TYPE_COPY_PASTE,
mime_data.Pass());
EXPECT_EQ(2ul, GetSequenceNumber());
- EXPECT_FALSE(GetDataOfType(mojo::Clipboard::MIME_TYPE_TEXT, &data));
+ EXPECT_FALSE(GetDataOfType(Clipboard::MIME_TYPE_TEXT, &data));
}
} // namespace service
-} // namespace mojo
« no previous file with comments | « services/clipboard/BUILD.gn ('k') | services/clipboard/clipboard_standalone_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698