Split application_test_main.cc out of *_base.cc.

mojo/public/cpp/application/lib/application_test_base.cc

Index: mojo/public/cpp/application/lib/application_test_base.cc
diff --git a/mojo/public/cpp/application/lib/application_test_base.cc b/mojo/public/cpp/application/lib/application_test_base.cc
index 76e1c95485120a4311d5f1da6f45b7a0cad10d3d..9384329810eb50b1926b3ab5bdbefbd023c09e32 100644
--- a/mojo/public/cpp/application/lib/application_test_base.cc
+++ b/mojo/public/cpp/application/lib/application_test_base.cc
@@ -4,7 +4,6 @@
 
 #include "mojo/public/cpp/application/application_test_base.h"
 
-#include "mojo/public/c/system/main.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/environment/logging.h"
@@ -17,7 +16,7 @@ namespace test {
 
 namespace {
 
-// This global shell handle is needed for repeated use by test applications.
+// This shell handle is shared by multiple test application instances.
 MessagePipeHandle test_shell_handle;
 
 // TODO(msw): Support base::MessageLoop environments.
@@ -25,6 +24,16 @@ internal::ThreadLocalPointer<RunLoop> test_run_loop;
 
 }  // namespace
 
+ScopedMessagePipeHandle GetShellHandleForTest() {

[viettrungluu, 2014/10/28 23:40:19]

Maybe call this "PassShellHandle()", to indicate that it passes ownership of the
handle?

("ForTest" seems redundant, since it's in the test namespace.)

[msw, 2014/10/29 00:12:38]

Done.

+  MOJO_CHECK(test_shell_handle.is_valid());
+  return MakeScopedHandle(test_shell_handle);

[viettrungluu, 2014/10/28 23:40:20]

This is wrong: Either you should return a (non-owning) MessagePipeHandle (in
which case "Get" is fine), or you should clear test_shell_handle before
returning.

[msw, 2014/10/29 00:12:38]

Done; went with the latter.

+}
+
+void SetShellHandleForTest(ScopedMessagePipeHandle handle) {

[viettrungluu, 2014/10/28 23:40:20]

...

[msw, 2014/10/29 00:12:38]

Renamed to SetShellHandle, hope that's what you meant.

+  MOJO_CHECK(handle.is_valid());
+  test_shell_handle = handle.release();
+}
+
 ApplicationTestBase::ApplicationTestBase(Array<String> args)
     : args_(args.Pass()), application_impl_(nullptr) {
 }
@@ -37,16 +46,15 @@ void ApplicationTestBase::SetUp() {
   test_run_loop.Set(new RunLoop());
 
   // New applications are constructed for each test to avoid persisting state.
-  MOJO_CHECK(test_shell_handle.is_valid());
   application_impl_ = new ApplicationImpl(GetApplicationDelegate(),
-                                          MakeScopedHandle(test_shell_handle));
+                                          GetShellHandleForTest());
 
   // Fake application initialization with the given command line arguments.
   application_impl_->Initialize(args_.Clone());
 }
 
 void ApplicationTestBase::TearDown() {
-  test_shell_handle = application_impl_->UnbindShell().release();
+  SetShellHandleForTest(application_impl_->UnbindShell());
   delete application_impl_;
   delete test_run_loop.Get();
   test_run_loop.Set(nullptr);
@@ -54,41 +62,3 @@ void ApplicationTestBase::TearDown() {
 
 }  // namespace test
 }  // namespace mojo
-
-// TODO(msw): Split this into an application_test_main.cc.
-MojoResult MojoMain(MojoHandle shell_handle) {
-  mojo::Environment environment;
-
-  {
-    // This RunLoop is used for init, and then destroyed before running tests.
-    mojo::RunLoop run_loop;
-
-    // Construct an ApplicationImpl just for the GTEST commandline arguments.
-    // GTEST command line arguments are supported amid application arguments:
-    // $ mojo_shell 'mojo:example_apptest arg1 --gtest_filter=foo arg2'
-    mojo::ApplicationDelegate dummy_application_delegate;
-    mojo::ApplicationImpl app(&dummy_application_delegate, shell_handle);
-    MOJO_CHECK(app.WaitForInitialize());
-
-    // InitGoogleTest expects (argc + 1) elements, including a terminating NULL.
-    // It also removes GTEST arguments from |argv| and updates the |argc| count.
-    // TODO(msw): Provide tests access to these actual command line arguments.
-    const std::vector<std::string>& args = app.args();
-    MOJO_CHECK(args.size() <
-               static_cast<size_t>(std::numeric_limits<int>::max()));
-    int argc = static_cast<int>(args.size());
-    std::vector<const char*> argv(argc + 1);
-    for (int i = 0; i < argc; ++i)
-      argv[i] = args[i].c_str();
-    argv[argc] = nullptr;
-    testing::InitGoogleTest(&argc, const_cast<char**>(&(argv[0])));
-    mojo::test::test_shell_handle = app.UnbindShell().release();
-  }
-
-  int result = RUN_ALL_TESTS();
-
-  MojoResult close_result = MojoClose(mojo::test::test_shell_handle.value());
-  MOJO_CHECK(close_result == MOJO_RESULT_OK);
-
-  return (result == 0) ? MOJO_RESULT_OK : MOJO_RESULT_UNKNOWN;
-}