[Mac] Tests for FullscreenToolbarController

chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <stddef.h>
 #import "base/mac/mac_util.h"
 
 #include "base/mac/sdk_forward_declarations.h"
@@ skipping 334 matching lines @@
     base::Timer timer(false, true);
     timer.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(15),
         base::Bind(&CheckBookmarkBarAnimation,
                    [controller() bookmarkBarController],
                    runner->QuitClosure()));
     runner->Run();
   }
 
-  void VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle style) {
-    EXPECT_EQ(
-        [[controller() fullscreenToolbarController] computeLayout].toolbarStyle,
-        style);
-
-    NSRect toolbarFrame = [[[controller() toolbarController] view] frame];
-    NSRect screenFrame = [[[controller() window] screen] frame];
-    if (style == FullscreenToolbarStyle::TOOLBAR_PRESENT)
-      EXPECT_LE(NSMaxY(toolbarFrame), NSMaxY(screenFrame));
-    else
-      EXPECT_GE(NSMinY(toolbarFrame), NSMaxY(screenFrame));
-  }
-
   NSInteger GetExpectedTopInfoBarTipHeight() {
     InfoBarContainerController* info_bar_container_controller =
         [controller() infoBarContainerController];
     CGFloat overlapping_tip_height =
         [info_bar_container_controller overlappingTipHeight];
     LocationBarViewMac* location_bar_view = [controller() locationBarBridge];
     NSPoint icon_bottom = location_bar_view->GetPageInfoBubblePoint();
 
     NSPoint info_bar_top = NSMakePoint(0,
         NSHeight([info_bar_container_controller view].frame) -
@@ skipping 346 matching lines @@
   VerifyFullscreenResizeFlagsAfterTransition();
 
   // Exit fullscreen and verify the flags.
   ToggleFullscreenAndWaitForNotification();
   VerifyFullscreenResizeFlagsAfterTransition();
 }
 
 // Tests that the omnibox and tabs are hidden/visible in fullscreen mode.
 // Ensure that when the user toggles this setting, the omnibox, tabs and
 // preferences are updated correctly.
-// Flakily times out. http://crbug.com/599119
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
-                       DISABLED_FullscreenToolbarIsVisibleAccordingToPrefs) {
+                       FullscreenToolbarIsVisibleAccordingToPrefs) {
   // Tests that the preference is set to true by default.
   PrefService* prefs = browser()->profile()->GetPrefs();
   EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
 
+  [[controller() fullscreenToolbarController] setMenubarTracker:nil];
+
   // Toggle fullscreen and check if the toolbar is shown.
   ToggleFullscreenAndWaitForNotification();
-  VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle::TOOLBAR_PRESENT);
+  EXPECT_EQ(
+      [[controller() fullscreenToolbarController] computeLayout].toolbarStyle,

[Robert Sesek, 2016/11/22 21:02:44]

nit: gtest writes error messages expecting EXPECT_EQ(expected, actual) 

[spqchan, 2016/11/22 23:04:56]

Oh snap, I wish I knew this earlier. Thanks for the heads up!

+      FullscreenToolbarStyle::TOOLBAR_PRESENT);
 
   // Toggle the visibility of the fullscreen toolbar. Verify that the toolbar
   // is hidden and the preference is correctly updated.
-  [[controller() fullscreenToolbarController] setMenuBarRevealProgress:0.0];
   chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR);
   EXPECT_FALSE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
-  VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle::TOOLBAR_HIDDEN);
+  EXPECT_EQ(
+      [[controller() fullscreenToolbarController] computeLayout].toolbarStyle,
+      FullscreenToolbarStyle::TOOLBAR_HIDDEN);
 
   // Toggle out and back into fullscreen and verify that the toolbar is still
   // hidden.
   ToggleFullscreenAndWaitForNotification();
   ToggleFullscreenAndWaitForNotification();
-  [[controller() fullscreenToolbarController] setMenuBarRevealProgress:0.0];
-  VerifyFullscreenToolbarVisibility(FullscreenToolbarStyle::TOOLBAR_HIDDEN);
+  EXPECT_EQ(
+      [[controller() fullscreenToolbarController] computeLayout].toolbarStyle,
+      FullscreenToolbarStyle::TOOLBAR_HIDDEN);
 
   chrome::ExecuteCommand(browser(), IDC_TOGGLE_FULLSCREEN_TOOLBAR);
   EXPECT_TRUE(prefs->GetBoolean(prefs::kShowFullscreenToolbar));
 }
 
 // Tests that the toolbar (tabstrip and omnibox) reveal animation is correctly
 // triggered by the changes in the tabstrip. The animation should not trigger
 // if the current tab is a NTP, since the location bar would be focused.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        FullscreenToolbarExposedForTabstripChanges) {
@@ skipping 29 matching lines @@
   EXPECT_FALSE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
   [fullscreenToolbarController resetToolbarFlag];
 
   // Switch to a non-NTP tab.
   TabStripModel* model = browser()->tab_strip_model();
   model->ActivateTabAt(1, true);
   ASSERT_FALSE([[controller() toolbarController] isLocationBarFocused]);
   EXPECT_TRUE([fullscreenToolbarController isRevealingToolbarForTabstrip]);
   [fullscreenToolbarController resetToolbarFlag];
 }