Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(947)

Side by Side Diff: ash/mus/layout_manager_unittest.cc

Issue 2029883002: Moves mash/wm into ash/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_static_assert
Patch Set: move comment Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/mus/layout_manager.cc ('k') | ash/mus/main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mash/wm/layout_manager.h" 5 #include "ash/mus/layout_manager.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "components/mus/public/cpp/tests/test_window.h" 10 #include "components/mus/public/cpp/tests/test_window.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 namespace mash { 13 namespace ash {
14 namespace wm { 14 namespace mus {
15 15
16 class TestLayoutManager : public LayoutManager { 16 class TestLayoutManager : public LayoutManager {
17 public: 17 public:
18 explicit TestLayoutManager(mus::Window* window) 18 explicit TestLayoutManager(::mus::Window* window)
19 : LayoutManager(window), layout_called_(false) {} 19 : LayoutManager(window), layout_called_(false) {}
20 ~TestLayoutManager() override {} 20 ~TestLayoutManager() override {}
21 21
22 bool GetAndResetLayoutCalled() { 22 bool GetAndResetLayoutCalled() {
23 bool was_layout_called = layout_called_; 23 bool was_layout_called = layout_called_;
24 layout_called_ = false; 24 layout_called_ = false;
25 return was_layout_called; 25 return was_layout_called;
26 } 26 }
27 27
28 private: 28 private:
29 // LayoutManager: 29 // LayoutManager:
30 void LayoutWindow(mus::Window* window) override { 30 void LayoutWindow(::mus::Window* window) override { layout_called_ = true; }
31 layout_called_ = true;
32 }
33 31
34 bool layout_called_; 32 bool layout_called_;
35 33
36 DISALLOW_COPY_AND_ASSIGN(TestLayoutManager); 34 DISALLOW_COPY_AND_ASSIGN(TestLayoutManager);
37 }; 35 };
38 36
39 // Tests that owning window can be destroyed before the layout manager. 37 // Tests that owning window can be destroyed before the layout manager.
40 TEST(LayoutManagerTest, OwningWindowDestroyedFirst) { 38 TEST(LayoutManagerTest, OwningWindowDestroyedFirst) {
41 std::unique_ptr<mus::TestWindow> parent(new mus::TestWindow(1)); 39 std::unique_ptr<::mus::TestWindow> parent(new ::mus::TestWindow(1));
42 mus::TestWindow child(2); 40 ::mus::TestWindow child(2);
43 TestLayoutManager layout_manager(parent.get()); 41 TestLayoutManager layout_manager(parent.get());
44 parent->AddChild(&child); 42 parent->AddChild(&child);
45 EXPECT_TRUE(layout_manager.GetAndResetLayoutCalled()); 43 EXPECT_TRUE(layout_manager.GetAndResetLayoutCalled());
46 parent.reset(); 44 parent.reset();
47 child.SetBounds(gfx::Rect(100, 200)); 45 child.SetBounds(gfx::Rect(100, 200));
48 } 46 }
49 47
50 // Tests that the layout manager can be destroyed before the owning window. 48 // Tests that the layout manager can be destroyed before the owning window.
51 TEST(LayoutManagerTest, LayoutManagerDestroyedFirst) { 49 TEST(LayoutManagerTest, LayoutManagerDestroyedFirst) {
52 mus::TestWindow parent(1); 50 ::mus::TestWindow parent(1);
53 mus::TestWindow child(2); 51 ::mus::TestWindow child(2);
54 std::unique_ptr<TestLayoutManager> layout_manager( 52 std::unique_ptr<TestLayoutManager> layout_manager(
55 new TestLayoutManager(&parent)); 53 new TestLayoutManager(&parent));
56 parent.AddChild(&child); 54 parent.AddChild(&child);
57 EXPECT_TRUE(layout_manager->GetAndResetLayoutCalled()); 55 EXPECT_TRUE(layout_manager->GetAndResetLayoutCalled());
58 56
59 parent.SetBounds(gfx::Rect(100, 200)); 57 parent.SetBounds(gfx::Rect(100, 200));
60 EXPECT_TRUE(layout_manager->GetAndResetLayoutCalled()); 58 EXPECT_TRUE(layout_manager->GetAndResetLayoutCalled());
61 59
62 layout_manager.reset(); 60 layout_manager.reset();
63 parent.SetBounds(gfx::Rect(200, 100)); 61 parent.SetBounds(gfx::Rect(200, 100));
64 } 62 }
65 63
66 } // namespace wm 64 } // namespace mus
67 } // namespace mash 65 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/layout_manager.cc ('k') | ash/mus/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698