Eliminates gap at the top and bottom of docked area

ash/wm/dock/docked_window_layout_manager_unittest.cc

 // Copyright (c) 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 "ash/wm/dock/docked_window_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shelf/shelf.h"
@@ skipping 401 matching lines @@
   EXPECT_EQ(w2->GetRootWindow()->bounds().right(),
             w2->GetBoundsInScreen().right());
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w2->parent()->id());
 
   // Test that the gaps differ at most by a single pixel.
   gfx::Rect work_area =
       Shell::GetScreen()->GetDisplayNearestWindow(w1.get()).work_area();
   int gap1 = w1->GetBoundsInScreen().y();
   int gap2 = w2->GetBoundsInScreen().y() - w1->GetBoundsInScreen().bottom();
   int gap3 = work_area.bottom() - w2->GetBoundsInScreen().bottom();
-  EXPECT_NEAR(gap1, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap1);
   EXPECT_NEAR(gap2, min_dock_gap(), 1);
-  EXPECT_NEAR(gap3, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap3);
 }
 
 // Adds two non-overlapping windows and tests layout after a drag.
 TEST_P(DockedWindowLayoutManagerTest, TwoWindowsDragging) {
   if (!SupportsHostWindowResize())
     return;
 
   scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
   scoped_ptr<aura::Window> w2(CreateTestWindow(gfx::Rect(0, 0, 210, 202)));
   DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 20);
@@ skipping 11 matching lines @@
   ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromwindowOrigin(w2.get(), 0, 20));
   DragMove(0, -w2->bounds().height() / 2 - min_dock_gap() - 1);
   DragEnd();
 
   // Test the new windows order and that the gaps differ at most by a pixel.
   gfx::Rect work_area =
       Shell::GetScreen()->GetDisplayNearestWindow(w1.get()).work_area();
   int gap1 = w2->GetBoundsInScreen().y() - work_area.y();
   int gap2 = w1->GetBoundsInScreen().y() - w2->GetBoundsInScreen().bottom();
   int gap3 = work_area.bottom() - w1->GetBoundsInScreen().bottom();
-  EXPECT_NEAR(gap1, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap1);
   EXPECT_NEAR(gap2, min_dock_gap(), 1);
-  EXPECT_NEAR(gap3, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap3);
 }
 
 // Adds three overlapping windows and tests layout after a drag.
 TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDragging) {
   if (!SupportsHostWindowResize())
     return;
   UpdateDisplay("600x1000");
 
   scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(0, 0, 201, 310)));
   DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 20);
@@ skipping 14 matching lines @@
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w3->parent()->id());
 
   // Test that the top and bottom windows are clamped in work area and
   // that the gaps between the windows differ at most by a pixel.
   gfx::Rect work_area =
       Shell::GetScreen()->GetDisplayNearestWindow(w1.get()).work_area();
   int gap1 = w1->GetBoundsInScreen().y() - work_area.y();
   int gap2 = w2->GetBoundsInScreen().y() - w1->GetBoundsInScreen().bottom();
   int gap3 = w3->GetBoundsInScreen().y() - w2->GetBoundsInScreen().bottom();
   int gap4 = work_area.bottom() - w3->GetBoundsInScreen().bottom();
-  EXPECT_NEAR(gap1, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap1);
   EXPECT_NEAR(gap2, min_dock_gap(), 1);
   EXPECT_NEAR(gap3, min_dock_gap(), 1);
-  EXPECT_NEAR(gap4, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap4);
 
   // Drag w1 below the point where w1 and w2 would swap places. This point is
   // half way between the tops of those two windows.
   // A bit more vertical drag is needed to account for a window bounds changing
   // to its restore bounds during the drag.
   ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromwindowOrigin(w1.get(), 0, 20));
   DragMove(0, min_dock_gap() + w2->bounds().height() / 2 + 10);
 
   // During the drag the windows get rearranged and the top and the bottom
-  // should be limited by the work area + |kMinDockGap|.
-  EXPECT_EQ(min_dock_gap(), w2->GetBoundsInScreen().y());
+  // should be limited by the work area.
+  EXPECT_EQ(work_area.y(), w2->GetBoundsInScreen().y());
   EXPECT_GT(w1->GetBoundsInScreen().y(), w2->GetBoundsInScreen().y());
-  EXPECT_EQ(min_dock_gap(),
-            work_area.bottom() - w3->GetBoundsInScreen().bottom());
+  EXPECT_EQ(work_area.bottom(), w3->GetBoundsInScreen().bottom());
   DragEnd();
 
   // Test the new windows order and that the gaps differ at most by a pixel.
   gap1 = w2->GetBoundsInScreen().y() - work_area.y();
   gap2 = w1->GetBoundsInScreen().y() - w2->GetBoundsInScreen().bottom();
   gap3 = w3->GetBoundsInScreen().y() - w1->GetBoundsInScreen().bottom();
   gap4 = work_area.bottom() - w3->GetBoundsInScreen().bottom();
