Move the routing-info inside the jingle element.

remoting/protocol/jingle_messages_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/jingle_messages.h"
 
 #include <stddef.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 385 matching lines @@
 
   JingleMessage message;
   ParseFormatAndCompare(kTestSessionInfoMessage, &message);
 
   EXPECT_EQ(message.action, JingleMessage::SESSION_INFO);
   ASSERT_TRUE(message.info.get() != nullptr);
   EXPECT_TRUE(message.info->Name() ==
               buzz::QName("urn:xmpp:jingle:1", "test-info"));
 }
 
-TEST(JingleMessageTest, Address) {
+TEST(JingleMessageTest, ParseAddress) {
   const char* kTestSessionInfoMessage =
       "<cli:iq from='remoting@talk.google.com' "
-      "from-channel='lcs' "
-      "from-endpoint-id='user@gmail.com/xBrnereror=' "
-      "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
-      "xmlns:cli='jabber:client'><jingle action='session-info' "
-      "sid='2227053353' xmlns='urn:xmpp:jingle:1'><test-info>TestMessage"
-      "</test-info></jingle></cli:iq>";
+              "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
+              "xmlns:cli='jabber:client'>"
+        "<jingle action='session-info' "
+                "sid='2227053353' xmlns='urn:xmpp:jingle:1' "
+                "from-channel='lcs' "
+                "from-endpoint-id='user@gmail.com/xBrnereror='>"
+          "<test-info>TestMessage</test-info>"
+        "</jingle>"
+      "</cli:iq>";
 
   JingleMessage message;
   ParseFormatAndCompare(kTestSessionInfoMessage, &message);
   EXPECT_EQ(message.from.jid, "remoting@talk.google.com");
   EXPECT_EQ(message.from.channel, SignalingAddress::Channel::LCS);
   EXPECT_EQ(message.from.endpoint_id, "user@gmail.com/xBrnereror=");
   EXPECT_EQ(message.from.id(), "user@gmail.com/xBrnereror=");
 
   EXPECT_EQ(message.to.jid, "user@gmail.com/chromiumsy5C6A652D");
   EXPECT_EQ(message.to.channel, SignalingAddress::Channel::XMPP);
   EXPECT_EQ(message.to.endpoint_id, "");
   EXPECT_EQ(message.to.id(), "user@gmail.com/chromiumsy5C6A652D");
 
   EXPECT_EQ(message.action, JingleMessage::SESSION_INFO);
 }
 
 TEST(JingleMessageReplyTest, ToXml) {
   const char* kTestIncomingMessage1 =
       "<cli:iq from='user@gmail.com/chromoting016DBB07' id='4' "
       "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
       "xmlns:cli='jabber:client'><jingle action='session-terminate' "
       "sid='2227053353' xmlns='urn:xmpp:jingle:1'><reason><success/>"
       "</reason></jingle></cli:iq>";
   const char* kTestIncomingMessage2 =
       "<cli:iq from='remoting@talk.google.com' id='4' "
-      "from-channel='lcs' from-endpoint-id='from@gmail.com/AbCdEf1234=' "
       "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
       "xmlns:cli='jabber:client'><jingle action='session-terminate' "
+      "from-channel='lcs' from-endpoint-id='from@gmail.com/AbCdEf1234=' "
       "sid='2227053353' xmlns='urn:xmpp:jingle:1'><reason><success/>"
       "</reason></jingle></cli:iq>";
 
   struct TestCase {
     const JingleMessageReply::ErrorType error;
     std::string error_text;
     std::string expected_text;
     std::string incoming_message;
   } tests[] = {
       {JingleMessageReply::BAD_REQUEST, "",
@@ skipping 33 matching lines @@
        kTestIncomingMessage1},
       {JingleMessageReply::UNEXPECTED_REQUEST, "",
        "<iq xmlns='jabber:client' "
        "to='user@gmail.com/chromoting016DBB07' id='4' type='error'><jingle "
        "action='session-terminate' sid='2227053353' xmlns='urn:xmpp:jingle:1'>"
        "<reason><success/></reason></jingle><error type='modify'>"
        "<unexpected-request/></error></iq>",
        kTestIncomingMessage1},
       {JingleMessageReply::INVALID_SID, "ErrorText",
        "<iq xmlns='jabber:client' "
-       "to='remoting@talk.google.com' to-channel='lcs' "
-       "to-endpoint-id='from@gmail.com/AbCdEf1234=' id='4' "
+       "to='remoting@talk.google.com' id='4' "
        "type='error'><jingle "
-       "action='session-terminate' sid='2227053353' xmlns='urn:xmpp:jingle:1'>"
+       "action='session-terminate' sid='2227053353' xmlns='urn:xmpp:jingle:1' "
+       "from-channel='lcs' from-endpoint-id='from@gmail.com/AbCdEf1234='>"
        "<reason><success/></reason></jingle><error type='modify'>"
        "<item-not-found/><text xml:lang='en'>ErrorText</text></error></iq>",
        kTestIncomingMessage2},
       {JingleMessageReply::NONE, "",
-       "<iq xmlns='jabber:client' "
-       "to='remoting@talk.google.com' to-channel='lcs' "
-       "to-endpoint-id='from@gmail.com/AbCdEf1234=' id='4' type='result'></iq>",
+       "<iq xmlns='jabber:client' to='remoting@talk.google.com' id='4' "
+       "type='result'><jingle xmlns='urn:xmpp:jingle:1' to-channel='lcs' "
+       "to-endpoint-id='from@gmail.com/AbCdEf1234='></jingle></iq>",

[Sergey Ulanov, 2016/06/04 17:10:31]

Nit: replace "></jingle>" with "/>"

[kelvinp, 2016/06/06 20:43:41]

Done.

        kTestIncomingMessage2},
   };
 
   for (size_t i = 0; i < arraysize(tests); ++i) {
     std::unique_ptr<XmlElement> incoming_message(
         XmlElement::ForStr(tests[i].incoming_message));
     ASSERT_TRUE(incoming_message.get());
 
+    LOG(INFO) << "Running test case: " << i;

[Sergey Ulanov, 2016/06/04 17:10:31]

To avoid spamming the console, replace this with SCOPED_TRACE(i);

[kelvinp, 2016/06/06 20:43:41]

Done.

     JingleMessageReply reply_msg;
     if (tests[i].error_text.empty()) {
       reply_msg = JingleMessageReply(tests[i].error);
     } else {
       reply_msg = JingleMessageReply(tests[i].error, tests[i].error_text);
     }
     std::unique_ptr<XmlElement> reply(reply_msg.ToXml(incoming_message.get()));
 
     std::unique_ptr<XmlElement> expected(
         XmlElement::ForStr(tests[i].expected_text));
@@ skipping 36 matching lines @@
   EXPECT_FALSE(JingleMessage::IsJingleMessage(source_message.get()));
 
   JingleMessage message;
   std::string error;
   EXPECT_FALSE(message.ParseXml(source_message.get(), &error));
   EXPECT_FALSE(error.empty());
 }
 
 }  // namespace protocol
 }  // namespace remoting