diff options
Diffstat (limited to 'net/base')
-rw-r--r-- | net/base/listen_socket_unittest.h | 4 | ||||
-rw-r--r-- | net/base/run_all_unittests.cc | 58 |
2 files changed, 60 insertions, 2 deletions
diff --git a/net/base/listen_socket_unittest.h b/net/base/listen_socket_unittest.h index 8c5cb6d..36af167 100644 --- a/net/base/listen_socket_unittest.h +++ b/net/base/listen_socket_unittest.h @@ -77,7 +77,7 @@ class ListenSocketTester : server_ = NULL; net::WinsockInit::Init(); - thread_.reset(new Thread("socketio_test")); + thread_.reset(new base::Thread("socketio_test")); thread_->Start(); loop_ = thread_->message_loop(); @@ -251,7 +251,7 @@ class ListenSocketTester : ASSERT_EQ(buf, HELLO_WORLD); } - scoped_ptr<Thread> thread_; + scoped_ptr<base::Thread> thread_; MessageLoop* loop_; ListenSocket* server_; ListenSocket* connection_; diff --git a/net/base/run_all_unittests.cc b/net/base/run_all_unittests.cc new file mode 100644 index 0000000..a1bae81 --- /dev/null +++ b/net/base/run_all_unittests.cc @@ -0,0 +1,58 @@ +// Copyright 2008, Google Inc. +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "base/message_loop.h" +#include "base/test_suite.h" + +class NetTestSuite : public TestSuite { + public: + NetTestSuite(int argc, char** argv) : TestSuite(argc, argv) { + } + + virtual void Initialize() { + TestSuite::Initialize(); + + message_loop_.reset(new MessageLoopForIO()); + } + + virtual void CleanUp() { + // We want to destroy this here before the TestSuite continues to tear down + // the environment. + message_loop_.reset(); + + TestSuite::Shutdown(); + } + + private: + scoped_ptr<MessageLoop> message_loop_; +}; + +int main(int argc, char** argv) { + return NetTestSuite(argc, argv).Run(); +} |