Mojo JS Bindings: restore the ServiceProvider class, add an application test

services/js/js_apptests.cc

+// 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 "base/bind.h"
+#include "base/files/file_path.h"
+#include "base/path_service.h"
+#include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/application_test_base.h"
+#include "services/js/test/echo_service.mojom.h"
+
+namespace mojo {
+namespace {
+
+class JSEchoTest : public test::ApplicationTestBase {
+ public:
+  JSEchoTest() : ApplicationTestBase() {}
+  ~JSEchoTest() override {}
+
+ protected:
+  // ApplicationTestBase:
+  void SetUp() override {
+    ApplicationTestBase::SetUp();
+    application_impl()->ConnectToService(service_path(), &echo_service_);
+  }
+
+  EchoServicePtr echo_service_;
+
+ private:
+  const std::string service_path() {
+    base::FilePath path;
+    PathService::Get(base::DIR_SOURCE_ROOT, &path);
+    path = path.AppendASCII("services")
+        .AppendASCII("js")
+        .AppendASCII("test")
+        .AppendASCII("echo.js");
+    return "file://" + path.AsUTF8Unsafe();
+  }
+
+  MOJO_DISALLOW_COPY_AND_ASSIGN(JSEchoTest);
+};
+
+struct EchoStringCallback {
+  explicit EchoStringCallback(String *s) : echo_value(s) {}
+  void Run(const String& value) const {
+    *echo_value = value;
+  }
+  String *echo_value;
+};
+
+TEST_F(JSEchoTest, EchoString) {
+  String foo;
+  EchoStringCallback callback(&foo);
+  echo_service_->EchoString("foo", callback);
+  EXPECT_TRUE(echo_service_.WaitForIncomingMethodCall());
+  EXPECT_EQ("foo", foo);
+  echo_service_->EchoString("quit", callback);

[Aaron Boodman, 2014/12/02 01:13:22]

So is the issue that ApplicationTestBase doesn't exit until all apps shut down
or something? Perhaps that should be fixed. Now that I see this, it seems
unfortunate that every test will have to ensure that everything it calls quits. 

[hansmuller, 2014/12/02 15:55:00]

I agree. And when tests/apps generate more complicated application graphs it's
going to be difficult to get the whole graph to gracefully shut down.

In this case, as I understand it, the JS content handler waits for all of the
threads it has launched to exit. A JS app will not exit until its message loop
is explicitly quit (I assume that's at least true of Mojo apps that start a
base::MessageLoop). I'm not sure how the explicit quit can be avoided. 


Maybe apps should automatically shutdown when their shell handle closes?
Assuming that there's some way to close the shell for all apps.

+}
+
+TEST_F(JSEchoTest, EchoEmptyString) {
+  String empty;
+  EchoStringCallback callback(&empty);
+  echo_service_->EchoString("", callback);
+  EXPECT_TRUE(echo_service_.WaitForIncomingMethodCall());
+  EXPECT_EQ("", empty);
+  echo_service_->EchoString("quit", callback);
+}
+
+TEST_F(JSEchoTest, EchoNullString) {
+  String null;
+  EchoStringCallback callback(&null);
+  echo_service_->EchoString(nullptr, callback);
+  EXPECT_TRUE(echo_service_.WaitForIncomingMethodCall());
+  EXPECT_TRUE(null.is_null());
+  echo_service_->EchoString("quit", callback);
+}
+
+}  // namespace
+}  // namespace mojo