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

Side by Side Diff: chromeos/cryptohome/system_salt_getter_unittest.cc

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/cryptohome/system_salt_getter.h" 5 #include "chromeos/cryptohome/system_salt_getter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "chromeos/dbus/dbus_thread_manager.h" 10 #include "chromeos/dbus/dbus_thread_manager.h"
11 #include "chromeos/dbus/fake_cryptohome_client.h" 11 #include "chromeos/dbus/fake_cryptohome_client.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 namespace chromeos { 14 namespace chromeos {
15 namespace { 15 namespace {
16 16
17 // Used as a GetSystemSaltCallback. 17 // Used as a GetSystemSaltCallback.
18 void CopySystemSalt(std::string* out_system_salt, 18 void CopySystemSalt(std::string* out_system_salt,
19 const std::string& system_salt) { 19 const std::string& system_salt) {
20 *out_system_salt = system_salt; 20 *out_system_salt = system_salt;
21 } 21 }
22 22
23 class SystemSaltGetterTest : public testing::Test { 23 class SystemSaltGetterTest : public testing::Test {
24 protected: 24 protected:
25 SystemSaltGetterTest() : fake_cryptohome_client_(NULL) {} 25 SystemSaltGetterTest() : fake_cryptohome_client_(NULL) {}
26 26
27 virtual void SetUp() OVERRIDE { 27 virtual void SetUp() override {
28 fake_cryptohome_client_ = new FakeCryptohomeClient; 28 fake_cryptohome_client_ = new FakeCryptohomeClient;
29 DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient( 29 DBusThreadManager::GetSetterForTesting()->SetCryptohomeClient(
30 scoped_ptr<CryptohomeClient>(fake_cryptohome_client_)); 30 scoped_ptr<CryptohomeClient>(fake_cryptohome_client_));
31 31
32 EXPECT_FALSE(SystemSaltGetter::IsInitialized()); 32 EXPECT_FALSE(SystemSaltGetter::IsInitialized());
33 SystemSaltGetter::Initialize(); 33 SystemSaltGetter::Initialize();
34 ASSERT_TRUE(SystemSaltGetter::IsInitialized()); 34 ASSERT_TRUE(SystemSaltGetter::IsInitialized());
35 ASSERT_TRUE(SystemSaltGetter::Get()); 35 ASSERT_TRUE(SystemSaltGetter::Get());
36 } 36 }
37 37
38 virtual void TearDown() OVERRIDE { 38 virtual void TearDown() override {
39 SystemSaltGetter::Shutdown(); 39 SystemSaltGetter::Shutdown();
40 DBusThreadManager::Shutdown(); 40 DBusThreadManager::Shutdown();
41 } 41 }
42 42
43 base::MessageLoopForUI message_loop_; 43 base::MessageLoopForUI message_loop_;
44 FakeCryptohomeClient* fake_cryptohome_client_; 44 FakeCryptohomeClient* fake_cryptohome_client_;
45 }; 45 };
46 46
47 TEST_F(SystemSaltGetterTest, GetSystemSalt) { 47 TEST_F(SystemSaltGetterTest, GetSystemSalt) {
48 // Try to get system salt before the service becomes available. 48 // Try to get system salt before the service becomes available.
49 fake_cryptohome_client_->SetServiceIsAvailable(false); 49 fake_cryptohome_client_->SetServiceIsAvailable(false);
50 std::string system_salt; 50 std::string system_salt;
51 SystemSaltGetter::Get()->GetSystemSalt( 51 SystemSaltGetter::Get()->GetSystemSalt(
52 base::Bind(&CopySystemSalt, &system_salt)); 52 base::Bind(&CopySystemSalt, &system_salt));
53 base::RunLoop().RunUntilIdle(); 53 base::RunLoop().RunUntilIdle();
54 EXPECT_TRUE(system_salt.empty()); // System salt is not returned yet. 54 EXPECT_TRUE(system_salt.empty()); // System salt is not returned yet.
55 55
56 // Service becomes available. 56 // Service becomes available.
57 fake_cryptohome_client_->SetServiceIsAvailable(true); 57 fake_cryptohome_client_->SetServiceIsAvailable(true);
58 base::RunLoop().RunUntilIdle(); 58 base::RunLoop().RunUntilIdle();
59 const std::string expected_system_salt = 59 const std::string expected_system_salt =
60 SystemSaltGetter::ConvertRawSaltToHexString( 60 SystemSaltGetter::ConvertRawSaltToHexString(
61 FakeCryptohomeClient::GetStubSystemSalt()); 61 FakeCryptohomeClient::GetStubSystemSalt());
62 EXPECT_EQ(expected_system_salt, system_salt); // System salt is returned. 62 EXPECT_EQ(expected_system_salt, system_salt); // System salt is returned.
63 } 63 }
64 64
65 } // namespace 65 } // namespace
66 } // namespace chromeos 66 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/cryptohome/homedir_methods_unittest.cc ('k') | chromeos/dbus/blocking_method_caller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698