Fix candidate window position issue.

chrome/browser/chromeos/input_method/candidate_window_view_unittest.cc

 // 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.
 
 #include "chrome/browser/chromeos/input_method/candidate_window_view.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/input_method/candidate_view.h"
@@ skipping 17 matching lines @@
   table->annotations.clear();
   table->mozc_candidates.Clear();
 }
 
 void InitializeMozcCandidates(InputMethodLookupTable* table) {
   table->mozc_candidates.Clear();
   table->mozc_candidates.set_position(0);
   table->mozc_candidates.set_size(0);
 }
 
-void SetCaretRectIntoMozcCandidates(
-    InputMethodLookupTable* table,
-    mozc::commands::Candidates::CandidateWindowLocation location,
-    int x,
-    int y,
-    int width,
-    int height) {
-  table->mozc_candidates.set_window_location(location);
-  mozc::commands::Rectangle *rect =
-      table->mozc_candidates.mutable_composition_rectangle();
-  rect->set_x(x);
-  rect->set_y(y);
-  rect->set_width(width);
-  rect->set_height(height);
-}
-
-void AppendCandidateIntoMozcCandidates(InputMethodLookupTable* table,
-                                       std::string value) {
+void AppendCandidateIntoLookupTable(InputMethodLookupTable* table,
+                                    std::string value) {

[Yusuke Sato, 2012/06/13 14:31:26]

const reference

[Seigo Nonaka, 2012/06/13 15:07:18]

Done.

   mozc::commands::Candidates::Candidate *candidate =
       table->mozc_candidates.add_candidate();
 
   int current_entry_count = table->mozc_candidates.candidate_size();
+  table->candidates.push_back(value);
   candidate->set_index(current_entry_count);
   candidate->set_value(value);
   candidate->set_id(current_entry_count);
   candidate->set_information_id(current_entry_count);
 }
 
 }  // namespace
 
 class CandidateWindowViewTest : public views::ViewsTestBase {
  protected:
@@ skipping 121 matching lines @@
   EXPECT_TRUE(CandidateWindowView::ShouldUpdateCandidateViews(old_table,
                                                               new_table));
 }
 
 TEST_F(CandidateWindowViewTest, MozcSuggestWindowShouldUpdateTest) {
   // ShouldUpdateCandidateViews method should also judge with consideration of
   // the mozc specific candidate information. Following tests verify them.
   const char* kSampleCandidate1 = "Sample Candidate 1";
   const char* kSampleCandidate2 = "Sample Candidate 2";
 
-  const int kCaretPositionX1 = 10;
-  const int kCaretPositionY1 = 20;
-  const int kCaretPositionWidth1 = 30;
-  const int kCaretPositionHeight1 = 40;
-
-  const int kCaretPositionX2 = 15;
-  const int kCaretPositionY2 = 25;
-  const int kCaretPositionWidth2 = 35;
-  const int kCaretPositionHeight2 = 45;
-
   const size_t kPageSize = 10;
 
   InputMethodLookupTable old_table;
   InputMethodLookupTable new_table;
 
   // State chagne from using non-mozc candidate to mozc candidate.
   ClearInputMethodLookupTable(kPageSize, &old_table);
   ClearInputMethodLookupTable(kPageSize, &new_table);
 
   old_table.candidates.push_back(kSampleCandidate1);
   InitializeMozcCandidates(&new_table);
-  AppendCandidateIntoMozcCandidates(&new_table, kSampleCandidate1);
-  SetCaretRectIntoMozcCandidates(&new_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
+  AppendCandidateIntoLookupTable(&new_table, kSampleCandidate2);
 
   EXPECT_TRUE(CandidateWindowView::ShouldUpdateCandidateViews(old_table,
                                                               new_table));
 
   // State change from using mozc candidate to non-mozc candidate
   ClearInputMethodLookupTable(kPageSize, &old_table);
   ClearInputMethodLookupTable(kPageSize, &new_table);
 
   InitializeMozcCandidates(&old_table);
-  AppendCandidateIntoMozcCandidates(&old_table, kSampleCandidate1);
-  SetCaretRectIntoMozcCandidates(&old_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
+  AppendCandidateIntoLookupTable(&old_table, kSampleCandidate1);
 
-  new_table.candidates.push_back(kSampleCandidate1);
+  new_table.candidates.push_back(kSampleCandidate2);
 
   EXPECT_TRUE(CandidateWindowView::ShouldUpdateCandidateViews(old_table,
                                                               new_table));
 
   // State change from using mozc candidate to mozc candidate
 
   // No change
   ClearInputMethodLookupTable(kPageSize, &old_table);
   ClearInputMethodLookupTable(kPageSize, &new_table);
 
   InitializeMozcCandidates(&old_table);
-  AppendCandidateIntoMozcCandidates(&old_table, kSampleCandidate1);
-  SetCaretRectIntoMozcCandidates(&old_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
+  AppendCandidateIntoLookupTable(&old_table, kSampleCandidate1);
 
   InitializeMozcCandidates(&new_table);
-  AppendCandidateIntoMozcCandidates(&new_table, kSampleCandidate1);
-  SetCaretRectIntoMozcCandidates(&new_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
+  AppendCandidateIntoLookupTable(&new_table, kSampleCandidate1);
 
   EXPECT_FALSE(CandidateWindowView::ShouldUpdateCandidateViews(old_table,
                                                                new_table));
-  // Position change only
+  // Candidate contents
   ClearInputMethodLookupTable(kPageSize, &old_table);
   ClearInputMethodLookupTable(kPageSize, &new_table);
 
   InitializeMozcCandidates(&old_table);
-  AppendCandidateIntoMozcCandidates(&old_table, kSampleCandidate1);
-  SetCaretRectIntoMozcCandidates(&old_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
+  AppendCandidateIntoLookupTable(&old_table, kSampleCandidate1);
 
   InitializeMozcCandidates(&new_table);
-  AppendCandidateIntoMozcCandidates(&new_table, kSampleCandidate1);
-  SetCaretRectIntoMozcCandidates(&new_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX2,
-                                 kCaretPositionY2,
-                                 kCaretPositionWidth2,
-                                 kCaretPositionHeight2);
+  AppendCandidateIntoLookupTable(&new_table, kSampleCandidate2);
 
   EXPECT_TRUE(CandidateWindowView::ShouldUpdateCandidateViews(old_table,
                                                               new_table));
-  // Candidate contents only
-  ClearInputMethodLookupTable(kPageSize, &old_table);
-  ClearInputMethodLookupTable(kPageSize, &new_table);
-
-  InitializeMozcCandidates(&old_table);
-  AppendCandidateIntoMozcCandidates(&old_table, kSampleCandidate1);
-  SetCaretRectIntoMozcCandidates(&old_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
-
-  InitializeMozcCandidates(&new_table);
-  AppendCandidateIntoMozcCandidates(&new_table, kSampleCandidate2);
-  SetCaretRectIntoMozcCandidates(&new_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
-
-  EXPECT_TRUE(CandidateWindowView::ShouldUpdateCandidateViews(old_table,
-                                                              new_table));
-
-  // Both candidate and position
-  ClearInputMethodLookupTable(kPageSize, &old_table);
-  ClearInputMethodLookupTable(kPageSize, &new_table);
-
-  InitializeMozcCandidates(&old_table);
-  AppendCandidateIntoMozcCandidates(&old_table, kSampleCandidate1);
-  SetCaretRectIntoMozcCandidates(&old_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
-
-  InitializeMozcCandidates(&new_table);
-  AppendCandidateIntoMozcCandidates(&new_table, kSampleCandidate2);
-  SetCaretRectIntoMozcCandidates(&new_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX2,
-                                 kCaretPositionY2,
-                                 kCaretPositionWidth2,
-                                 kCaretPositionHeight2);
-
-  EXPECT_TRUE(CandidateWindowView::ShouldUpdateCandidateViews(old_table,
-                                                              new_table));
 }
 
 TEST_F(CandidateWindowViewTest, MozcUpdateCandidateTest) {
   // This test verifies whether UpdateCandidates function updates window mozc
   // specific candidate position correctly on the correct condition.
 
   // For testing, we have to prepare empty widget.
   // We should NOT manually free widget by default, otherwise double free will
   // be occurred. So, we should instantiate widget class with "new" operation.
   views::Widget* widget = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   widget->Init(params);
 
   CandidateWindowView candidate_window_view(widget);
   candidate_window_view.Init();
 
-  const int kCaretPositionX1 = 10;
-  const int kCaretPositionY1 = 20;
-  const int kCaretPositionWidth1 = 30;
-  const int kCaretPositionHeight1 = 40;
-
-  const int kCaretPositionX2 = 15;
-  const int kCaretPositionY2 = 25;
-  const int kCaretPositionWidth2 = 35;
-  const int kCaretPositionHeight2 = 45;
-
   const size_t kPageSize = 10;
 
   InputMethodLookupTable new_table;
   ClearInputMethodLookupTable(kPageSize, &new_table);
   InitializeMozcCandidates(&new_table);
 
-  // If window location is CARET, use default position. So
-  // is_suggestion_window_location_available_ should be false.
-  SetCaretRectIntoMozcCandidates(&new_table,
-                                 mozc::commands::Candidates::CARET,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
+  // If candidate category is SUGGESTION, should not show at composition head.
+  new_table.mozc_candidates.set_category(mozc::commands::CONVERSION);
   candidate_window_view.UpdateCandidates(new_table);
-  EXPECT_FALSE(candidate_window_view.is_suggestion_window_location_available_);
+  EXPECT_FALSE(candidate_window_view.should_show_at_composition_head_);
 
-  // If window location is COMPOSITION, update position and set
-  // is_suggestion_window_location_available_ as true.
-  SetCaretRectIntoMozcCandidates(&new_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX1,
-                                 kCaretPositionY1,
-                                 kCaretPositionWidth1,
-                                 kCaretPositionHeight1);
+  // If candidate category is SUGGESTION, should show at composition head.
+  new_table.mozc_candidates.set_category(mozc::commands::SUGGESTION);
   candidate_window_view.UpdateCandidates(new_table);
-  EXPECT_TRUE(candidate_window_view.is_suggestion_window_location_available_);
-  EXPECT_EQ(kCaretPositionX1,
-            candidate_window_view.suggestion_window_location_.x());
-  EXPECT_EQ(kCaretPositionY1,
-            candidate_window_view.suggestion_window_location_.y());
-  EXPECT_EQ(kCaretPositionWidth1,
-            candidate_window_view.suggestion_window_location_.width());
-  EXPECT_EQ(kCaretPositionHeight1,
-            candidate_window_view.suggestion_window_location_.height());
-
-  SetCaretRectIntoMozcCandidates(&new_table,
-                                 mozc::commands::Candidates::COMPOSITION,
-                                 kCaretPositionX2,
-                                 kCaretPositionY2,
-                                 kCaretPositionWidth2,
-                                 kCaretPositionHeight2);
-  candidate_window_view.UpdateCandidates(new_table);
-  EXPECT_TRUE(candidate_window_view.is_suggestion_window_location_available_);
-  EXPECT_EQ(kCaretPositionX2,
-            candidate_window_view.suggestion_window_location_.x());
-  EXPECT_EQ(kCaretPositionY2,
-            candidate_window_view.suggestion_window_location_.y());
-  EXPECT_EQ(kCaretPositionWidth2,
-            candidate_window_view.suggestion_window_location_.width());
-  EXPECT_EQ(kCaretPositionHeight2,
-            candidate_window_view.suggestion_window_location_.height());
+  EXPECT_TRUE(candidate_window_view.should_show_at_composition_head_);
 
   // We should call CloseNow method, otherwise this test will leak memory.
   widget->CloseNow();
 }
 
 TEST_F(CandidateWindowViewTest, ShortcutSettingTest) {
   const char* kSampleCandidate[] = {
     "Sample Candidate 1",
     "Sample Candidate 2",
     "Sample Candidate 3"
@@ skipping 335 matching lines @@
   for (size_t i = 1; i < candidate_window_view.candidate_views_.size(); ++i) {
     const CandidateView* view = candidate_window_view.candidate_views_[i];
     EXPECT_EQ(before_height, view->GetContentsBounds().height());
   }
 
   // We should call CloseNow method, otherwise this test will leak memory.
   widget->CloseNow();
 }
 }  // namespace input_method
 }  // namespace chromeos