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

Unified Diff: service_unittest.cc

Issue 2645008: Update on feedback, update dbus API, add unit tests. TEST=manual,unit,BVT BUG=3628 323 (Closed) Base URL: ssh://git@chromiumos-git/cryptohome.git
Patch Set: Address second round of feedback. Created 10 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « service.cc ('k') | test.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: service_unittest.cc
diff --git a/service_unittest.cc b/service_unittest.cc
index 1483b74d22db1c09ebcf0ef05452355a63d8783c..293c2cafe12bb909349ff5ada1622cc5e972f375 100755
--- a/service_unittest.cc
+++ b/service_unittest.cc
@@ -4,24 +4,23 @@
//
// Unit tests for Service
-#include "cryptohome/service.h"
+#include "service.h"
-#include <glib.h>
#include <gtest/gtest.h>
-#include "cryptohome/mock_mount.h"
+#include "mock_mount.h"
namespace cryptohome {
using ::testing::Return;
using ::testing::_;
TEST(ServiceInterfaceTests, CheckKeySuccessTest) {
- MockMount *mount = new MockMount;
- EXPECT_CALL(*mount, TestCredentials(_))
+ MockMount mount;
+ EXPECT_CALL(mount, TestCredentials(_))
.WillOnce(Return(true));
Service service;
- service.set_mount(mount); // takes ownership.
+ service.set_mount(&mount);
service.Initialize();
gboolean out = FALSE;
GError *error = NULL;
« no previous file with comments | « service.cc ('k') | test.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698