From 865b81939b0c6f1a44f5b912e1528060595925e2 Mon Sep 17 00:00:00 2001 From: Adam Barth Date: Tue, 11 Nov 2014 16:43:21 -0800 Subject: [PATCH] Rename sky::TestObserver to sky::TestHarness This CL prepares us to add event dispatching to this interface, which is more than just observation. R=esprehn@chromium.org, ojan@chromium.org Review URL: https://codereview.chromium.org/715123002 --- engine/src/flutter/tools/tester/BUILD.gn | 4 +- engine/src/flutter/tools/tester/DEPS | 5 +++ ..._observer_impl.cc => test_harness_impl.cc} | 8 ++-- .../flutter/tools/tester/test_harness_impl.h | 37 +++++++++++++++++++ .../flutter/tools/tester/test_observer_impl.h | 37 ------------------- .../src/flutter/tools/tester/test_runner.cc | 4 +- engine/src/flutter/tools/tester/test_runner.h | 4 +- 7 files changed, 52 insertions(+), 47 deletions(-) create mode 100644 engine/src/flutter/tools/tester/DEPS rename engine/src/flutter/tools/tester/{test_observer_impl.cc => test_harness_impl.cc} (74%) create mode 100644 engine/src/flutter/tools/tester/test_harness_impl.h delete mode 100644 engine/src/flutter/tools/tester/test_observer_impl.h diff --git a/engine/src/flutter/tools/tester/BUILD.gn b/engine/src/flutter/tools/tester/BUILD.gn index ae89606ec9..4636e199db 100644 --- a/engine/src/flutter/tools/tester/BUILD.gn +++ b/engine/src/flutter/tools/tester/BUILD.gn @@ -6,8 +6,8 @@ shared_library("tester") { output_name = "sky_tester" sources = [ - "test_observer_impl.cc", - "test_observer_impl.h", + "test_harness_impl.cc", + "test_harness_impl.h", "test_runner.cc", "test_runner.h", "tester.cc", diff --git a/engine/src/flutter/tools/tester/DEPS b/engine/src/flutter/tools/tester/DEPS new file mode 100644 index 0000000000..f97d96c0d2 --- /dev/null +++ b/engine/src/flutter/tools/tester/DEPS @@ -0,0 +1,5 @@ +include_rules = [ + "+mojo/public", + "+mojo/application", + "+mojo/services", +] diff --git a/engine/src/flutter/tools/tester/test_observer_impl.cc b/engine/src/flutter/tools/tester/test_harness_impl.cc similarity index 74% rename from engine/src/flutter/tools/tester/test_observer_impl.cc rename to engine/src/flutter/tools/tester/test_harness_impl.cc index 0037d507e7..a468c7e7a0 100644 --- a/engine/src/flutter/tools/tester/test_observer_impl.cc +++ b/engine/src/flutter/tools/tester/test_harness_impl.cc @@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "sky/tools/tester/test_observer_impl.h" +#include "sky/tools/tester/test_harness_impl.h" #include "sky/tools/tester/test_runner.h" namespace sky { namespace tester { -TestObserverImpl::TestObserverImpl(TestRunner* test_runner) +TestHarnessImpl::TestHarnessImpl(TestRunner* test_runner) : test_runner_(test_runner->GetWeakPtr()) { // FIXME: This is technically when the V8 context gets created and // not when the test is started. An error before we instantiated @@ -17,10 +17,10 @@ TestObserverImpl::TestObserverImpl(TestRunner* test_runner) test_runner->OnTestStart(); } -TestObserverImpl::~TestObserverImpl() { +TestHarnessImpl::~TestHarnessImpl() { } -void TestObserverImpl::OnTestComplete(const mojo::String& test_result) { +void TestHarnessImpl::OnTestComplete(const mojo::String& test_result) { if (test_runner_) test_runner_->OnTestComplete(test_result); } diff --git a/engine/src/flutter/tools/tester/test_harness_impl.h b/engine/src/flutter/tools/tester/test_harness_impl.h new file mode 100644 index 0000000000..d43e30c9ce --- /dev/null +++ b/engine/src/flutter/tools/tester/test_harness_impl.h @@ -0,0 +1,37 @@ +// 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. + +#ifndef SKY_TOOLS_TESTER_TEST_HARNESS_IMPL_H_ +#define SKY_TOOLS_TESTER_TEST_HARNESS_IMPL_H_ + +#include "base/memory/weak_ptr.h" +#include "mojo/public/cpp/application/interface_factory_impl.h" +#include "mojo/public/cpp/system/core.h" +#include "sky/viewer/services/test_harness.mojom.h" + +namespace sky { +namespace tester { +class TestRunner; + +class TestHarnessImpl : public mojo::InterfaceImpl { + public: + explicit TestHarnessImpl(TestRunner*); + virtual ~TestHarnessImpl(); + + private: + // TestHarness implementation. + void OnTestComplete(const mojo::String& test_result) override; + + base::WeakPtr test_runner_; + + MOJO_DISALLOW_COPY_AND_ASSIGN(TestHarnessImpl); +}; + +typedef mojo::InterfaceFactoryImplWithContext< + TestHarnessImpl, TestRunner> TestHarnessFactory; + +} // namespace tester +} // namespace sky + +#endif // SKY_TOOLS_TESTER_TEST_HARNESS_IMPL_H_ diff --git a/engine/src/flutter/tools/tester/test_observer_impl.h b/engine/src/flutter/tools/tester/test_observer_impl.h deleted file mode 100644 index 1543016a74..0000000000 --- a/engine/src/flutter/tools/tester/test_observer_impl.h +++ /dev/null @@ -1,37 +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. - -#ifndef SKY_TOOLS_TESTER_TEST_OBSERVER_IMPL_H_ -#define SKY_TOOLS_TESTER_TEST_OBSERVER_IMPL_H_ - -#include "base/memory/weak_ptr.h" -#include "mojo/public/cpp/application/interface_factory_impl.h" -#include "mojo/public/cpp/system/core.h" -#include "sky/viewer/test_observer.mojom.h" - -namespace sky { -namespace tester { -class TestRunner; - -class TestObserverImpl : public mojo::InterfaceImpl { - public: - explicit TestObserverImpl(TestRunner*); - virtual ~TestObserverImpl(); - - private: - // TestObserver implementation. - virtual void OnTestComplete(const mojo::String& test_result) override; - - base::WeakPtr test_runner_; - - MOJO_DISALLOW_COPY_AND_ASSIGN(TestObserverImpl); -}; - -typedef mojo::InterfaceFactoryImplWithContext< - TestObserverImpl, TestRunner> TestObserverFactory; - -} // namespace tester -} // namespace sky - -#endif // SKY_TOOLS_TESTER_TEST_OBSERVER_IMPL_H_ diff --git a/engine/src/flutter/tools/tester/test_runner.cc b/engine/src/flutter/tools/tester/test_runner.cc index 282531bb7b..f23349e81b 100644 --- a/engine/src/flutter/tools/tester/test_runner.cc +++ b/engine/src/flutter/tools/tester/test_runner.cc @@ -15,14 +15,14 @@ namespace tester { TestRunner::TestRunner(TestRunnerClient* client, mojo::View* container, const std::string& url) - : test_observer_factory_(this), + : test_harness_factory_(this), client_(client), weak_ptr_factory_(this) { CHECK(client); scoped_ptr exported_services( new mojo::ServiceProviderImpl()); - exported_services->AddService(&test_observer_factory_); + exported_services->AddService(&test_harness_factory_); container->Embed(url, exported_services.Pass()); } diff --git a/engine/src/flutter/tools/tester/test_runner.h b/engine/src/flutter/tools/tester/test_runner.h index 0a1173a445..1a40cbab9e 100644 --- a/engine/src/flutter/tools/tester/test_runner.h +++ b/engine/src/flutter/tools/tester/test_runner.h @@ -6,7 +6,7 @@ #define SKY_TOOLS_TESTER_TEST_RUNNER_H_ #include "base/memory/weak_ptr.h" -#include "sky/tools/tester/test_observer_impl.h" +#include "sky/tools/tester/test_harness_impl.h" namespace mojo{ class View; @@ -31,7 +31,7 @@ class TestRunner { void OnTestComplete(const std::string& test_result); private: - TestObserverFactory test_observer_factory_; + TestHarnessFactory test_harness_factory_; TestRunnerClient* client_; base::WeakPtrFactory weak_ptr_factory_;