Disabling wallet and mocking out more of WalletClient while testing.

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/autofill/testable_autofill_dialog_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "components/autofill/content/browser/wallet/test_wallet_client.h"
 #include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "components/autofill/core/browser/autofill_common_test.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_switches.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 61 matching lines @@
                                const FormData& form_data,
                                const AutofillMetrics& metric_logger,
                                scoped_refptr<content::MessageLoopRunner> runner,
                                const DialogType dialog_type)
       : AutofillDialogControllerImpl(contents,
                                      form_data,
                                      GURL(),
                                      dialog_type,
                                      base::Bind(&MockCallback)),
         metric_logger_(metric_logger),
+        test_wallet_client_(
+            Profile::FromBrowserContext(contents->GetBrowserContext())->
+                GetRequestContext(), this),
         message_loop_runner_(runner),
         use_validation_(false) {}
 
   virtual ~TestAutofillDialogController() {}
 
   virtual void ViewClosed() OVERRIDE {
     message_loop_runner_->Quit();
     AutofillDialogControllerImpl::ViewClosed();
   }
 
@@ skipping 45 matching lines @@
 
   void set_use_validation(bool use_validation) {
     use_validation_ = use_validation;
   }
 
  protected:
   virtual PersonalDataManager* GetManager() OVERRIDE {
     return &test_manager_;
   }
 
+  virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
+    return &test_wallet_client_;
+  }
+
  private:
   // To specify our own metric logger.
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
     return metric_logger_;
   }
 
   const AutofillMetrics& metric_logger_;
   TestPersonalDataManager test_manager_;
+  testing::NiceMock<wallet::TestWalletClient> test_wallet_client_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
   bool use_validation_;
 
   // A list of notifications to show in the notification area of the dialog.
   // This is used to control what |CurrentNotifications()| returns for testing.
   std::vector<DialogNotification> notifications_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAutofillDialogController);
 };
 
@@ skipping 280 matching lines @@
   ASSERT_EQ(&triggering_input, controller()->input_showing_popup());
   controller()->DidAcceptSuggestion(string16(), 0);
 
   for (size_t i = 0; i < inputs.size(); ++i) {
     EXPECT_EQ(expectations[i], view->GetTextContentsOfInput(inputs[i]));
   }
 }
 
 // Test that Autocheckout steps are shown after submitting the
 // dialog for controller with type DIALOG_TYPE_AUTOCHECKOUT.
-IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
-                       DISABLED_AutocheckoutShowsSteps) {
+IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, AutocheckoutShowsSteps) {
   InitializeControllerOfType(DIALOG_TYPE_AUTOCHECKOUT);
   controller()->AddAutocheckoutStep(AUTOCHECKOUT_STEP_PROXY_CARD);
 
   EXPECT_TRUE(controller()->ShouldShowDetailArea());
   EXPECT_TRUE(controller()->CurrentAutocheckoutSteps().empty());
   EXPECT_FALSE(controller()->ShouldShowProgressBar());
 
   controller()->GetTestableView()->SubmitForTesting();
   EXPECT_FALSE(controller()->ShouldShowDetailArea());
   EXPECT_FALSE(controller()->CurrentAutocheckoutSteps().empty());
@@ skipping 185 matching lines @@
 
   ASSERT_TRUE(model->IsItemCheckedAt(0));
   EXPECT_FALSE(controller()->IsEditingExistingData(SECTION_CC));
 
   model->ActivatedAt(1);
   ASSERT_TRUE(model->IsItemCheckedAt(1));
   EXPECT_TRUE(controller()->IsEditingExistingData(SECTION_CC));
 }
 
 // Notifications with long message text should not make the dialog bigger.
-IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
-                       DISABLED_LongNotifications) {
+IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, LongNotifications) {
   InitializeControllerOfType(DIALOG_TYPE_REQUEST_AUTOCOMPLETE);
+  controller()->DisableWallet(wallet::WalletClient::UNKNOWN_ERROR);

[Ilya Sherman, 2013/07/11 01:06:30]

Why is this needed in just this one particular test?  Docs might be helpful.

[Dan Beam, 2013/07/11 01:29:36]

there's 3 other cases in this file.  in theory it shouldn't be necessary now i
guess... it was a stopgap solution to blocking requests before.  do you want me
to remove?

[Dan Beam, 2013/07/11 01:34:36]

and... they're gone.

 
   const gfx::Size no_notification_size =
       controller()->GetTestableView()->GetSize();
   ASSERT_GT(no_notification_size.width(), 0);
 
   std::vector<DialogNotification> notifications;
   notifications.push_back(
       DialogNotification(DialogNotification::DEVELOPER_WARNING, ASCIIToUTF16(
           "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do "
           "eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim "
@@ skipping 169 matching lines @@
   EXPECT_EQ(cc_number.type, new_cc_number.type);
   EXPECT_EQ(ASCIIToUTF16("4111111111111111"),
             view->GetTextContentsOfInput(new_cc_number));
 
   EXPECT_NE(ASCIIToUTF16("shipping name"),
             view->GetTextContentsOfInput(shipping_zip));
 }
 #endif  // defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
 
 }  // namespace autofill