Chromium Code Reviews| Index: remoting/protocol/jingle_messages_unittest.cc |
| diff --git a/remoting/protocol/jingle_messages_unittest.cc b/remoting/protocol/jingle_messages_unittest.cc |
| index 50fb2f6b55ec0db5f8c8816c77cd0a4dc34ab787..33523e97f018e8d0f4d538d3a4e748ef6ac20414 100644 |
| --- a/remoting/protocol/jingle_messages_unittest.cc |
| +++ b/remoting/protocol/jingle_messages_unittest.cc |
| @@ -566,5 +566,60 @@ TEST(JingleMessageTest, ErrorMessage) { |
| EXPECT_FALSE(error.empty()); |
| } |
| +TEST(JingleMessageTest, ErrorCodeShouldBeIncludedInXml) { |
| + JingleMessage message(std::string("to_jid"), |
| + JingleMessage::SESSION_TERMINATE, |
| + std::string("sid")); |
| + message.action = JingleMessage::SESSION_TERMINATE; |
| + message.reason = JingleMessage::DECLINE; |
| + message.error_code = INVALID_ACCOUNT; |
| + JingleMessage parsed; |
| + ParseFormatAndCompare(message.ToXml()->Str().c_str(), &parsed); |
|
Sergey Ulanov
2016/06/03 08:53:49
This tests formats message, parses it and then for
Hzj_jie
2016/06/03 21:46:34
This test was for debugging purpose, I should remo
|
| + EXPECT_EQ(message.action, parsed.action); |
| + EXPECT_EQ(message.reason, parsed.reason); |
| + EXPECT_EQ(message.error_code, parsed.error_code); |
| + |
| + message.error_code = UNKNOWN_ERROR; |
| + parsed.error_code = UNKNOWN_ERROR; |
| + ParseFormatAndCompare(message.ToXml()->Str().c_str(), &parsed); |
| + EXPECT_EQ(message.action, parsed.action); |
| + EXPECT_EQ(message.reason, parsed.reason); |
| + EXPECT_EQ(UNKNOWN_ERROR, parsed.error_code); |
|
Sergey Ulanov
2016/06/03 08:53:49
Add this condition in the SessionTerminate test ab
Hzj_jie
2016/06/03 21:46:33
Acknowledged.
|
| +} |
| + |
| +TEST(JingleMessageTest, InvalidAccount) { |
| + const char* kTestSessionTerminateMessage = |
| + "<cli:iq from='user@gmail.com/chromoting016DBB07' " |
| + "to='user@gmail.com/chromiumsy5C6A652D' type='set' " |
| + "xmlns:cli='jabber:client'><jingle action='session-terminate' " |
| + "sid='2227053353' xmlns='urn:xmpp:jingle:1'><reason><decline/></reason>" |
| + "<gr:error-code xmlns:gr='google:remoting'>" |
| + "<gr:INVALID_ACCOUNT/>" |
| + "</gr:error-code>" |
| + "</jingle></cli:iq>"; |
| + JingleMessage message; |
| + ParseFormatAndCompare(kTestSessionTerminateMessage, &message); |
| + EXPECT_EQ(message.action, JingleMessage::SESSION_TERMINATE); |
| + EXPECT_EQ(message.reason, JingleMessage::DECLINE); |
| + EXPECT_EQ(message.error_code, INVALID_ACCOUNT); |
| +} |
| + |
| +TEST(JingleMessageTest, AuthenticationFailed) { |
|
Sergey Ulanov
2016/06/03 08:53:49
Maybe instead of testing these two errors in two s
Hzj_jie
2016/06/03 21:46:34
Done.
|
| + const char* kTestSessionTerminateMessage = |
| + "<cli:iq from='user@gmail.com/chromoting016DBB07' " |
| + "to='user@gmail.com/chromiumsy5C6A652D' type='set' " |
| + "xmlns:cli='jabber:client'><jingle action='session-terminate' " |
| + "sid='2227053353' xmlns='urn:xmpp:jingle:1'><reason><decline/></reason>" |
| + "<gr:error-code xmlns:gr='google:remoting'>" |
| + "<gr:AUTHENTICATION_FAILED />" |
| + "</gr:error-code>" |
| + "</jingle></cli:iq>"; |
| + JingleMessage message; |
| + ParseFormatAndCompare(kTestSessionTerminateMessage, &message); |
| + EXPECT_EQ(message.action, JingleMessage::SESSION_TERMINATE); |
| + EXPECT_EQ(message.reason, JingleMessage::DECLINE); |
| + EXPECT_EQ(message.error_code, AUTHENTICATION_FAILED); |
| +} |
| + |
| } // namespace protocol |
| } // namespace remoting |