| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/test/ash_test_helper.h" | 5 #include "ash/test/ash_test_helper.h" |
| 6 | 6 |
| 7 #include "testing/gtest/include/gtest/gtest.h" | 7 #include "testing/gtest/include/gtest/gtest.h" |
| 8 #include "ui/aura/root_window.h" | 8 #include "ui/aura/root_window.h" |
| 9 #include "ui/views/widget/widget.h" | 9 #include "ui/views/widget/widget.h" |
| 10 | 10 |
| 11 // Tests for AshTestHelper. Who will watch the watchers? And who will test | 11 // Tests for AshTestHelper. Who will watch the watchers? And who will test |
| 12 // the tests? | 12 // the tests? |
| 13 class AshTestHelperTest : public testing::Test { | 13 class AshTestHelperTest : public testing::Test { |
| 14 public: | 14 public: |
| 15 AshTestHelperTest() {} | 15 AshTestHelperTest() {} |
| 16 virtual ~AshTestHelperTest() {} | 16 virtual ~AshTestHelperTest() {} |
| 17 | 17 |
| 18 virtual void SetUp() OVERRIDE { | 18 virtual void SetUp() OVERRIDE { |
| 19 testing::Test::SetUp(); | 19 testing::Test::SetUp(); |
| 20 ash_test_helper_.reset(new ash::test::AshTestHelper(&message_loop_)); | 20 ash_test_helper_.reset(new ash::test::AshTestHelper(&message_loop_)); |
| 21 ash_test_helper_->SetUp(); | 21 ash_test_helper_->SetUp(true); |
| 22 } | 22 } |
| 23 | 23 |
| 24 virtual void TearDown() OVERRIDE { | 24 virtual void TearDown() OVERRIDE { |
| 25 ash_test_helper_->TearDown(); | 25 ash_test_helper_->TearDown(); |
| 26 testing::Test::TearDown(); | 26 testing::Test::TearDown(); |
| 27 } | 27 } |
| 28 | 28 |
| 29 ash::test::AshTestHelper* ash_test_helper() { | 29 ash::test::AshTestHelper* ash_test_helper() { |
| 30 return ash_test_helper_.get(); | 30 return ash_test_helper_.get(); |
| 31 } | 31 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 48 using views::Widget; | 48 using views::Widget; |
| 49 scoped_ptr<Widget> w1(new Widget); | 49 scoped_ptr<Widget> w1(new Widget); |
| 50 Widget::InitParams params; | 50 Widget::InitParams params; |
| 51 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 51 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
| 52 params.context = ash_test_helper()->CurrentContext(); | 52 params.context = ash_test_helper()->CurrentContext(); |
| 53 w1->Init(params); | 53 w1->Init(params); |
| 54 w1->Show(); | 54 w1->Show(); |
| 55 EXPECT_TRUE(w1->IsActive()); | 55 EXPECT_TRUE(w1->IsActive()); |
| 56 EXPECT_TRUE(w1->IsVisible()); | 56 EXPECT_TRUE(w1->IsVisible()); |
| 57 } | 57 } |
| OLD | NEW |