projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
browser
/
media
/
webrtc_internals_unittest.cc
diff --git
a/src/content/browser/media/webrtc_internals_unittest.cc
b/src/content/browser/media/webrtc_internals_unittest.cc
index
e4b0531
..
ede203a
100644
(file)
--- a/
src/content/browser/media/webrtc_internals_unittest.cc
+++ b/
src/content/browser/media/webrtc_internals_unittest.cc
@@
-15,7
+15,7
@@
namespace content {
namespace {
static const std::string kContraints = "c";
namespace {
static const std::string kContraints = "c";
-static const std::string k
Servers = "s
";
+static const std::string k
RtcConfiguration = "r
";
static const std::string kUrl = "u";
class MockWebRTCInternalsProxy : public WebRTCInternalsUIObserver {
static const std::string kUrl = "u";
class MockWebRTCInternalsProxy : public WebRTCInternalsUIObserver {
@@
-99,7
+99,7
@@
TEST_F(WebRTCInternalsTest, AddRemoveObserver) {
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->RemoveObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->RemoveObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
- 0, 3, 4, kUrl, k
Servers
, kContraints);
+ 0, 3, 4, kUrl, k
RtcConfiguration
, kContraints);
EXPECT_EQ("", observer->command());
WebRTCInternals::GetInstance()->OnRemovePeerConnection(3, 4);
EXPECT_EQ("", observer->command());
WebRTCInternals::GetInstance()->OnRemovePeerConnection(3, 4);
@@
-110,7
+110,7
@@
TEST_F(WebRTCInternalsTest, SendAddPeerConnectionUpdate) {
new MockWebRTCInternalsProxy());
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
new MockWebRTCInternalsProxy());
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
- 0, 1, 2, kUrl, k
Servers
, kContraints);
+ 0, 1, 2, kUrl, k
RtcConfiguration
, kContraints);
EXPECT_EQ("addPeerConnection", observer->command());
base::DictionaryValue* dict = NULL;
EXPECT_EQ("addPeerConnection", observer->command());
base::DictionaryValue* dict = NULL;
@@
-119,7
+119,7
@@
TEST_F(WebRTCInternalsTest, SendAddPeerConnectionUpdate) {
VerifyInt(dict, "pid", 1);
VerifyInt(dict, "lid", 2);
VerifyString(dict, "url", kUrl);
VerifyInt(dict, "pid", 1);
VerifyInt(dict, "lid", 2);
VerifyString(dict, "url", kUrl);
- VerifyString(dict, "
servers", kServers
);
+ VerifyString(dict, "
rtcConfiguration", kRtcConfiguration
);
VerifyString(dict, "constraints", kContraints);
WebRTCInternals::GetInstance()->RemoveObserver(observer.get());
VerifyString(dict, "constraints", kContraints);
WebRTCInternals::GetInstance()->RemoveObserver(observer.get());
@@
-131,7
+131,7
@@
TEST_F(WebRTCInternalsTest, SendRemovePeerConnectionUpdate) {
new MockWebRTCInternalsProxy());
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
new MockWebRTCInternalsProxy());
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
- 0, 1, 2, kUrl, k
Servers
, kContraints);
+ 0, 1, 2, kUrl, k
RtcConfiguration
, kContraints);
WebRTCInternals::GetInstance()->OnRemovePeerConnection(1, 2);
EXPECT_EQ("removePeerConnection", observer->command());
WebRTCInternals::GetInstance()->OnRemovePeerConnection(1, 2);
EXPECT_EQ("removePeerConnection", observer->command());
@@
-149,7
+149,7
@@
TEST_F(WebRTCInternalsTest, SendUpdatePeerConnectionUpdate) {
new MockWebRTCInternalsProxy());
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
new MockWebRTCInternalsProxy());
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
- 0, 1, 2, kUrl, k
Servers
, kContraints);
+ 0, 1, 2, kUrl, k
RtcConfiguration
, kContraints);
const std::string update_type = "fakeType";
const std::string update_value = "fakeValue";
const std::string update_type = "fakeType";
const std::string update_value = "fakeValue";
@@
-166,6
+166,10
@@
TEST_F(WebRTCInternalsTest, SendUpdatePeerConnectionUpdate) {
VerifyString(dict, "type", update_type);
VerifyString(dict, "value", update_value);
VerifyString(dict, "type", update_type);
VerifyString(dict, "value", update_value);
+ std::string time;
+ EXPECT_TRUE(dict->GetString("time", &time));
+ EXPECT_FALSE(time.empty());
+
WebRTCInternals::GetInstance()->OnRemovePeerConnection(1, 2);
WebRTCInternals::GetInstance()->RemoveObserver(observer.get());
}
WebRTCInternals::GetInstance()->OnRemovePeerConnection(1, 2);
WebRTCInternals::GetInstance()->RemoveObserver(observer.get());
}
@@
-216,7
+220,7
@@
TEST_F(WebRTCInternalsTest, SendAllUpdatesWithPeerConnectionUpdate) {
const std::string update_value = "fakeValue";
WebRTCInternals::GetInstance()->OnAddPeerConnection(
const std::string update_value = "fakeValue";
WebRTCInternals::GetInstance()->OnAddPeerConnection(
- rid, pid, lid, kUrl, k
Servers
, kContraints);
+ rid, pid, lid, kUrl, k
RtcConfiguration
, kContraints);
WebRTCInternals::GetInstance()->OnUpdatePeerConnection(
pid, lid, update_type, update_value);
WebRTCInternals::GetInstance()->OnUpdatePeerConnection(
pid, lid, update_type, update_value);
@@
-238,7
+242,7
@@
TEST_F(WebRTCInternalsTest, SendAllUpdatesWithPeerConnectionUpdate) {
VerifyInt(dict, "pid", pid);
VerifyInt(dict, "lid", lid);
VerifyString(dict, "url", kUrl);
VerifyInt(dict, "pid", pid);
VerifyInt(dict, "lid", lid);
VerifyString(dict, "url", kUrl);
- VerifyString(dict, "
servers", kServers
);
+ VerifyString(dict, "
rtcConfiguration", kRtcConfiguration
);
VerifyString(dict, "constraints", kContraints);
base::ListValue* log = NULL;
VerifyString(dict, "constraints", kContraints);
base::ListValue* log = NULL;
@@
-248,6
+252,9
@@
TEST_F(WebRTCInternalsTest, SendAllUpdatesWithPeerConnectionUpdate) {
EXPECT_TRUE((*log->begin())->GetAsDictionary(&dict));
VerifyString(dict, "type", update_type);
VerifyString(dict, "value", update_value);
EXPECT_TRUE((*log->begin())->GetAsDictionary(&dict));
VerifyString(dict, "type", update_type);
VerifyString(dict, "value", update_value);
+ std::string time;
+ EXPECT_TRUE(dict->GetString("time", &time));
+ EXPECT_FALSE(time.empty());
}
TEST_F(WebRTCInternalsTest, OnAddStats) {
}
TEST_F(WebRTCInternalsTest, OnAddStats) {
@@
-255,7
+262,7
@@
TEST_F(WebRTCInternalsTest, OnAddStats) {
scoped_ptr<MockWebRTCInternalsProxy> observer(new MockWebRTCInternalsProxy());
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
scoped_ptr<MockWebRTCInternalsProxy> observer(new MockWebRTCInternalsProxy());
WebRTCInternals::GetInstance()->AddObserver(observer.get());
WebRTCInternals::GetInstance()->OnAddPeerConnection(
- rid, pid, lid, kUrl, k
Servers
, kContraints);
+ rid, pid, lid, kUrl, k
RtcConfiguration
, kContraints);
base::ListValue list;
list.AppendString("xxx");
base::ListValue list;
list.AppendString("xxx");