Mirror-Tools
/
shaka-packager
mirror of https://github.com/shaka-project/shaka-packager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use StrEq for string comparison in mpd notifier unittests 

Change-Id: I9960908764aea29adbe8feae2a71359f9ff4ecee
This commit is contained in:
KongQun Yang 2015-09-22 16:17:22 -07:00
parent 6a7b32641a
commit 5c788c2dd5
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packager/mpd/base/dash_iop_mpd_notifier_unittest.cc
View File

@ -20,6 +20,7 @@ using ::testing::_;
using ::testing::Eq; using ::testing::Eq;
using ::testing::InSequence; using ::testing::InSequence;
using ::testing::Return; using ::testing::Return;
using ::testing::StrEq;
namespace { namespace {
@ -719,7 +720,7 @@ TEST_P(DashIopMpdNotifierTest, UpdateEncryption) {
const char kBogusNewPsshInBase64[] = "cHNzaHNvbWV0aGluZ2Vsc2U="; const char kBogusNewPsshInBase64[] = "cHNzaHNvbWV0aGluZ2Vsc2U=";
EXPECT_CALL(*default_mock_adaptation_set_, EXPECT_CALL(*default_mock_adaptation_set_,
UpdateContentProtectionPssh(kBogusNewPsshInBase64)); UpdateContentProtectionPssh(StrEq(kBogusNewPsshInBase64)));
EXPECT_TRUE(notifier.NotifyEncryptionUpdate( EXPECT_TRUE(notifier.NotifyEncryptionUpdate(
container_id, std::vector<uint8_t>(), kBogusNewPsshVector)); container_id, std::vector<uint8_t>(), kBogusNewPsshVector));
} }

2
packager/mpd/base/mock_mpd_notifier.h
View File

@ -19,7 +19,7 @@ namespace edash_packager {
class MockMpdNotifier : public MpdNotifier { class MockMpdNotifier : public MpdNotifier {
public: public:
MockMpdNotifier(DashProfile profile); MockMpdNotifier(DashProfile profile);
virtual ~MockMpdNotifier() OVERRIDE; virtual ~MockMpdNotifier();
MOCK_METHOD0(Init, bool()); MOCK_METHOD0(Init, bool());
MOCK_METHOD2(NotifyNewContainer, MOCK_METHOD2(NotifyNewContainer,

3
packager/mpd/base/simple_mpd_notifier_unittest.cc
View File

@ -18,6 +18,7 @@ namespace edash_packager {
using ::testing::_; using ::testing::_;
using ::testing::Return; using ::testing::Return;
using ::testing::StrEq;
namespace { namespace {
const char kValidMediaInfo[] = const char kValidMediaInfo[] =
@ -285,7 +286,7 @@ TEST_P(SimpleMpdNotifierTest, UpdateEncryption) {
const char kBogusNewPsshInBase64[] = "cHNzaHNvbWV0aGluZ2Vsc2U="; const char kBogusNewPsshInBase64[] = "cHNzaHNvbWV0aGluZ2Vsc2U=";
EXPECT_CALL(*mock_representation, EXPECT_CALL(*mock_representation,
UpdateContentProtectionPssh(kBogusNewPsshInBase64)); UpdateContentProtectionPssh(StrEq(kBogusNewPsshInBase64)));
EXPECT_TRUE(notifier.NotifyEncryptionUpdate( EXPECT_TRUE(notifier.NotifyEncryptionUpdate(
container_id, std::vector<uint8_t>(), kBogusNewPsshVector)); container_id, std::vector<uint8_t>(), kBogusNewPsshVector));
} }