Fix handling of minimized panel count

chrome/browser/ui/panels/panel_overflow_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 <vector>
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/overflow_panel_strip.h"
@@ skipping 336 matching lines @@
   EXPECT_EQ(PanelStrip::IN_OVERFLOW, panels[5]->panel_strip()->type());
   EXPECT_TRUE(IsPanelVisible(panels[5]));
   EXPECT_EQ(PanelStrip::IN_OVERFLOW, panels[6]->panel_strip()->type());
   EXPECT_FALSE(IsPanelVisible(panels[6]));
   EXPECT_EQ(PanelStrip::IN_OVERFLOW, panels[7]->panel_strip()->type());
   EXPECT_FALSE(IsPanelVisible(panels[7]));
 
   PanelManager::GetInstance()->CloseAll();
 }
 
+IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, AddMinimizedTillOverflow) {
+  PanelManager* panel_manager = PanelManager::GetInstance();
+  DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+  OverflowPanelStrip* overflow_strip = panel_manager->overflow_strip();
+
+  EXPECT_EQ(0, panel_manager->num_panels());
+  EXPECT_EQ(0, docked_strip->num_panels());
+  EXPECT_EQ(0, overflow_strip->num_panels());
+
+  CreatePanelParams params("Test", gfx::Rect(0, 0, 100, 100), SHOW_AS_INACTIVE);
+
+  // TEST FAILS WHEN THIS LINE IS UNCOMMENTED

[jennb, 2012/03/14 20:11:40]

Delete these 2 lines.

+  // params.wait_for_fully_created = false;
+
+  unsigned int num_panels_to_add = 10;
+  unsigned int num_panels = 0;
+  Panel* panel7;

[jennb, 2012/03/14 20:11:40]

initialize var to avoid linux compile error

+  for (; num_panels < num_panels_to_add; ++num_panels) {
+    Panel* panel = CreatePanelWithParams(params);
+    if (num_panels == 7) panel7 = panel;

[jennb, 2012/03/14 20:11:40]

single line style not allowed

+    panel->SetExpansionState(Panel::MINIMIZED);
+
+    panel->panel_strip()->RemovePanel(panel);
+    EXPECT_EQ(NULL, panel->panel_strip());
+
+    docked_strip->AddPanel(panel, PanelStrip::DEFAULT_POSITION);
+    EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
+    }

[jennb, 2012/03/14 20:11:40]

Formatting error.

+
+  EXPECT_EQ(num_panels, num_panels_to_add);

[jennb, 2012/03/14 20:11:40]

reverse order of params

+  LOG(INFO) << "Panel counts: docked strip: " << docked_strip->num_panels() <<

[jennb, 2012/03/14 20:11:40]

Delete before commit

+               " (minimized: " << docked_strip->minimized_panel_count() <<
+               "), temp. layout: " <<
+               docked_strip->num_temporary_layout_panels() <<
+               ", overflow: " << overflow_strip->num_panels();
+  EXPECT_EQ(num_panels, static_cast<unsigned int>
+                (docked_strip->minimized_panel_count() +
+                         docked_strip->num_temporary_layout_panels() +
+                         overflow_strip->num_panels()));
+
+  WaitForLayoutModeChanged(panel7, PanelStrip::IN_OVERFLOW);

[jennb, 2012/03/14 20:11:40]

What is the purpose of this wait? At the end of your for loop, every panel
should be in their final strip already.

+
+  EXPECT_EQ(num_panels, static_cast<unsigned int>
+                (docked_strip->minimized_panel_count() +
+                 docked_strip->num_temporary_layout_panels() +
+                 overflow_strip->num_panels()));
+  EXPECT_EQ(0, docked_strip->num_temporary_layout_panels());

[jennb, 2012/03/14 20:11:40]

This would be true at the end of your for-loop because you've explicitly done
RemovePanel() after creating the panel. Move this line up after line 386 and you
can skip adding docked_strip->num_temporary_layout_panels() in lines 392 and
399.

+
+  PanelManager::GetInstance()->CloseAll();
+}
+
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
                        CreatePanelOnDelayedOverflow) {
   // Create 2 big panels.
   CreatePanelWithBounds("Panel0", gfx::Rect(0, 0, 260, 200));
   CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 260, 200));
 
   // Create an overflow panel without waiting for it to be moved to overflow.
   CreatePanelParams params(
       "Panel2", gfx::Rect(0, 0, 255, 200), SHOW_AS_INACTIVE);
   params.wait_for_fully_created = false;
@@ skipping 1281 matching lines @@
   // End full screen mode, expansion occurs again.
   overflow_strip->OnFullScreenModeChanged(false);
   EXPECT_TRUE(panel_manager->mouse_watcher()->IsActive());
   MoveMouse(in_overflow_area);
   EXPECT_GT(overflow_strip->current_display_width(), iconified_width);
   MoveMouse(beyond_overflow_area);
   EXPECT_EQ(iconified_width, overflow_strip->current_display_width());
 
   panel_manager->CloseAll();
 }