Fixes bug where windows weren't being moved and resized if the desktop

ui/aura_shell/workspace/workspace_manager_unittest.cc

 // Copyright (c) 2011 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 "ui/aura_shell/workspace/workspace.h"
 #include "ui/aura_shell/workspace/workspace_manager.h"
-#include "ui/aura_shell/workspace/workspace.h"
-
+#include "ui/aura/desktop.h"
+#include "ui/aura/screen_aura.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/test/test_desktop_delegate.h"
-#include "ui/aura/desktop.h"
-#include "ui/aura/screen_aura.h"
 #include "ui/aura/window.h"
 
-namespace {
+using aura::Window;
+
+namespace aura_shell {
+namespace internal {
 
 class WorkspaceManagerTestBase : public aura::test::AuraTestBase {
  public:
   WorkspaceManagerTestBase() {}
   virtual ~WorkspaceManagerTestBase() {}
 
   virtual void SetUp() OVERRIDE {
     aura::test::AuraTestBase::SetUp();
-    manager_.reset(new aura_shell::WorkspaceManager(viewport()));
+    manager_.reset(new WorkspaceManager(viewport()));
   }
 
   virtual void TearDown() OVERRIDE {
     manager_.reset();
     aura::test::AuraTestBase::TearDown();
   }
 
   aura::Window* CreateTestWindow() {
     aura::Window* window = new aura::Window(NULL);
     window->Init(ui::Layer::LAYER_HAS_NO_TEXTURE);
     return window;
   }
 
   aura::Window* viewport() {
     return GetTestDesktopDelegate()->default_container();
   }
-  scoped_ptr<aura_shell::WorkspaceManager> manager_;
+  scoped_ptr<WorkspaceManager> manager_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WorkspaceManagerTestBase);
 };
 
-}  // namespace
-
-namespace aura_shell {
-
-using aura::Window;
-using aura_shell::Workspace;
-using aura_shell::WorkspaceManager;
-
 class WorkspaceManagerTest : public WorkspaceManagerTestBase {
 };
 
 TEST_F(WorkspaceManagerTest, WorkspaceManagerCreateAddFind) {
   scoped_ptr<Window> w1(CreateTestWindow());
   scoped_ptr<Window> w2(CreateTestWindow());
 
   Workspace* ws1 = manager_->CreateWorkspace();
   ws1->AddWindowAfter(w1.get(), NULL);
   // w2 is not a part of any workspace yet.
@@ skipping 11 matching lines @@
   // once workspace is gone, w2 shouldn't match
   // any workspace.
   delete ws2;
   EXPECT_EQ(NULL, manager_->FindBy(w2.get()));
 
   // Reset now before windows are destroyed.
   manager_.reset();
 }
 
 TEST_F(WorkspaceManagerTest, LayoutWorkspaces) {
-  manager_->workspace_size_ = gfx::Size(100, 100);
-  manager_->LayoutWorkspaces();
+  manager_->SetWorkspaceSize(gfx::Size(100, 100));
   EXPECT_EQ("0,0 100x100", viewport()->bounds().ToString());
 
   Workspace* ws1 = manager_->CreateWorkspace();
   manager_->LayoutWorkspaces();
 
   // ws1 is laied out in left most position.
   EXPECT_EQ(100, viewport()->bounds().width());
   EXPECT_EQ("0,0 100x100", ws1->bounds().ToString());
 
   // ws2 is laied out next to ws1, with 50 margin.
   Workspace* ws2 = manager_->CreateWorkspace();
   manager_->LayoutWorkspaces();
 
   EXPECT_EQ(250, viewport()->bounds().width());
   EXPECT_EQ("0,0 100x100", ws1->bounds().ToString());
   EXPECT_EQ("150,0 100x100", ws2->bounds().ToString());
 }
 
+// Makes sure the bounds of window are resized if the workspace size shrinks.
+TEST_F(WorkspaceManagerTest, ResizeDuringLayout) {
+  manager_->SetWorkspaceSize(gfx::Size(100, 100));
+  EXPECT_EQ("0,0 100x100", viewport()->bounds().ToString());
+
+  Workspace* ws1 = manager_->CreateWorkspace();
+  scoped_ptr<Window> w1(CreateTestWindow());
+  w1->SetBounds(gfx::Rect(0, 0, 100, 100));
+  viewport()->AddChild(w1.get());
+  EXPECT_TRUE(ws1->AddWindowAfter(w1.get(), NULL));
+  manager_->SetWorkspaceSize(gfx::Size(50, 50));
+
+  // ws1 is laied out in left most position.
+  EXPECT_EQ("0,0 50x50", ws1->bounds().ToString());
+  EXPECT_EQ("0,0 50x50", w1->layer()->GetTargetBounds().ToString());
+}
+
 TEST_F(WorkspaceManagerTest, WorkspaceManagerDragArea) {
   aura::Desktop::GetInstance()->screen()->set_work_area_insets(
       gfx::Insets(10, 10, 10, 10));
   viewport()->SetBounds(gfx::Rect(0, 0, 200, 200));
   EXPECT_EQ("10,10 180x180", manager_->GetDragAreaBounds().ToString());
 }
 
-TEST_F(WorkspaceManagerTest, Overview) {
-  manager_->workspace_size_ = gfx::Size(500, 300);
+// TODO(sky): move this into a test for WorkspaceController.
+TEST_F(WorkspaceManagerTest, DISABLED_Overview) {

[oshima, 2011/10/28 18:38:23]

Why this is disabled?

[sky, 2011/10/28 19:14:08]

See the comment above. It needs WorkspaceController to work properly. I'll move
it out separately.

+  manager_->SetWorkspaceSize(gfx::Size(500, 300));
 
   // Creating two workspaces, ws1 which contains window w1,
   // and ws2 which contains window w2.
   Workspace* ws1 = manager_->CreateWorkspace();
   scoped_ptr<Window> w1(CreateTestWindow());
   viewport()->AddChild(w1.get());
   EXPECT_TRUE(ws1->AddWindowAfter(w1.get(), NULL));
 
   Workspace* ws2 = manager_->CreateWorkspace();
   scoped_ptr<Window> w2(CreateTestWindow());
@@ skipping 48 matching lines @@
   ws2->Activate();
   EXPECT_EQ(ws2, manager_->GetActiveWorkspace());
 
   // Deleting active workspace sets active workspace to NULL.
   delete ws2;
   EXPECT_EQ(NULL, manager_->GetActiveWorkspace());
   manager_.reset();
 }
 
 TEST_F(WorkspaceManagerTest, FindRotateWindow) {
-  manager_->workspace_size_ = gfx::Size(500, 300);
+  manager_->SetWorkspaceSize(gfx::Size(500, 300));
 
   Workspace* ws1 = manager_->CreateWorkspace();
   scoped_ptr<Window> w11(CreateTestWindow());
   w11->SetBounds(gfx::Rect(0, 0, 100, 100));
   ws1->AddWindowAfter(w11.get(), NULL);
 
   scoped_ptr<Window> w12(CreateTestWindow());
   w12->SetBounds(gfx::Rect(0, 0, 100, 100));
   ws1->AddWindowAfter(w12.get(), NULL);
   manager_->LayoutWorkspaces();
@@ skipping 289 matching lines @@
                               Workspace::SHIFT_TO_LEFT);
   EXPECT_EQ(w2.get(), overflow);
   EXPECT_EQ(-1, ws->GetIndexOf(w2.get()));
   EXPECT_EQ(0, ws->GetIndexOf(w1.get()));
   EXPECT_EQ(1, ws->GetIndexOf(w3.get()));
 
   // Reset now before windows are destroyed.
   manager_.reset();
 }
 
+}  // namespace internal
 }  // namespace aura_shell