-  EXPECT_NEAR(gap1, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap1);
   EXPECT_NEAR(gap2, min_dock_gap(), 1);
   EXPECT_NEAR(gap3, min_dock_gap(), 1);
-  EXPECT_NEAR(gap4, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap4);
 }
 
 // Adds three windows in bottom display and tests layout after a drag.
 TEST_P(DockedWindowLayoutManagerTest, ThreeWindowsDraggingSecondScreen) {
   if (!SupportsMultipleDisplays() || !SupportsHostWindowResize())
     return;
 
   // Create two screen vertical layout.
   UpdateDisplay("600x1000,600x1000");
   // Layout the secondary display to the bottom of the primary.
@@ skipping 21 matching lines @@
   EXPECT_EQ(internal::kShellWindowId_DockedContainer, w3->parent()->id());
 
   gfx::Rect work_area =
       Shell::GetScreen()->GetDisplayNearestWindow(w1.get()).work_area();
   // Test that the top and bottom windows are clamped in work area and
   // that the overlaps between the windows differ at most by a pixel.
   int gap1 = w1->GetBoundsInScreen().y() - work_area.y();
   int gap2 = w2->GetBoundsInScreen().y() - w1->GetBoundsInScreen().bottom();
   int gap3 = w3->GetBoundsInScreen().y() - w2->GetBoundsInScreen().bottom();
   int gap4 = work_area.bottom() - w3->GetBoundsInScreen().bottom();
-  EXPECT_NEAR(gap1, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap1);
   EXPECT_NEAR(gap2, min_dock_gap(), 1);
   EXPECT_NEAR(gap3, min_dock_gap(), 1);
-  EXPECT_NEAR(gap4, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap4);
 
   // Drag w1 below the point where w1 and w2 would swap places. This point is
   // half way between the tops of those two windows.
   // A bit more vertical drag is needed to account for a window bounds changing
   // to its restore bounds during the drag.
   ASSERT_NO_FATAL_FAILURE(DragStartAtOffsetFromwindowOrigin(w1.get(), 0, 20));
   DragMove(0, min_dock_gap() + w2->bounds().height() / 2 + 10);
 
   // During the drag the windows get rearranged and the top and the bottom
-  // should be limited by the work area + |kMinDockGap|.
-  EXPECT_EQ(work_area.y() + min_dock_gap(), w2->GetBoundsInScreen().y());
+  // should be limited by the work area.
+  EXPECT_EQ(work_area.y(), w2->GetBoundsInScreen().y());
   EXPECT_GT(w1->GetBoundsInScreen().y(), w2->GetBoundsInScreen().y());
-  EXPECT_EQ(min_dock_gap(),
-            work_area.bottom() - w3->GetBoundsInScreen().bottom());
+  EXPECT_EQ(work_area.bottom(), w3->GetBoundsInScreen().bottom());
   DragEnd();
 
   // Test the new windows order and that the overlaps differ at most by a pixel.
   gap1 = w2->GetBoundsInScreen().y() - work_area.y();
   gap2 = w1->GetBoundsInScreen().y() - w2->GetBoundsInScreen().bottom();
   gap3 = w3->GetBoundsInScreen().y() - w1->GetBoundsInScreen().bottom();
   gap4 = work_area.bottom() - w3->GetBoundsInScreen().bottom();
-  EXPECT_NEAR(gap1, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap1);
   EXPECT_NEAR(gap2, min_dock_gap(), 1);
   EXPECT_NEAR(gap3, min_dock_gap(), 1);
-  EXPECT_NEAR(gap4, min_dock_gap(), 1);
+  EXPECT_EQ(0, gap4);
 }
 
 // Tests that a second window added to the dock is resized to match.
 TEST_P(DockedWindowLayoutManagerTest, TwoWindowsWidthNew) {
   if (!SupportsHostWindowResize())
     return;
 
   scoped_ptr<aura::Window> w1(CreateTestWindow(gfx::Rect(0, 0, 201, 201)));
   scoped_ptr<aura::Window> w2(CreateTestWindow(gfx::Rect(0, 0, 280, 202)));
   DragToVerticalPositionAndToEdge(DOCKED_EDGE_RIGHT, w1.get(), 20);
@@ skipping 206 matching lines @@
   EXPECT_LT(w2->GetBoundsInScreen().height(), work_area.height() / 2 - 10);
 }
 
 // Tests run twice - on both panels and normal windows
 INSTANTIATE_TEST_CASE_P(NormalOrPanel,
                         DockedWindowLayoutManagerTest,
                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL,
                                         ui::wm::WINDOW_TYPE_PANEL));
 }  // namespace internal
 }  // namespace ash