diff options
| author | Andrea Azzarone <azzaronea@gmail.com> | 2016-02-24 13:05:30 +0100 |
|---|---|---|
| committer | Andrea Azzarone <azzaronea@gmail.com> | 2016-02-24 13:05:30 +0100 |
| commit | 7875e1af55be73ea1cdb67130d61e11012a5e345 (patch) | |
| tree | 50880dd1a7e37b83a4308754921ee9e56cfb4a8e /tests | |
| parent | 825b78974ef8ad629f5dc0c55b586700ec610d3c (diff) | |
| parent | 33ede65b00a901ac1cd33e2176bc95f70ba1210a (diff) | |
Merge with trunk.
(bzr r4074.3.1)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test_mock_devices.h | 2 | ||||
| -rw-r--r-- | tests/test_volume_launcher_icon.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tests/test_mock_devices.h b/tests/test_mock_devices.h index 2f4218fc5..d429b569b 100644 --- a/tests/test_mock_devices.h +++ b/tests/test_mock_devices.h @@ -78,11 +78,13 @@ struct MockVolume : Volume typedef std::shared_ptr<MockVolume> Ptr; typedef testing::NiceMock<MockVolume> Nice; + MOCK_CONST_METHOD0(CanBeFormatted, bool(void)); MOCK_CONST_METHOD0(CanBeRemoved, bool(void)); MOCK_CONST_METHOD0(CanBeStopped, bool(void)); MOCK_CONST_METHOD0(GetName, std::string(void)); MOCK_CONST_METHOD0(GetIconName, std::string(void)); MOCK_CONST_METHOD0(GetIdentifier, std::string(void)); + MOCK_CONST_METHOD0(GetUnixDevicePath, std::string(void)); MOCK_CONST_METHOD0(GetUri, std::string(void)); MOCK_CONST_METHOD0(HasSiblings, bool(void)); MOCK_CONST_METHOD0(CanBeEjected, bool(void)); diff --git a/tests/test_volume_launcher_icon.cpp b/tests/test_volume_launcher_icon.cpp index 41b794bae..1bd4f5a56 100644 --- a/tests/test_volume_launcher_icon.cpp +++ b/tests/test_volume_launcher_icon.cpp @@ -56,11 +56,13 @@ struct TestVolumeLauncherIcon : public Test void SetupVolumeDefaultBehavior() { + ON_CALL(*volume_, CanBeFormatted()).WillByDefault(Return(false)); ON_CALL(*volume_, CanBeRemoved()).WillByDefault(Return(false)); ON_CALL(*volume_, CanBeStopped()).WillByDefault(Return(false)); ON_CALL(*volume_, GetName()).WillByDefault(Return("Test Name")); ON_CALL(*volume_, GetIconName()).WillByDefault(Return("Test Icon Name")); ON_CALL(*volume_, GetIdentifier()).WillByDefault(Return("Test Identifier")); + ON_CALL(*volume_, GetUnixDevicePath()).WillByDefault(Return("/dev/sda1")); ON_CALL(*volume_, GetUri()).WillByDefault(Return("file:///media/user/device_uri")); ON_CALL(*volume_, HasSiblings()).WillByDefault(Return(false)); ON_CALL(*volume_, CanBeEjected()).WillByDefault(Return(false)); |