Translate new UX: Fix the visual and behavior of 'Done' button

chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc

 // Copyright 2013 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/ui/views/translate/translate_bubble_view.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/translate/translate_bubble_model.h"
 #include "chrome/browser/ui/translate/translate_bubble_view_state_transition.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
 
 class MockTranslateBubbleModel : public TranslateBubbleModel {
  public:
   explicit MockTranslateBubbleModel(TranslateBubbleModel::ViewState view_state)
       : view_state_transition_(view_state),
         original_language_index_(0),
         target_language_index_(1),
         never_translate_language_(false),
         never_translate_site_(false),
         should_always_translate_(false),
         set_always_translate_called_count_(0),
         translate_called_(false),
         revert_translation_called_(false),
-        translation_declined_called_(false) {
+        translation_declined_called_(false),
+        original_language_index_on_translation_(-1),
+        target_language_index_on_translation_(-1) {
   }
 
   virtual TranslateBubbleModel::ViewState GetViewState() const OVERRIDE {
     return view_state_transition_.view_state();
   }
 
   virtual void SetViewState(TranslateBubbleModel::ViewState view_state)
       OVERRIDE {
     view_state_transition_.SetViewState(view_state);
   }
@@ skipping 38 matching lines @@
     return should_always_translate_;
   }
 
   virtual void SetAlwaysTranslate(bool value) OVERRIDE {
     should_always_translate_ = value;
     set_always_translate_called_count_++;
   }
 
   virtual void Translate() OVERRIDE {
     translate_called_ = true;
+    original_language_index_on_translation_ = original_language_index_;
+    target_language_index_on_translation_ = target_language_index_;
   }
 
   virtual void RevertTranslation() OVERRIDE {
     revert_translation_called_ = true;
   }
 
   virtual void TranslationDeclined() OVERRIDE {
     translation_declined_called_ = true;
   }
 
+  virtual bool IsPageTranslatedInCurrentLanguages() const OVERRIDE {
+    return original_language_index_on_translation_ ==
+        original_language_index_ &&
+        target_language_index_on_translation_ == target_language_index_;
+  }
+
   TranslateBubbleViewStateTransition view_state_transition_;
   int original_language_index_;
   int target_language_index_;
   bool never_translate_language_;
   bool never_translate_site_;
   bool should_always_translate_;
   int set_always_translate_called_count_;
   bool translate_called_;
   bool revert_translation_called_;
   bool translation_declined_called_;
+  int original_language_index_on_translation_;
+  int target_language_index_on_translation_;
 };
 
 }  // namespace
 
 class TranslateBubbleViewTest : public views::ViewsTestBase {
  public:
   TranslateBubbleViewTest() {
   }
 
  protected:
@@ skipping 105 matching lines @@
   bubble_->HandleButtonPressed(TranslateBubbleView::BUTTON_ID_ALWAYS_TRANSLATE);
   EXPECT_FALSE(mock_model_->should_always_translate_);
   EXPECT_EQ(0, mock_model_->set_always_translate_called_count_);
 
   // Click the done button. The state is saved.
   bubble_->HandleButtonPressed(TranslateBubbleView::BUTTON_ID_DONE);
   EXPECT_TRUE(mock_model_->should_always_translate_);
   EXPECT_EQ(1, mock_model_->set_always_translate_called_count_);
 }
 
-
 TEST_F(TranslateBubbleViewTest, DoneButton) {
   bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ADVANCED);
 
   // Click the "Done" button to translate. The selected languages by the user
   // are applied.
   EXPECT_FALSE(mock_model_->translate_called_);
   bubble_->source_language_combobox_->SetSelectedIndex(10);
   bubble_->HandleComboboxSelectedIndexChanged(
       TranslateBubbleView::COMBOBOX_ID_SOURCE_LANGUAGE);
   bubble_->target_language_combobox_->SetSelectedIndex(20);
   bubble_->HandleComboboxSelectedIndexChanged(
       TranslateBubbleView::COMBOBOX_ID_TARGET_LANGUAGE);
   bubble_->HandleButtonPressed(TranslateBubbleView::BUTTON_ID_DONE);
   EXPECT_TRUE(mock_model_->translate_called_);
   EXPECT_EQ(10, mock_model_->original_language_index_);
   EXPECT_EQ(20, mock_model_->target_language_index_);
 }
 
+TEST_F(TranslateBubbleViewTest, DoneButtonWithoutTranslating) {
+  EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE,
+            bubble_->GetViewState());
+
+  // Translate the page once.
+  mock_model_->Translate();
+  EXPECT_TRUE(mock_model_->translate_called_);
+
+  // Go back to the initial view.
+  EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE,
+            bubble_->GetViewState());
+  mock_model_->translate_called_ = false;
+
+  EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE,
+            bubble_->GetViewState());
+  bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ADVANCED);
+
+  // Click the "Done" button with the current language pair. This time,
+  // translation is not performed and the view state will be back to the
+  // previous view.
+  bubble_->HandleButtonPressed(TranslateBubbleView::BUTTON_ID_DONE);
+  EXPECT_FALSE(mock_model_->translate_called_);
+
+  EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE,
+            bubble_->GetViewState());
+}
+
 TEST_F(TranslateBubbleViewTest, CancelButtonReturningBeforeTranslate) {
   bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE);
   bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ADVANCED);
 
   // Click the "Cancel" button to go back.
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ADVANCED, bubble_->GetViewState());
   bubble_->HandleButtonPressed(TranslateBubbleView::BUTTON_ID_CANCEL);
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE,
             bubble_->GetViewState());
 }
@@ skipping 11 matching lines @@
 
 TEST_F(TranslateBubbleViewTest, CancelButtonReturningError) {
   bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ERROR);
   bubble_->SwitchView(TranslateBubbleModel::VIEW_STATE_ADVANCED);
 
   // Click the "Cancel" button to go back.
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ADVANCED, bubble_->GetViewState());
   bubble_->HandleButtonPressed(TranslateBubbleView::BUTTON_ID_CANCEL);
   EXPECT_EQ(TranslateBubbleModel::VIEW_STATE_ERROR, bubble_->GetViewState());
 }