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

Side by Side Diff: components/policy/core/common/cloud/cloud_policy_validator_unittest.cc

Issue 2846723005: Use ScopedTaskEnvironment instead of MessageLoopForUI in components tests. (Closed)
Patch Set: fix-test-errors 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "components/policy/core/common/cloud/cloud_policy_validator.h" 5 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
11 #include <utility> 11 #include <utility>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
16 #include "base/message_loop/message_loop.h"
17 #include "base/run_loop.h" 16 #include "base/run_loop.h"
18 #include "base/single_thread_task_runner.h" 17 #include "base/single_thread_task_runner.h"
19 #include "base/strings/string_util.h" 18 #include "base/strings/string_util.h"
19 #include "base/test/scoped_task_environment.h"
20 #include "base/threading/thread_task_runner_handle.h" 20 #include "base/threading/thread_task_runner_handle.h"
21 #include "build/build_config.h" 21 #include "build/build_config.h"
22 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 22 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
23 #include "components/policy/core/common/cloud/policy_builder.h" 23 #include "components/policy/core/common/cloud/policy_builder.h"
24 #include "components/policy/core/common/policy_switches.h" 24 #include "components/policy/core/common/policy_switches.h"
25 #include "components/policy/proto/device_management_backend.pb.h" 25 #include "components/policy/proto/device_management_backend.pb.h"
26 #include "crypto/rsa_private_key.h" 26 #include "crypto/rsa_private_key.h"
27 #include "testing/gmock/include/gmock/gmock.h" 27 #include "testing/gmock/include/gmock/gmock.h"
28 #include "testing/gtest/include/gtest/gtest.h" 28 #include "testing/gtest/include/gtest/gtest.h"
29 29
30 namespace em = enterprise_management; 30 namespace em = enterprise_management;
31 31
32 using testing::Invoke; 32 using testing::Invoke;
33 using testing::Mock; 33 using testing::Mock;
34 34
35 namespace policy { 35 namespace policy {
36 36
37 namespace { 37 namespace {
38 38
39 ACTION_P(CheckStatus, expected_status) { 39 ACTION_P(CheckStatus, expected_status) {
40 EXPECT_EQ(expected_status, arg0->status()); 40 EXPECT_EQ(expected_status, arg0->status());
41 }; 41 };
42 42
43 class CloudPolicyValidatorTest : public testing::Test { 43 class CloudPolicyValidatorTest : public testing::Test {
44 public: 44 public:
45 CloudPolicyValidatorTest() 45 CloudPolicyValidatorTest()
46 : timestamp_(base::Time::FromJavaTime(PolicyBuilder::kFakeTimestamp)), 46 : scoped_task_environment_(
47 base::test::ScopedTaskEnvironment::MainThreadType::UI),
48 timestamp_(base::Time::FromJavaTime(PolicyBuilder::kFakeTimestamp)),
47 timestamp_option_(CloudPolicyValidatorBase::TIMESTAMP_VALIDATED), 49 timestamp_option_(CloudPolicyValidatorBase::TIMESTAMP_VALIDATED),
48 dm_token_option_(CloudPolicyValidatorBase::DM_TOKEN_REQUIRED), 50 dm_token_option_(CloudPolicyValidatorBase::DM_TOKEN_REQUIRED),
49 device_id_option_(CloudPolicyValidatorBase::DEVICE_ID_REQUIRED), 51 device_id_option_(CloudPolicyValidatorBase::DEVICE_ID_REQUIRED),
50 allow_key_rotation_(true), 52 allow_key_rotation_(true),
51 existing_dm_token_(PolicyBuilder::kFakeToken), 53 existing_dm_token_(PolicyBuilder::kFakeToken),
52 existing_device_id_(PolicyBuilder::kFakeDeviceId), 54 existing_device_id_(PolicyBuilder::kFakeDeviceId),
53 owning_domain_(PolicyBuilder::kFakeDomain), 55 owning_domain_(PolicyBuilder::kFakeDomain),
54 cached_key_signature_(PolicyBuilder::GetTestSigningKeySignature()) { 56 cached_key_signature_(PolicyBuilder::GetTestSigningKeySignature()) {
55 policy_.SetDefaultNewSigningKey(); 57 policy_.SetDefaultNewSigningKey();
56 } 58 }
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 void CheckSuccessfulValidation(UserCloudPolicyValidator* validator) { 112 void CheckSuccessfulValidation(UserCloudPolicyValidator* validator) {
111 EXPECT_TRUE(validator->success()); 113 EXPECT_TRUE(validator->success());
112 EXPECT_EQ(policy_.policy().SerializeAsString(), 114 EXPECT_EQ(policy_.policy().SerializeAsString(),
113 validator->policy()->SerializeAsString()); 115 validator->policy()->SerializeAsString());
114 EXPECT_EQ(policy_.policy_data().SerializeAsString(), 116 EXPECT_EQ(policy_.policy_data().SerializeAsString(),
115 validator->policy_data()->SerializeAsString()); 117 validator->policy_data()->SerializeAsString());
116 EXPECT_EQ(policy_.payload().SerializeAsString(), 118 EXPECT_EQ(policy_.payload().SerializeAsString(),
117 validator->payload()->SerializeAsString()); 119 validator->payload()->SerializeAsString());
118 } 120 }
119 121
120 base::MessageLoopForUI loop_; 122 base::test::ScopedTaskEnvironment scoped_task_environment_;
121 base::Time timestamp_; 123 base::Time timestamp_;
122 CloudPolicyValidatorBase::ValidateTimestampOption timestamp_option_; 124 CloudPolicyValidatorBase::ValidateTimestampOption timestamp_option_;
123 CloudPolicyValidatorBase::ValidateDMTokenOption dm_token_option_; 125 CloudPolicyValidatorBase::ValidateDMTokenOption dm_token_option_;
124 CloudPolicyValidatorBase::ValidateDeviceIdOption device_id_option_; 126 CloudPolicyValidatorBase::ValidateDeviceIdOption device_id_option_;
125 std::string signing_key_; 127 std::string signing_key_;
126 bool allow_key_rotation_; 128 bool allow_key_rotation_;
127 std::string existing_dm_token_; 129 std::string existing_dm_token_;
128 std::string existing_device_id_; 130 std::string existing_device_id_;
129 std::string owning_domain_; 131 std::string owning_domain_;
130 std::string cached_key_signature_; 132 std::string cached_key_signature_;
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 414
413 TEST_F(CloudPolicyValidatorTest, NoRotation) { 415 TEST_F(CloudPolicyValidatorTest, NoRotation) {
414 allow_key_rotation_ = false; 416 allow_key_rotation_ = false;
415 policy_.UnsetNewSigningKey(); 417 policy_.UnsetNewSigningKey();
416 Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_OK)); 418 Validate(CheckStatus(CloudPolicyValidatorBase::VALIDATION_OK));
417 } 419 }
418 420
419 } // namespace 421 } // namespace
420 422
421 } // namespace policy 423 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698