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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/protocol/jingle_messages_unittest.cc

Issue 10532211: Added piping for sending audio packets from host to client. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unittests Created 8 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 | « remoting/protocol/content_description.cc ('k') | remoting/protocol/session_config.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_messages_unittest.cc
diff --git a/remoting/protocol/jingle_messages_unittest.cc b/remoting/protocol/jingle_messages_unittest.cc
index 228886be32346e94d27e541e4cf1911830cca1ec..d8ed4dcdd86d691ed696866373941e43384a54c4 100644
--- a/remoting/protocol/jingle_messages_unittest.cc
+++ b/remoting/protocol/jingle_messages_unittest.cc
@@ -98,17 +98,25 @@ bool VerifyXml(const XmlElement* exp,
TEST(JingleMessageTest, SessionInitiate) {
const char* kTestSessionInitiateMessage =
"<iq to='user@gmail.com/chromoting016DBB07' type='set' "
- "from='user@gmail.com/chromiumsy5C6A652D' "
- "xmlns='jabber:client'><jingle xmlns='urn:xmpp:jingle:1' "
- "action='session-initiate' sid='2227053353' "
- "initiator='user@gmail.com/chromiumsy5C6A652D'><content "
- "name='chromoting' creator='initiator'><description "
- "xmlns='google:remoting'><control transport='stream' version='2'/><event "
- "transport='stream' version='2'/><video transport='stream' version='2' "
- "codec='vp8'/><initial-resolution width='640' height='480'/>"
- "<authentication><auth-token>j7whCMii0Z0AAPwj7whCM/j7whCMii0Z0AAPw="
- "</auth-token></authentication></description><transport "
- "xmlns='http://www.google.com/transport/p2p'/></content></jingle>"
+ "from='user@gmail.com/chromiumsy5C6A652D' "
+ "xmlns='jabber:client'>"
+ "<jingle xmlns='urn:xmpp:jingle:1' "
+ "action='session-initiate' sid='2227053353' "
+ "initiator='user@gmail.com/chromiumsy5C6A652D'>"
+ "<content name='chromoting' creator='initiator'>"
+ "<description xmlns='google:remoting'>"
+ "<control transport='stream' version='2'/>"
+ "<event transport='stream' version='2'/>"
+ "<video transport='stream' version='2' codec='vp8'/>"
+ "<audio transport='stream' version='2' codec='verbatim'/>"
+ "<initial-resolution width='640' height='480'/>"
+ "<authentication><auth-token>"
+ "j7whCMii0Z0AAPwj7whCM/j7whCMii0Z0AAPw="
+ "</auth-token></authentication>"
+ "</description>"
+ "<transport xmlns='http://www.google.com/transport/p2p'/>"
+ "</content>"
+ "</jingle>"
"</iq>";
scoped_ptr<XmlElement> source_message(
XmlElement::ForStr(kTestSessionInitiateMessage));
@@ -131,16 +139,25 @@ TEST(JingleMessageTest, SessionInitiate) {
TEST(JingleMessageTest, SessionAccept) {
const char* kTestSessionAcceptMessage =
"<cli:iq from='user@gmail.com/chromoting016DBB07' "
- "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
- "xmlns:cli='jabber:client'><jingle action='session-accept' "
- "sid='2227053353' xmlns='urn:xmpp:jingle:1'><content creator='initiator' "
- "name='chromoting'><description xmlns='google:remoting'><control "
- "transport='stream' version='2'/><event transport='stream' version='2'/>"
- "<video codec='vp8' transport='stream' version='2'/><initial-resolution "
- "height='480' width='640'/><authentication><certificate>"
- "MIICpjCCAY6gW0Cert0TANBgkqhkiG9w0BAQUFA=</certificate>"
- "</authentication></description><transport xmlns="
- "'http://www.google.com/transport/p2p'/></content></jingle></cli:iq>";
+ "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
+ "xmlns:cli='jabber:client'>"
+ "<jingle action='session-accept' sid='2227053353' "
+ "xmlns='urn:xmpp:jingle:1'>i"
+ "<content creator='initiator' name='chromoting'>"
+ "<description xmlns='google:remoting'>"
+ "<control transport='stream' version='2'/>"
+ "<event transport='stream' version='2'/>"
+ "<video codec='vp8' transport='stream' version='2'/>"
+ "<audio transport='stream' version='2' codec='verbatim'/>"
+ "<initial-resolution height='480' width='640'/>"
+ "<authentication><certificate>"
+ "MIICpjCCAY6gW0Cert0TANBgkqhkiG9w0BAQUFA="
+ "</certificate></authentication>"
+ "</description>"
+ "<transport xmlns='http://www.google.com/transport/p2p'/>"
+ "</content>"
+ "</jingle>"
+ "</cli:iq>";
scoped_ptr<XmlElement> source_message(
XmlElement::ForStr(kTestSessionAcceptMessage));
@@ -317,19 +334,29 @@ TEST(JingleMessageReplyTest, ToXml) {
TEST(JingleMessageTest, ErrorMessage) {
const char* kTestSessionInitiateErrorMessage =
"<iq to='user@gmail.com/chromoting016DBB07' type='error' "
- "from='user@gmail.com/chromiumsy5C6A652D' "
- "xmlns='jabber:client'><jingle xmlns='urn:xmpp:jingle:1' "
- "action='session-initiate' sid='2227053353' "
- "initiator='user@gmail.com/chromiumsy5C6A652D'><content "
- "name='chromoting' creator='initiator'><description "
- "xmlns='google:remoting'><control transport='stream' version='2'/><event "
- "transport='stream' version='2'/><video transport='stream' version='2' "
- "codec='vp8'/><initial-resolution width='800' height='600'/>"
- "<authentication><auth-token>j7whCMii0Z0AAPwj7whCM/j7whCMii0Z0AAPw="
- "</auth-token></authentication></description><transport "
- "xmlns='http://www.google.com/transport/p2p'/></content></jingle>"
- "<error code='501' type='cancel'><feature-not-implemented "
- "xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/></error>"
+ "from='user@gmail.com/chromiumsy5C6A652D' "
+ "xmlns='jabber:client'>"
+ "<jingle xmlns='urn:xmpp:jingle:1' "
+ "action='session-initiate' sid='2227053353' "
+ "initiator='user@gmail.com/chromiumsy5C6A652D'>"
+ "<content name='chromoting' creator='initiator'>"
+ "<description xmlns='google:remoting'>"
+ "<control transport='stream' version='2'/>"
+ "<event transport='stream' version='2'/>"
+ "<video transport='stream' version='2' codec='vp8'/>"
+ "<audio transport='stream' version='2' codec='verbatim'/>"
+ "<initial-resolution width='800' height='600'/>"
+ "<authentication><auth-token>"
+ "j7whCMii0Z0AAPwj7whCM/j7whCMii0Z0AAPw="
+ "</auth-token></authentication>"
+ "</description>"
+ "<transport xmlns='http://www.google.com/transport/p2p'/>"
+ "</content>"
+ "</jingle>"
+ "<error code='501' type='cancel'>"
+ "<feature-not-implemented "
+ "xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>"
+ "</error>"
"</iq>";
scoped_ptr<XmlElement> source_message(
XmlElement::ForStr(kTestSessionInitiateErrorMessage));
« no previous file with comments | « remoting/protocol/content_description.cc ('k') | remoting/protocol/session_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698