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

Unified Diff: views/ime/character_composer_unittest.cc

Issue 7264015: CL for readability review (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Style fixes Created 9 years, 5 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 | « views/ime/character_composer.cc ('k') | views/ime/input_method_ibus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/ime/character_composer_unittest.cc
diff --git a/views/ime/character_composer_unittest.cc b/views/ime/character_composer_unittest.cc
index 05dc3c11618b74f2382f8aa93bf8d679c2e2786b..c0190c2b0829ad4ad39f7bc816035169265ad9e0 100644
--- a/views/ime/character_composer_unittest.cc
+++ b/views/ime/character_composer_unittest.cc
@@ -11,29 +11,29 @@ namespace views {
namespace {
-// Expects key is not filtered and no character is composed
+// Expects key is not filtered and no character is composed.
void ExpectKeyNotFiltered(CharacterComposer* character_composer, uint key) {
EXPECT_FALSE(character_composer->FilterKeyPress(key));
- EXPECT_TRUE(character_composer->GetComposedCharacter().empty());
+ EXPECT_TRUE(character_composer->composed_character().empty());
}
-// Expects key is filtered and no character is composed
+// Expects key is filtered and no character is composed.
void ExpectKeyFiltered(CharacterComposer* character_composer, uint key) {
EXPECT_TRUE(character_composer->FilterKeyPress(key));
- EXPECT_TRUE(character_composer->GetComposedCharacter().empty());
+ EXPECT_TRUE(character_composer->composed_character().empty());
}
-// Expects |expected_character| is composed after sequence [key1, key2]
+// Expects |expected_character| is composed after sequence [key1, key2].
void ExpectCharacterComposed(CharacterComposer* character_composer,
uint key1,
uint key2,
const string16& expected_character) {
ExpectKeyFiltered(character_composer, key1);
EXPECT_TRUE(character_composer->FilterKeyPress(key2));
- EXPECT_EQ(character_composer->GetComposedCharacter(), expected_character);
+ EXPECT_EQ(character_composer->composed_character(), expected_character);
}
-// Expects |expected_character| is composed after sequence [key1, key2, key3]
+// Expects |expected_character| is composed after sequence [key1, key2, key3].
void ExpectCharacterComposed(CharacterComposer* character_composer,
uint key1,
uint key2,
@@ -44,7 +44,7 @@ void ExpectCharacterComposed(CharacterComposer* character_composer,
}
// Expects |expected_character| is composed after sequence [key1, key2, key3,
-// key 4]
+// key 4].
void ExpectCharacterComposed(CharacterComposer* character_composer,
uint key1,
uint key2,
@@ -56,11 +56,11 @@ void ExpectCharacterComposed(CharacterComposer* character_composer,
expected_character);
}
-} // anonymous namespace
+} // namespace
TEST(CharacterComposerTest, InitialState) {
CharacterComposer character_composer;
- EXPECT_TRUE(character_composer.GetComposedCharacter().empty());
+ EXPECT_TRUE(character_composer.composed_character().empty());
}
TEST(CharacterComposerTest, NormalKeyIsNotFiltered) {
@@ -77,16 +77,16 @@ TEST(CharacterComposerTest, NormalKeyIsNotFiltered) {
TEST(CharacterComposerTest, PartiallyMatchingSequence) {
CharacterComposer character_composer;
- // Composition with sequence ['dead acute', '1'] will fail
+ // Composition with sequence ['dead acute', '1'] will fail.
ExpectKeyFiltered(&character_composer, GDK_KEY_dead_acute);
EXPECT_TRUE(character_composer.FilterKeyPress(GDK_KEY_1));
- EXPECT_TRUE(character_composer.GetComposedCharacter().empty());
+ EXPECT_TRUE(character_composer.composed_character().empty());
- // Composition with sequence ['dead acute', 'dead circumflex', '1'] will fail
+ // Composition with sequence ['dead acute', 'dead circumflex', '1'] will fail.
ExpectKeyFiltered(&character_composer, GDK_KEY_dead_acute);
ExpectKeyFiltered(&character_composer, GDK_KEY_dead_circumflex);
EXPECT_TRUE(character_composer.FilterKeyPress(GDK_KEY_1));
- EXPECT_TRUE(character_composer.GetComposedCharacter().empty());
+ EXPECT_TRUE(character_composer.composed_character().empty());
}
TEST(CharacterComposerTest, FullyMatchingSequences) {
@@ -117,11 +117,11 @@ TEST(CharacterComposerTest, FullyMatchingSequences) {
TEST(CharacterComposerTest, FullyMatchingSequencesAfterMatchingFailure) {
CharacterComposer character_composer;
- // Composition with sequence ['dead acute', 'dead circumflex', '1'] will fail
+ // Composition with sequence ['dead acute', 'dead circumflex', '1'] will fail.
ExpectKeyFiltered(&character_composer, GDK_KEY_dead_acute);
ExpectKeyFiltered(&character_composer, GDK_KEY_dead_circumflex);
EXPECT_TRUE(character_composer.FilterKeyPress(GDK_KEY_1));
- EXPECT_TRUE(character_composer.GetComposedCharacter().empty());
+ EXPECT_TRUE(character_composer.composed_character().empty());
// LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
ExpectCharacterComposed(&character_composer, GDK_KEY_dead_acute,
GDK_KEY_dead_circumflex, GDK_KEY_a,
@@ -133,7 +133,7 @@ TEST(CharacterComposerTest, ComposedCharacterIsClearedAfterReset) {
ExpectCharacterComposed(&character_composer, GDK_KEY_dead_acute, GDK_KEY_a,
string16(1, 0x00E1));
character_composer.Reset();
- EXPECT_TRUE(character_composer.GetComposedCharacter().empty());
+ EXPECT_TRUE(character_composer.composed_character().empty());
}
TEST(CharacterComposerTest, CompositionStateIsClearedAfterReset) {
@@ -143,7 +143,7 @@ TEST(CharacterComposerTest, CompositionStateIsClearedAfterReset) {
ExpectKeyFiltered(&character_composer, GDK_KEY_dead_acute);
character_composer.Reset();
EXPECT_FALSE(character_composer.FilterKeyPress(GDK_KEY_a));
- EXPECT_TRUE(character_composer.GetComposedCharacter().empty());
+ EXPECT_TRUE(character_composer.composed_character().empty());
}
} // namespace views
« no previous file with comments | « views/ime/character_composer.cc ('k') | views/ime/input_method_ibus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698