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

Unified Diff: components/view_manager/view_tree_unittest.cc

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 5 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/view_manager/view_tree_impl.cc ('k') | components/view_manager/window_manager_access_policy.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/view_manager/view_tree_unittest.cc
diff --git a/components/view_manager/view_tree_unittest.cc b/components/view_manager/view_tree_unittest.cc
deleted file mode 100644
index 485b7095a6ce9613a12255522f3699922f123108..0000000000000000000000000000000000000000
--- a/components/view_manager/view_tree_unittest.cc
+++ /dev/null
@@ -1,451 +0,0 @@
-// Copyright 2014 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 <string>
-#include <vector>
-
-#include "base/message_loop/message_loop.h"
-#include "components/view_manager/client_connection.h"
-#include "components/view_manager/connection_manager.h"
-#include "components/view_manager/connection_manager_delegate.h"
-#include "components/view_manager/display_manager.h"
-#include "components/view_manager/display_manager_factory.h"
-#include "components/view_manager/ids.h"
-#include "components/view_manager/public/cpp/types.h"
-#include "components/view_manager/public/cpp/util.h"
-#include "components/view_manager/public/interfaces/view_tree.mojom.h"
-#include "components/view_manager/server_view.h"
-#include "components/view_manager/surfaces/surfaces_state.h"
-#include "components/view_manager/test_change_tracker.h"
-#include "components/view_manager/view_tree_host_connection.h"
-#include "components/view_manager/view_tree_impl.h"
-#include "mojo/application/public/interfaces/service_provider.mojom.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/geometry/rect.h"
-
-using mojo::Array;
-using mojo::ERROR_CODE_NONE;
-using mojo::InterfaceRequest;
-using mojo::ServiceProvider;
-using mojo::ServiceProviderPtr;
-using mojo::String;
-using mojo::ViewDataPtr;
-
-namespace view_manager {
-namespace {
-
-// -----------------------------------------------------------------------------
-
-// ViewTreeClient implementation that logs all calls to a TestChangeTracker.
-// TODO(sky): refactor so both this and ViewTreeAppTest share code.
-class TestViewTreeClient : public mojo::ViewTreeClient {
- public:
- TestViewTreeClient() {}
- ~TestViewTreeClient() override {}
-
- TestChangeTracker* tracker() { return &tracker_; }
-
- private:
- // ViewTreeClient:
- void OnEmbed(uint16_t connection_id,
- ViewDataPtr root,
- mojo::ViewTreePtr tree,
- mojo::Id focused_view_id,
- uint32_t access_policy) override {
- // TODO(sky): add test coverage of |focused_view_id|.
- tracker_.OnEmbed(connection_id, root.Pass());
- }
- void OnEmbeddedAppDisconnected(uint32_t view) override {
- tracker_.OnEmbeddedAppDisconnected(view);
- }
- void OnUnembed() override { tracker_.OnUnembed(); }
- void OnViewBoundsChanged(uint32_t view,
- mojo::RectPtr old_bounds,
- mojo::RectPtr new_bounds) override {
- tracker_.OnViewBoundsChanged(view, old_bounds.Pass(), new_bounds.Pass());
- }
- void OnViewViewportMetricsChanged(
- mojo::ViewportMetricsPtr old_metrics,
- mojo::ViewportMetricsPtr new_metrics) override {
- tracker_.OnViewViewportMetricsChanged(old_metrics.Pass(),
- new_metrics.Pass());
- }
- void OnViewHierarchyChanged(uint32_t view,
- uint32_t new_parent,
- uint32_t old_parent,
- Array<ViewDataPtr> views) override {
- tracker_.OnViewHierarchyChanged(view, new_parent, old_parent, views.Pass());
- }
- void OnViewReordered(uint32_t view_id,
- uint32_t relative_view_id,
- mojo::OrderDirection direction) override {
- tracker_.OnViewReordered(view_id, relative_view_id, direction);
- }
- void OnViewDeleted(uint32_t view) override { tracker_.OnViewDeleted(view); }
- void OnViewVisibilityChanged(uint32_t view, bool visible) override {
- tracker_.OnViewVisibilityChanged(view, visible);
- }
- void OnViewDrawnStateChanged(uint32_t view, bool drawn) override {
- tracker_.OnViewDrawnStateChanged(view, drawn);
- }
- void OnViewSharedPropertyChanged(uint32_t view,
- const String& name,
- Array<uint8_t> new_data) override {
- tracker_.OnViewSharedPropertyChanged(view, name, new_data.Pass());
- }
- void OnViewInputEvent(uint32_t view,
- mojo::EventPtr event,
- const mojo::Callback<void()>& callback) override {
- tracker_.OnViewInputEvent(view, event.Pass());
- }
- void OnViewFocused(uint32_t focused_view_id) override {
- tracker_.OnViewFocused(focused_view_id);
- }
-
- TestChangeTracker tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(TestViewTreeClient);
-};
-
-// -----------------------------------------------------------------------------
-
-// ClientConnection implementation that vends TestViewTreeClient.
-class TestClientConnection : public ClientConnection {
- public:
- explicit TestClientConnection(scoped_ptr<ViewTreeImpl> service_impl)
- : ClientConnection(service_impl.Pass(), &client_) {}
-
- TestViewTreeClient* client() { return &client_; }
-
- private:
- ~TestClientConnection() override {}
-
- TestViewTreeClient client_;
-
- DISALLOW_COPY_AND_ASSIGN(TestClientConnection);
-};
-
-// -----------------------------------------------------------------------------
-
-// Empty implementation of ConnectionManagerDelegate.
-class TestConnectionManagerDelegate : public ConnectionManagerDelegate {
- public:
- TestConnectionManagerDelegate() : last_connection_(nullptr) {}
- ~TestConnectionManagerDelegate() override {}
-
- TestViewTreeClient* last_client() {
- return last_connection_ ? last_connection_->client() : nullptr;
- }
-
- TestClientConnection* last_connection() { return last_connection_; }
-
- private:
- // ConnectionManagerDelegate:
- void OnNoMoreRootConnections() override {}
-
- ClientConnection* CreateClientConnectionForEmbedAtView(
- ConnectionManager* connection_manager,
- mojo::InterfaceRequest<mojo::ViewTree> service_request,
- mojo::ConnectionSpecificId creator_id,
- mojo::URLRequestPtr request,
- const ViewId& root_id) override {
- scoped_ptr<ViewTreeImpl> service(
- new ViewTreeImpl(connection_manager, creator_id, root_id));
- last_connection_ = new TestClientConnection(service.Pass());
- return last_connection_;
- }
- ClientConnection* CreateClientConnectionForEmbedAtView(
- ConnectionManager* connection_manager,
- mojo::InterfaceRequest<mojo::ViewTree> service_request,
- mojo::ConnectionSpecificId creator_id,
- const ViewId& root_id,
- mojo::ViewTreeClientPtr client) override {
- // Used by ConnectionManager::AddRoot.
- scoped_ptr<ViewTreeImpl> service(
- new ViewTreeImpl(connection_manager, creator_id, root_id));
- last_connection_ = new TestClientConnection(service.Pass());
- return last_connection_;
- }
-
- TestClientConnection* last_connection_;
-
- DISALLOW_COPY_AND_ASSIGN(TestConnectionManagerDelegate);
-};
-
-// -----------------------------------------------------------------------------
-
-class TestViewTreeHostConnection : public ViewTreeHostConnection {
- public:
- TestViewTreeHostConnection(scoped_ptr<ViewTreeHostImpl> host_impl,
- ConnectionManager* manager)
- : ViewTreeHostConnection(host_impl.Pass(), manager) {}
- ~TestViewTreeHostConnection() override {}
-
- private:
- // ViewTreeHostDelegate:
- void OnDisplayInitialized() override {
- connection_manager()->AddHost(this);
- set_view_tree(connection_manager()->EmbedAtView(
- kInvalidConnectionId,
- view_tree_host()->root_view()->id(),
- mojo::ViewTreeClientPtr()));
- }
- DISALLOW_COPY_AND_ASSIGN(TestViewTreeHostConnection);
-};
-
-// -----------------------------------------------------------------------------
-// Empty implementation of DisplayManager.
-class TestDisplayManager : public DisplayManager {
- public:
- TestDisplayManager() {}
- ~TestDisplayManager() override {}
-
- // DisplayManager:
- void Init(DisplayManagerDelegate* delegate) override {
- // It is necessary to tell the delegate about the ViewportMetrics to make
- // sure that the ViewTreeHostConnection is correctly initialized (and a
- // root-view is created).
- mojo::ViewportMetrics metrics;
- metrics.size_in_pixels = mojo::Size::From(gfx::Size(400, 300));
- metrics.device_pixel_ratio = 1.f;
- delegate->OnViewportMetricsChanged(mojo::ViewportMetrics(), metrics);
- }
- void SchedulePaint(const ServerView* view, const gfx::Rect& bounds) override {
- }
- void SetViewportSize(const gfx::Size& size) override {}
- void SetTitle(const base::string16& title) override {}
- const mojo::ViewportMetrics& GetViewportMetrics() override {
- return display_metrices_;
- }
- void UpdateTextInputState(const ui::TextInputState& state) override {}
- void SetImeVisibility(bool visible) override {}
-
- private:
- mojo::ViewportMetrics display_metrices_;
-
- DISALLOW_COPY_AND_ASSIGN(TestDisplayManager);
-};
-
-// Factory that dispenses TestDisplayManagers.
-class TestDisplayManagerFactory : public DisplayManagerFactory {
- public:
- TestDisplayManagerFactory() {}
- ~TestDisplayManagerFactory() {}
- DisplayManager* CreateDisplayManager(
- bool is_headless,
- mojo::ApplicationImpl* app_impl,
- const scoped_refptr<gles2::GpuState>& gpu_state,
- const scoped_refptr<surfaces::SurfacesState>& surfaces_state) override {
- return new TestDisplayManager();
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerFactory);
-};
-
-mojo::EventPtr CreatePointerDownEvent(int x, int y) {
- mojo::EventPtr event(mojo::Event::New());
- event->action = mojo::EVENT_TYPE_POINTER_DOWN;
- event->pointer_data = mojo::PointerData::New();
- event->pointer_data->pointer_id = 1u;
- event->pointer_data->x = x;
- event->pointer_data->y = y;
- return event.Pass();
-}
-
-mojo::EventPtr CreatePointerUpEvent(int x, int y) {
- mojo::EventPtr event(mojo::Event::New());
- event->action = mojo::EVENT_TYPE_POINTER_UP;
- event->pointer_data = mojo::PointerData::New();
- event->pointer_data->pointer_id = 1u;
- event->pointer_data->x = x;
- event->pointer_data->y = y;
- return event.Pass();
-}
-
-} // namespace
-
-// -----------------------------------------------------------------------------
-
-class ViewTreeTest : public testing::Test {
- public:
- ViewTreeTest() : wm_client_(nullptr) {}
- ~ViewTreeTest() override {}
-
- // ViewTreeImpl for the window manager.
- ViewTreeImpl* wm_connection() {
- return connection_manager_->GetConnection(1);
- }
-
- TestViewTreeClient* last_view_tree_client() {
- return delegate_.last_client();
- }
-
- TestClientConnection* last_client_connection() {
- return delegate_.last_connection();
- }
-
- ConnectionManager* connection_manager() { return connection_manager_.get(); }
-
- TestViewTreeClient* wm_client() { return wm_client_; }
-
- TestViewTreeHostConnection* host_connection() { return host_connection_; }
- DisplayManagerDelegate* display_manager_delegate() {
- return host_connection()->view_tree_host();
- }
-
- protected:
- // testing::Test:
- void SetUp() override {
- DisplayManager::set_factory_for_testing(&display_manager_factory_);
- // TODO(fsamuel): This is probably broken. We need a root.
- connection_manager_.reset(
- new ConnectionManager(&delegate_,
- scoped_refptr<surfaces::SurfacesState>()));
- ViewTreeHostImpl* host = new ViewTreeHostImpl(
- mojo::ViewTreeHostClientPtr(),
- connection_manager_.get(), true /* is_headless */, nullptr,
- scoped_refptr<gles2::GpuState>(),
- scoped_refptr<surfaces::SurfacesState>());
- // TODO(fsamuel): This is way too magical. We need to find a better way to
- // manage lifetime.
- host_connection_ = new TestViewTreeHostConnection(
- make_scoped_ptr(host), connection_manager_.get());
- host->Init(host_connection_);
- wm_client_ = delegate_.last_client();
- }
-
- private:
- // TestViewTreeClient that is used for the WM connection.
- TestViewTreeClient* wm_client_;
- TestDisplayManagerFactory display_manager_factory_;
- TestConnectionManagerDelegate delegate_;
- TestViewTreeHostConnection* host_connection_;
- scoped_ptr<ConnectionManager> connection_manager_;
- base::MessageLoop message_loop_;
-
- DISALLOW_COPY_AND_ASSIGN(ViewTreeTest);
-};
-
-// Verifies focus correctly changes on pointer events.
-TEST_F(ViewTreeTest, FocusOnPointer) {
- const ViewId embed_view_id(wm_connection()->id(), 1);
- EXPECT_EQ(ERROR_CODE_NONE, wm_connection()->CreateView(embed_view_id));
- EXPECT_TRUE(wm_connection()->SetViewVisibility(embed_view_id, true));
- EXPECT_TRUE(
- wm_connection()->AddView(*(wm_connection()->root()), embed_view_id));
- host_connection()->view_tree_host()->root_view()->
- SetBounds(gfx::Rect(0, 0, 100, 100));
- mojo::URLRequestPtr request(mojo::URLRequest::New());
- wm_connection()->Embed(embed_view_id, request.Pass());
- ViewTreeImpl* connection1 =
- connection_manager()->GetConnectionWithRoot(embed_view_id);
- ASSERT_TRUE(connection1 != nullptr);
- ASSERT_NE(connection1, wm_connection());
-
- connection_manager()
- ->GetView(embed_view_id)
- ->SetBounds(gfx::Rect(0, 0, 50, 50));
-
- const ViewId child1(connection1->id(), 1);
- EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child1));
- EXPECT_TRUE(connection1->AddView(embed_view_id, child1));
- ServerView* v1 = connection1->GetView(child1);
- v1->SetVisible(true);
- v1->SetBounds(gfx::Rect(20, 20, 20, 20));
-
- TestViewTreeClient* connection1_client = last_view_tree_client();
- connection1_client->tracker()->changes()->clear();
- wm_client()->tracker()->changes()->clear();
-
- display_manager_delegate()->OnEvent(CreatePointerDownEvent(21, 22));
- // Focus should go to child1. This result in notifying both the window
- // manager and client connection being notified.
- EXPECT_EQ(v1, connection1->GetHost()->GetFocusedView());
- ASSERT_GE(wm_client()->tracker()->changes()->size(), 1u);
- EXPECT_EQ("Focused id=2,1",
- ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
- ASSERT_GE(connection1_client->tracker()->changes()->size(), 1u);
- EXPECT_EQ(
- "Focused id=2,1",
- ChangesToDescription1(*connection1_client->tracker()->changes())[0]);
-
- display_manager_delegate()->OnEvent(CreatePointerUpEvent(21, 22));
- wm_client()->tracker()->changes()->clear();
- connection1_client->tracker()->changes()->clear();
-
- // Press outside of the embedded view. Focus should go to the root. Notice
- // the client1 doesn't see who has focus as the focused view (root) isn't
- // visible to it.
- display_manager_delegate()->OnEvent(CreatePointerDownEvent(61, 22));
- EXPECT_EQ(host_connection()->view_tree_host()->root_view(),
- host_connection()->view_tree_host()->GetFocusedView());
- ASSERT_GE(wm_client()->tracker()->changes()->size(), 1u);
- EXPECT_EQ("Focused id=0,2",
- ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
- ASSERT_GE(connection1_client->tracker()->changes()->size(), 1u);
- EXPECT_EQ(
- "Focused id=null",
- ChangesToDescription1(*connection1_client->tracker()->changes())[0]);
-
- display_manager_delegate()->OnEvent(CreatePointerUpEvent(21, 22));
- wm_client()->tracker()->changes()->clear();
- connection1_client->tracker()->changes()->clear();
-
- // Press in the same location. Should not get a focus change event (only input
- // event).
- display_manager_delegate()->OnEvent(CreatePointerDownEvent(61, 22));
- EXPECT_EQ(host_connection()->view_tree_host()->root_view(),
- host_connection()->view_tree_host()->GetFocusedView());
- ASSERT_EQ(wm_client()->tracker()->changes()->size(), 1u);
- EXPECT_EQ("InputEvent view=0,2 event_action=4",
- ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
- EXPECT_TRUE(connection1_client->tracker()->changes()->empty());
-}
-
-TEST_F(ViewTreeTest, BasicInputEventTarget) {
- const ViewId embed_view_id(wm_connection()->id(), 1);
- EXPECT_EQ(ERROR_CODE_NONE, wm_connection()->CreateView(embed_view_id));
- EXPECT_TRUE(wm_connection()->SetViewVisibility(embed_view_id, true));
- EXPECT_TRUE(
- wm_connection()->AddView(*(wm_connection()->root()), embed_view_id));
- host_connection()->view_tree_host()->root_view()->SetBounds(
- gfx::Rect(0, 0, 100, 100));
- mojo::URLRequestPtr request(mojo::URLRequest::New());
- wm_connection()->Embed(embed_view_id, request.Pass());
- ViewTreeImpl* connection1 =
- connection_manager()->GetConnectionWithRoot(embed_view_id);
- ASSERT_TRUE(connection1 != nullptr);
- ASSERT_NE(connection1, wm_connection());
-
- connection_manager()
- ->GetView(embed_view_id)
- ->SetBounds(gfx::Rect(0, 0, 50, 50));
-
- const ViewId child1(connection1->id(), 1);
- EXPECT_EQ(ERROR_CODE_NONE, connection1->CreateView(child1));
- EXPECT_TRUE(connection1->AddView(embed_view_id, child1));
- ServerView* v1 = connection1->GetView(child1);
- v1->SetVisible(true);
- v1->SetBounds(gfx::Rect(20, 20, 20, 20));
-
- TestViewTreeClient* embed_connection = last_view_tree_client();
- embed_connection->tracker()->changes()->clear();
- wm_client()->tracker()->changes()->clear();
-
- // Send an event to |v1|. |embed_connection| should get the event, not
- // |wm_client|, since |v1| lives inside an embedded view.
- display_manager_delegate()->OnEvent(CreatePointerDownEvent(21, 22));
- ASSERT_EQ(1u, wm_client()->tracker()->changes()->size());
- EXPECT_EQ("Focused id=2,1",
- ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
- ASSERT_EQ(2u, embed_connection->tracker()->changes()->size());
- EXPECT_EQ("Focused id=2,1",
- ChangesToDescription1(*embed_connection->tracker()->changes())[0]);
- EXPECT_EQ("InputEvent view=2,1 event_action=4",
- ChangesToDescription1(*embed_connection->tracker()->changes())[1]);
-}
-
-} // namespace view_manager
« no previous file with comments | « components/view_manager/view_tree_impl.cc ('k') | components/view_manager/window_manager_access_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698