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

Side by Side Diff: chromeos/network/firewall_hole_unittest.cc

Issue 2845973003: Use ScopedTaskEnvironment instead of MessageLoopForUI in chromeos tests. (Closed)
Patch Set: CR Created 3 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/network/firewall_hole.h" 5 #include "chromeos/network/firewall_hole.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/ptr_util.h" 8 #include "base/memory/ptr_util.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/test/scoped_task_environment.h"
10 #include "chromeos/dbus/dbus_thread_manager.h" 11 #include "chromeos/dbus/dbus_thread_manager.h"
11 #include "chromeos/dbus/mock_permission_broker_client.h" 12 #include "chromeos/dbus/mock_permission_broker_client.h"
12 #include "testing/gmock/include/gmock/gmock.h" 13 #include "testing/gmock/include/gmock/gmock.h"
13 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
14 15
15 using chromeos::DBusThreadManager; 16 using chromeos::DBusThreadManager;
16 using chromeos::FirewallHole; 17 using chromeos::FirewallHole;
17 using chromeos::MockPermissionBrokerClient; 18 using chromeos::MockPermissionBrokerClient;
18 using testing::_; 19 using testing::_;
19 20
20 namespace { 21 namespace {
21 22
22 ACTION_TEMPLATE(InvokeCallback, 23 ACTION_TEMPLATE(InvokeCallback,
23 HAS_1_TEMPLATE_PARAMS(int, k), 24 HAS_1_TEMPLATE_PARAMS(int, k),
24 AND_1_VALUE_PARAMS(p1)) { 25 AND_1_VALUE_PARAMS(p1)) {
25 ::std::tr1::get<k>(args).Run(p1); 26 ::std::tr1::get<k>(args).Run(p1);
26 } 27 }
27 28
28 } // namespace 29 } // namespace
29 30
30 class FirewallHoleTest : public testing::Test { 31 class FirewallHoleTest : public testing::Test {
31 public: 32 public:
32 FirewallHoleTest() {} 33 FirewallHoleTest()
34 : scoped_task_environment_(
35 base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
33 ~FirewallHoleTest() override {} 36 ~FirewallHoleTest() override {}
34 37
35 void SetUp() override { 38 void SetUp() override {
36 mock_permission_broker_client_ = new MockPermissionBrokerClient(); 39 mock_permission_broker_client_ = new MockPermissionBrokerClient();
37 DBusThreadManager::GetSetterForTesting()->SetPermissionBrokerClient( 40 DBusThreadManager::GetSetterForTesting()->SetPermissionBrokerClient(
38 base::WrapUnique(mock_permission_broker_client_)); 41 base::WrapUnique(mock_permission_broker_client_));
39 } 42 }
40 43
41 void TearDown() override { DBusThreadManager::Shutdown(); } 44 void TearDown() override { DBusThreadManager::Shutdown(); }
42 45
43 void AssertOpenSuccess(std::unique_ptr<FirewallHole> hole) { 46 void AssertOpenSuccess(std::unique_ptr<FirewallHole> hole) {
44 EXPECT_TRUE(hole.get() != nullptr); 47 EXPECT_TRUE(hole.get() != nullptr);
45 run_loop_.Quit(); 48 run_loop_.Quit();
46 } 49 }
47 50
48 void AssertOpenFailure(std::unique_ptr<FirewallHole> hole) { 51 void AssertOpenFailure(std::unique_ptr<FirewallHole> hole) {
49 EXPECT_TRUE(hole.get() == nullptr); 52 EXPECT_TRUE(hole.get() == nullptr);
50 run_loop_.Quit(); 53 run_loop_.Quit();
51 } 54 }
52 55
53 private: 56 private:
54 base::MessageLoopForUI message_loop_; 57 base::test::ScopedTaskEnvironment scoped_task_environment_;
55 58
56 protected: 59 protected:
57 base::RunLoop run_loop_; 60 base::RunLoop run_loop_;
58 MockPermissionBrokerClient* mock_permission_broker_client_ = nullptr; 61 MockPermissionBrokerClient* mock_permission_broker_client_ = nullptr;
59 }; 62 };
60 63
61 TEST_F(FirewallHoleTest, GrantTcpPortAccess) { 64 TEST_F(FirewallHoleTest, GrantTcpPortAccess) {
62 EXPECT_CALL(*mock_permission_broker_client_, 65 EXPECT_CALL(*mock_permission_broker_client_,
63 RequestTcpPortAccess(1234, "foo0", _, _)) 66 RequestTcpPortAccess(1234, "foo0", _, _))
64 .WillOnce(InvokeCallback<3>(true)); 67 .WillOnce(InvokeCallback<3>(true));
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 TEST_F(FirewallHoleTest, DenyUdpPortAccess) { 101 TEST_F(FirewallHoleTest, DenyUdpPortAccess) {
99 EXPECT_CALL(*mock_permission_broker_client_, 102 EXPECT_CALL(*mock_permission_broker_client_,
100 RequestUdpPortAccess(1234, "foo0", _, _)) 103 RequestUdpPortAccess(1234, "foo0", _, _))
101 .WillOnce(InvokeCallback<3>(false)); 104 .WillOnce(InvokeCallback<3>(false));
102 105
103 FirewallHole::Open( 106 FirewallHole::Open(
104 FirewallHole::PortType::UDP, 1234, "foo0", 107 FirewallHole::PortType::UDP, 1234, "foo0",
105 base::Bind(&FirewallHoleTest::AssertOpenFailure, base::Unretained(this))); 108 base::Bind(&FirewallHoleTest::AssertOpenFailure, base::Unretained(this)));
106 run_loop_.Run(); 109 run_loop_.Run();
107 } 110 }
OLDNEW
« no previous file with comments | « chromeos/cryptohome/system_salt_getter_unittest.cc ('k') | chromeos/network/geolocation_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698