OLD | NEW |
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 <algorithm> | 5 #include <algorithm> |
6 #include <map> | 6 #include <map> |
7 #include <set> | 7 #include <set> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
470 writer.AppendInt32(klauncher_ret_); | 470 writer.AppendInt32(klauncher_ret_); |
471 writer.AppendString(std::string()); // dbus_name | 471 writer.AppendString(std::string()); // dbus_name |
472 writer.AppendString(klauncher_error_); | 472 writer.AppendString(klauncher_error_); |
473 writer.AppendInt32(1234); // pid | 473 writer.AppendInt32(1234); // pid |
474 return response.release(); | 474 return response.release(); |
475 } | 475 } |
476 | 476 |
477 dbus::Response* NativeBackendKWalletTest::KWalletMethodCall( | 477 dbus::Response* NativeBackendKWalletTest::KWalletMethodCall( |
478 dbus::MethodCall* method_call, testing::Unused) { | 478 dbus::MethodCall* method_call, testing::Unused) { |
479 if (!kwallet_running_) | 479 if (!kwallet_running_) |
480 return NULL; | 480 return nullptr; |
481 EXPECT_EQ("org.kde.KWallet", method_call->GetInterface()); | 481 EXPECT_EQ("org.kde.KWallet", method_call->GetInterface()); |
482 | 482 |
483 if (ContainsKey(failing_methods_, method_call->GetMember())) | 483 if (ContainsKey(failing_methods_, method_call->GetMember())) |
484 return nullptr; | 484 return nullptr; |
485 scoped_ptr<dbus::Response> response; | 485 scoped_ptr<dbus::Response> response; |
486 if (method_call->GetMember() == "isEnabled") { | 486 if (method_call->GetMember() == "isEnabled") { |
487 response = dbus::Response::CreateEmpty(); | 487 response = dbus::Response::CreateEmpty(); |
488 dbus::MessageWriter writer(response.get()); | 488 dbus::MessageWriter writer(response.get()); |
489 writer.AppendBool(kwallet_enabled_); | 489 writer.AppendBool(kwallet_enabled_); |
490 } else if (method_call->GetMember() == "networkWallet") { | 490 } else if (method_call->GetMember() == "networkWallet") { |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
567 if (wallet_.readEntry(folder_name, key, &value)) { | 567 if (wallet_.readEntry(folder_name, key, &value)) { |
568 response = dbus::Response::CreateEmpty(); | 568 response = dbus::Response::CreateEmpty(); |
569 dbus::MessageWriter writer(response.get()); | 569 dbus::MessageWriter writer(response.get()); |
570 writer.AppendArrayOfBytes(value.data(), value.size()); | 570 writer.AppendArrayOfBytes(value.data(), value.size()); |
571 } | 571 } |
572 } else if (method_call->GetMember() == "writeEntry") { | 572 } else if (method_call->GetMember() == "writeEntry") { |
573 dbus::MessageReader reader(method_call); | 573 dbus::MessageReader reader(method_call); |
574 int handle = NativeBackendKWalletStub::kInvalidKWalletHandle; | 574 int handle = NativeBackendKWalletStub::kInvalidKWalletHandle; |
575 std::string folder_name; | 575 std::string folder_name; |
576 std::string key; | 576 std::string key; |
577 const uint8_t* bytes = NULL; | 577 const uint8_t* bytes = nullptr; |
578 size_t length = 0; | 578 size_t length = 0; |
579 std::string app_name; | 579 std::string app_name; |
580 EXPECT_TRUE(reader.PopInt32(&handle)); | 580 EXPECT_TRUE(reader.PopInt32(&handle)); |
581 EXPECT_TRUE(reader.PopString(&folder_name)); | 581 EXPECT_TRUE(reader.PopString(&folder_name)); |
582 EXPECT_TRUE(reader.PopString(&key)); | 582 EXPECT_TRUE(reader.PopString(&key)); |
583 EXPECT_TRUE(reader.PopArrayOfBytes(&bytes, &length)); | 583 EXPECT_TRUE(reader.PopArrayOfBytes(&bytes, &length)); |
584 EXPECT_TRUE(reader.PopString(&app_name)); | 584 EXPECT_TRUE(reader.PopString(&app_name)); |
585 EXPECT_NE(NativeBackendKWalletStub::kInvalidKWalletHandle, handle); | 585 EXPECT_NE(NativeBackendKWalletStub::kInvalidKWalletHandle, handle); |
586 response = dbus::Response::CreateEmpty(); | 586 response = dbus::Response::CreateEmpty(); |
587 dbus::MessageWriter writer(response.get()); | 587 dbus::MessageWriter writer(response.get()); |
588 writer.AppendInt32( | 588 writer.AppendInt32( |
589 wallet_.writeEntry(folder_name, key, | 589 wallet_.writeEntry(folder_name, key, |
590 TestKWallet::Blob(bytes, length)) ? 0 : 1); | 590 TestKWallet::Blob(bytes, length)) ? 0 : 1); |
591 } | 591 } |
592 | 592 |
593 EXPECT_FALSE(response.get() == NULL); | 593 EXPECT_TRUE(response); |
594 return response.release(); | 594 return response.release(); |
595 } | 595 } |
596 | 596 |
597 void NativeBackendKWalletTest::CheckPasswordForms( | 597 void NativeBackendKWalletTest::CheckPasswordForms( |
598 const std::string& folder, const ExpectationArray& sorted_expected) { | 598 const std::string& folder, const ExpectationArray& sorted_expected) { |
599 EXPECT_TRUE(wallet_.hasFolder(folder)); | 599 EXPECT_TRUE(wallet_.hasFolder(folder)); |
600 std::vector<std::string> entries; | 600 std::vector<std::string> entries; |
601 EXPECT_TRUE(wallet_.entryList(folder, &entries)); | 601 EXPECT_TRUE(wallet_.entryList(folder, &entries)); |
602 EXPECT_EQ(sorted_expected.size(), entries.size()); | 602 EXPECT_EQ(sorted_expected.size(), entries.size()); |
603 std::sort(entries.begin(), entries.end()); | 603 std::sort(entries.begin(), entries.end()); |
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1234 CheckVersion3Pickle(); | 1234 CheckVersion3Pickle(); |
1235 } | 1235 } |
1236 | 1236 |
1237 TEST_F(NativeBackendKWalletPickleTest, CheckVersion5Pickle) { | 1237 TEST_F(NativeBackendKWalletPickleTest, CheckVersion5Pickle) { |
1238 CheckVersion5Pickle(); | 1238 CheckVersion5Pickle(); |
1239 } | 1239 } |
1240 | 1240 |
1241 TEST_F(NativeBackendKWalletPickleTest, CheckVersion6Pickle) { | 1241 TEST_F(NativeBackendKWalletPickleTest, CheckVersion6Pickle) { |
1242 CheckVersion6Pickle(); | 1242 CheckVersion6Pickle(); |
1243 } | 1243 } |
OLD | NEW |