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

Unified Diff: chromeos/dbus/ibus/ibus_text_unittest.cc

Issue 61003004: Delete ibus_object and move ibus_text to chromeos/ime. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Modified based on the review. Created 7 years, 1 month 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 | « chromeos/dbus/ibus/ibus_text.cc ('k') | chromeos/ime/ibus_text.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/ibus/ibus_text_unittest.cc
diff --git a/chromeos/dbus/ibus/ibus_text_unittest.cc b/chromeos/dbus/ibus/ibus_text_unittest.cc
deleted file mode 100644
index 1757a2ca9ca7847f9eddf1640bdf51dd752f64f2..0000000000000000000000000000000000000000
--- a/chromeos/dbus/ibus/ibus_text_unittest.cc
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-// TODO(nona): Add more tests.
-
-#include "chromeos/dbus/ibus/ibus_text.h"
-
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "chromeos/dbus/ibus/ibus_object.h"
-#include "dbus/message.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace chromeos {
-
-TEST(IBusTextTest, WriteReadTest) {
- const char kSampleText[] = "Sample Text";
- const char kAnnotation[] = "Annotation";
- const char kDescriptionTitle[] = "Description Title";
- const char kDescriptionBody[] = "Description Body";
- const IBusText::UnderlineAttribute kSampleUnderlineAttribute1 = {
- IBusText::IBUS_TEXT_UNDERLINE_SINGLE, 10, 20};
-
- const IBusText::UnderlineAttribute kSampleUnderlineAttribute2 = {
- IBusText::IBUS_TEXT_UNDERLINE_DOUBLE, 11, 21};
-
- const IBusText::UnderlineAttribute kSampleUnderlineAttribute3 = {
- IBusText::IBUS_TEXT_UNDERLINE_ERROR, 12, 22};
-
- const IBusText::SelectionAttribute kSampleSelectionAttribute = {30, 40};
-
- // Make IBusText
- IBusText text;
- text.set_text(kSampleText);
- text.set_annotation(kAnnotation);
- text.set_description_title(kDescriptionTitle);
- text.set_description_body(kDescriptionBody);
- std::vector<IBusText::UnderlineAttribute>* underline_attributes =
- text.mutable_underline_attributes();
- underline_attributes->push_back(kSampleUnderlineAttribute1);
- underline_attributes->push_back(kSampleUnderlineAttribute2);
- underline_attributes->push_back(kSampleUnderlineAttribute3);
- std::vector<IBusText::SelectionAttribute>* selection_attributes =
- text.mutable_selection_attributes();
- selection_attributes->push_back(kSampleSelectionAttribute);
-
- // Write to Response object.
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
- dbus::MessageWriter writer(response.get());
- AppendIBusText(text, &writer);
-
- // Read from Response object.
- dbus::MessageReader reader(response.get());
- IBusText expected_text;
- ASSERT_TRUE(PopIBusText(&reader, &expected_text));
- EXPECT_EQ(kSampleText, expected_text.text());
- EXPECT_EQ(kAnnotation, expected_text.annotation());
- EXPECT_EQ(kDescriptionTitle, expected_text.description_title());
- EXPECT_EQ(kDescriptionBody, expected_text.description_body());
- EXPECT_EQ(3U, expected_text.underline_attributes().size());
- EXPECT_EQ(1U, expected_text.selection_attributes().size());
-}
-
-TEST(IBusTextTest, StringAsIBusTextTest) {
- const char kSampleText[] = "Sample Text";
-
- // Write to Response object.
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
- dbus::MessageWriter writer(response.get());
- AppendStringAsIBusText(kSampleText, &writer);
-
- // Read from Response object.
- dbus::MessageReader reader(response.get());
- IBusText ibus_text;
- ASSERT_TRUE(PopIBusText(&reader, &ibus_text));
- EXPECT_EQ(kSampleText, ibus_text.text());
- EXPECT_TRUE(ibus_text.underline_attributes().empty());
- EXPECT_TRUE(ibus_text.selection_attributes().empty());
-}
-
-TEST(IBusTextTest, PopStringFromIBusTextTest) {
- const char kSampleText[] = "Sample Text";
-
- // Write to Response object.
- scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
- dbus::MessageWriter writer(response.get());
- AppendStringAsIBusText(kSampleText, &writer);
-
- // Read from Response object.
- dbus::MessageReader reader(response.get());
- std::string result;
- ASSERT_TRUE(PopStringFromIBusText(&reader, &result));
- EXPECT_EQ(kSampleText, result);
-}
-
-} // namespace chromeos
« no previous file with comments | « chromeos/dbus/ibus/ibus_text.cc ('k') | chromeos/ime/ibus_text.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698