summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/aura/aura.gyp18
-rw-r--r--ui/aura/test/aura_test_base.cc (renamed from ui/aura/aura_test_base.cc)8
-rw-r--r--ui/aura/test/aura_test_base.h (renamed from ui/aura/aura_test_base.h)8
-rw-r--r--ui/aura/test/run_all_unittests.cc (renamed from ui/aura/run_all_unittests.cc)4
-rw-r--r--ui/aura/test/test_desktop_delegate.cc (renamed from ui/aura/test_desktop_delegate.cc)4
-rw-r--r--ui/aura/test/test_desktop_delegate.h (renamed from ui/aura/test_desktop_delegate.h)10
-rw-r--r--ui/aura/test/test_suite.cc (renamed from ui/aura/test_suite.cc)8
-rw-r--r--ui/aura/test/test_suite.h (renamed from ui/aura/test_suite.h)12
-rw-r--r--ui/aura/test/test_window_delegate.cc (renamed from ui/aura/test_window_delegate.cc)6
-rw-r--r--ui/aura/test/test_window_delegate.h (renamed from ui/aura/test_window_delegate.h)11
-rw-r--r--ui/aura/toplevel_window_event_filter_unittest.cc10
-rw-r--r--ui/aura/window_unittest.cc13
-rw-r--r--ui/aura_shell/aura_shell.gyp2
-rw-r--r--ui/aura_shell/examples/aura_shell_main.cc (renamed from ui/aura_shell/aura_shell_main.cc)0
-rw-r--r--views/test/views_test_base.cc4
-rw-r--r--views/views.gyp4
16 files changed, 72 insertions, 50 deletions
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 8da3aa6..596909d 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -94,15 +94,15 @@
'..',
],
'sources': [
- 'aura_test_base.cc',
- 'aura_test_base.h',
- 'run_all_unittests.cc',
- 'test_desktop_delegate.cc',
- 'test_desktop_delegate.h',
- 'test_suite.cc',
- 'test_suite.h',
- 'test_window_delegate.cc',
- 'test_window_delegate.h',
+ 'test/aura_test_base.cc',
+ 'test/aura_test_base.h',
+ 'test/run_all_unittests.cc',
+ 'test/test_desktop_delegate.cc',
+ 'test/test_desktop_delegate.h',
+ 'test/test_suite.cc',
+ 'test/test_suite.h',
+ 'test/test_window_delegate.cc',
+ 'test/test_window_delegate.h',
'toplevel_window_event_filter_unittest.cc',
'window_unittest.cc',
'../gfx/compositor/test_compositor.cc',
diff --git a/ui/aura/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index 9d3e547..1e4eb41 100644
--- a/ui/aura/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -2,17 +2,18 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/aura/aura_test_base.h"
+#include "ui/aura/test/aura_test_base.h"
#if defined(OS_WIN)
#include <ole2.h>
#endif
#include "ui/aura/desktop.h"
-#include "ui/aura/test_desktop_delegate.h"
+#include "ui/aura/test/test_desktop_delegate.h"
#include "ui/gfx/compositor/test_compositor.h"
namespace aura {
+namespace test {
static ui::Compositor* TestCreateCompositor() {
return new ui::TestCompositor();
@@ -33,7 +34,7 @@ AuraTestBase::~AuraTestBase() {
CHECK(setup_called_)
<< "You have overridden SetUp but never called super class's SetUp";
CHECK(teardown_called_)
- << "You have overrideen TearDown but never called super class's TearDown";
+ << "You have overridden TearDown but never called super class's TearDown";
}
void AuraTestBase::SetUp() {
@@ -55,4 +56,5 @@ void AuraTestBase::TearDown() {
aura::Desktop::set_compositor_factory_for_testing(NULL);
}
+} // namespace test
} // namespace aura
diff --git a/ui/aura/aura_test_base.h b/ui/aura/test/aura_test_base.h
index f6ad225..5076969 100644
--- a/ui/aura/aura_test_base.h
+++ b/ui/aura/test/aura_test_base.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_AURA_TEST_BASE_H_
-#define UI_AURA_TEST_BASE_H_
+#ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
+#define UI_AURA_TEST_AURA_TEST_BASE_H_
#pragma once
#include "base/compiler_specific.h"
@@ -12,6 +12,7 @@
#include "testing/gtest/include/gtest/gtest.h"
namespace aura {
+namespace test {
// A base class for aura unit tests.
class AuraTestBase : public testing::Test {
@@ -35,6 +36,7 @@ class AuraTestBase : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(AuraTestBase);
};
+} // namespace test
} // namespace aura
-#endif // UI_AURA_TEST_BASE_H_
+#endif // UI_AURA_TEST_AURA_TEST_BASE_H_
diff --git a/ui/aura/run_all_unittests.cc b/ui/aura/test/run_all_unittests.cc
index 39d6771c..9932c03 100644
--- a/ui/aura/run_all_unittests.cc
+++ b/ui/aura/test/run_all_unittests.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/aura/test_suite.h"
+#include "ui/aura/test/test_suite.h"
int main(int argc, char** argv) {
- return AuraTestSuite(argc, argv).Run();
+ return aura::test::AuraTestSuite(argc, argv).Run();
}
diff --git a/ui/aura/test_desktop_delegate.cc b/ui/aura/test/test_desktop_delegate.cc
index 73df23f..ea469ad 100644
--- a/ui/aura/test_desktop_delegate.cc
+++ b/ui/aura/test/test_desktop_delegate.cc
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/aura/test_desktop_delegate.h"
+#include "ui/aura/test/test_desktop_delegate.h"
#include "ui/aura/desktop.h"
namespace aura {
+namespace test {
TestDesktopDelegate::TestDesktopDelegate()
: default_container_(new ToplevelWindowContainer) {
@@ -29,4 +30,5 @@ Window* TestDesktopDelegate::GetTopmostWindowToActivate(Window* ignore) const {
return default_container_->GetTopmostWindowToActivate(ignore);
}
+} // namespace test
} // namespace aura
diff --git a/ui/aura/test_desktop_delegate.h b/ui/aura/test/test_desktop_delegate.h
index 3376b83..1174eb48 100644
--- a/ui/aura/test_desktop_delegate.h
+++ b/ui/aura/test/test_desktop_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_AURA_TEST_DESKTOP_DELEGATE_H_
-#define UI_AURA_TEST_DESKTOP_DELEGATE_H_
+#ifndef UI_AURA_TEST_TEST_DESKTOP_DELEGATE_H_
+#define UI_AURA_TEST_TEST_DESKTOP_DELEGATE_H_
#pragma once
#include "base/basictypes.h"
@@ -13,9 +13,10 @@
#include "ui/aura/toplevel_window_container.h"
namespace aura {
-
class ToplevelWindowContainer;
+namespace test {
+
class TestDesktopDelegate : public DesktopDelegate {
public:
TestDesktopDelegate();
@@ -33,6 +34,7 @@ class TestDesktopDelegate : public DesktopDelegate {
DISALLOW_COPY_AND_ASSIGN(TestDesktopDelegate);
};
+} // namespace test
} // namespace aura
-#endif // UI_AURA_TEST_DESKTOP_DELEGATE_H_
+#endif // UI_AURA_TEST_TEST_DESKTOP_DELEGATE_H_
diff --git a/ui/aura/test_suite.cc b/ui/aura/test/test_suite.cc
index ff1cc02..5193de1 100644
--- a/ui/aura/test_suite.cc
+++ b/ui/aura/test/test_suite.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/aura/test_suite.h"
+#include "ui/aura/test/test_suite.h"
#include "base/file_path.h"
#include "base/path_service.h"
@@ -12,6 +12,9 @@
#include "ui/gfx/gfx_paths.h"
#include "ui/gfx/gl/gl_implementation.h"
+namespace aura {
+namespace test {
+
AuraTestSuite::AuraTestSuite(int argc, char** argv)
: TestSuite(argc, argv) {}
@@ -34,3 +37,6 @@ void AuraTestSuite::Shutdown() {
base::TestSuite::Shutdown();
}
+
+} // namespace test
+} // namespace aura
diff --git a/ui/aura/test_suite.h b/ui/aura/test/test_suite.h
index 37bb9c5..93d3348 100644
--- a/ui/aura/test_suite.h
+++ b/ui/aura/test/test_suite.h
@@ -2,13 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_AURA_TEST_SUITE_H_
-#define UI_AURA_TEST_SUITE_H_
+#ifndef UI_AURA_TEST_TEST_SUITE_H_
+#define UI_AURA_TEST_TEST_SUITE_H_
#pragma once
#include "base/compiler_specific.h"
#include "base/test/test_suite.h"
+namespace aura {
+namespace test {
+
class AuraTestSuite : public base::TestSuite {
public:
AuraTestSuite(int argc, char** argv);
@@ -19,4 +22,7 @@ class AuraTestSuite : public base::TestSuite {
virtual void Shutdown() OVERRIDE;
};
-#endif // UI_AURA_TEST_SUITE_H_
+} // namespace test
+} // namespace aura
+
+#endif // UI_AURA_TEST_TEST_SUITE_H_
diff --git a/ui/aura/test_window_delegate.cc b/ui/aura/test/test_window_delegate.cc
index e812439..70a8293 100644
--- a/ui/aura/test_window_delegate.cc
+++ b/ui/aura/test/test_window_delegate.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/aura/test_window_delegate.h"
+#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/hit_test.h"
namespace aura {
-namespace internal {
+namespace test {
TestWindowDelegate::TestWindowDelegate() {
}
@@ -63,5 +63,5 @@ void TestWindowDelegate::OnWindowDestroying() {
void TestWindowDelegate::OnWindowDestroyed() {
}
-} // namespace internal
+} // namespace test
} // namespace aura
diff --git a/ui/aura/test_window_delegate.h b/ui/aura/test/test_window_delegate.h
index 0e00e73..6cc74ce 100644
--- a/ui/aura/test_window_delegate.h
+++ b/ui/aura/test/test_window_delegate.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef UI_AURA_TEST_WINDOW_DELEGATE_H_
-#define UI_AURA_TEST_WINDOW_DELEGATE_H_
+#ifndef UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
+#define UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
#pragma once
#include "base/compiler_specific.h"
#include "ui/aura/window_delegate.h"
namespace aura {
-namespace internal {
+namespace test {
// WindowDelegate implementation with all methods stubbed out.
class TestWindowDelegate : public WindowDelegate {
@@ -39,6 +39,7 @@ class TestWindowDelegate : public WindowDelegate {
DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
};
-} // namespace internal
+} // namespace test
} // namespace aura
-#endif // UI_AURA_TEST_WINDOW_DELEGATE_H_
+
+#endif // UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
diff --git a/ui/aura/toplevel_window_event_filter_unittest.cc b/ui/aura/toplevel_window_event_filter_unittest.cc
index c77ba9f..5aaee92 100644
--- a/ui/aura/toplevel_window_event_filter_unittest.cc
+++ b/ui/aura/toplevel_window_event_filter_unittest.cc
@@ -5,12 +5,12 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/aura_test_base.h"
#include "ui/aura/desktop.h"
#include "ui/aura/event.h"
#include "ui/aura/hit_test.h"
-#include "ui/aura/test_desktop_delegate.h"
-#include "ui/aura/test_window_delegate.h"
+#include "ui/aura/test/aura_test_base.h"
+#include "ui/aura/test/test_desktop_delegate.h"
+#include "ui/aura/test/test_window_delegate.h"
#if defined(OS_WIN)
// Windows headers define macros for these function names which screw with us.
@@ -21,7 +21,7 @@
namespace aura {
-namespace internal {
+namespace test {
namespace {
@@ -185,5 +185,5 @@ TEST_F(ToplevelWindowEventFilterTest, Client) {
EXPECT_EQ(bounds, w1->bounds());
}
-} // namespace internal
+} // namespace test
} // namespace aura
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 3cca1da..b4df76c8 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -5,21 +5,21 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/aura_test_base.h"
#include "ui/aura/desktop.h"
#include "ui/aura/event.h"
#include "ui/aura/focus_manager.h"
#include "ui/aura/hit_test.h"
#include "ui/aura/root_window.h"
-#include "ui/aura/test_desktop_delegate.h"
-#include "ui/aura/test_window_delegate.h"
+#include "ui/aura/test/aura_test_base.h"
+#include "ui/aura/test/test_desktop_delegate.h"
+#include "ui/aura/test/test_window_delegate.h"
#include "ui/aura/window_delegate.h"
#include "ui/gfx/canvas_skia.h"
#include "ui/gfx/compositor/layer.h"
#include "ui/base/keycodes/keyboard_codes.h"
namespace aura {
-namespace internal {
+namespace test {
namespace {
@@ -339,7 +339,8 @@ TEST_F(WindowTest, CaptureTests) {
// Verifies capture is reset when a window is destroyed.
TEST_F(WindowTest, ReleaseCaptureOnDestroy) {
Desktop* desktop = Desktop::GetInstance();
- RootWindow* root = static_cast<RootWindow*>(desktop->window());
+ internal::RootWindow* root =
+ static_cast<internal::RootWindow*>(desktop->window());
CaptureWindowDelegateImpl delegate;
scoped_ptr<Window> window(CreateTestWindowWithDelegate(
&delegate, 0, gfx::Rect(0, 0, 20, 20), NULL));
@@ -723,5 +724,5 @@ TEST_F(WindowTest, Deactivate) {
EXPECT_EQ(w2.get(), parent->children()[1]);
}
-} // namespace internal
+} // namespace test
} // namespace aura
diff --git a/ui/aura_shell/aura_shell.gyp b/ui/aura_shell/aura_shell.gyp
index 6ad6874..81f4cf7 100644
--- a/ui/aura_shell/aura_shell.gyp
+++ b/ui/aura_shell/aura_shell.gyp
@@ -97,7 +97,7 @@
'aura_shell',
],
'sources': [
- 'aura_shell_main.cc',
+ 'examples/aura_shell_main.cc',
'examples/bubble.cc',
'examples/example_factory.h',
'examples/lock_view.cc',
diff --git a/ui/aura_shell/aura_shell_main.cc b/ui/aura_shell/examples/aura_shell_main.cc
index b556ffa..b556ffa 100644
--- a/ui/aura_shell/aura_shell_main.cc
+++ b/ui/aura_shell/examples/aura_shell_main.cc
diff --git a/views/test/views_test_base.cc b/views/test/views_test_base.cc
index bf18dff..264a58a 100644
--- a/views/test/views_test_base.cc
+++ b/views/test/views_test_base.cc
@@ -13,7 +13,7 @@
#if defined(USE_AURA)
#include "ui/aura/desktop.h"
-#include "ui/aura/test_desktop_delegate.h"
+#include "ui/aura/test/test_desktop_delegate.h"
#endif
namespace views {
@@ -30,7 +30,7 @@ ViewsTestBase::ViewsTestBase()
#endif
#if defined(USE_AURA)
aura::Desktop::set_compositor_factory_for_testing(&TestCreateCompositor);
- new aura::TestDesktopDelegate;
+ new aura::test::TestDesktopDelegate;
#else
Widget::set_compositor_factory_for_testing(&TestCreateCompositor);
#endif
diff --git a/views/views.gyp b/views/views.gyp
index d71f21e..7222ef6 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -602,8 +602,8 @@
'../ui/gfx/compositor/test_compositor.h',
'../ui/gfx/compositor/test_texture.cc',
'../ui/gfx/compositor/test_texture.h',
- '../ui/aura/test_desktop_delegate.cc',
- '../ui/aura/test_desktop_delegate.h',
+ '../ui/aura/test/test_desktop_delegate.cc',
+ '../ui/aura/test/test_desktop_delegate.h',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
generated by cgit v1.1 at 2025-03-12 01:27:30 +0000