commit 97077a3ab27259164eb121034b6e0ebe9ba592df
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Oct 25 21:18:33 2013
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Oct 25 21:18:33 2013
tree 4da54fedcfe61464540e55d17787ca5813a3bd09
parent 728bc0fa4c179f63b36fa997bf9e1429d698e052

Update libjingle to 55618622.
Update libyuv to r826.

TEST=try bots
R=niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2889004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5038 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/media/sctp/sctputils_unittest.cc

diff --git a/talk/media/sctp/sctputils_unittest.cc b/talk/media/sctp/sctputils_unittest.cc
index 1cc9a70..70f67b8 100644
--- a/talk/media/sctp/sctputils_unittest.cc
+++ b/talk/media/sctp/sctputils_unittest.cc
@@ -37,7 +37,7 @@
                                const webrtc::DataChannelInit& config) {
     uint8 message_type;
     uint8 channel_type;
-    uint16 reliability;
+    uint32 reliability;
     uint16 priority;
     uint16 label_length;
     uint16 protocol_length;
@@ -57,15 +57,15 @@
                 channel_type);
     }
 
-    ASSERT_TRUE(buffer.ReadUInt16(&reliability));
+    ASSERT_TRUE(buffer.ReadUInt16(&priority));
+
+    ASSERT_TRUE(buffer.ReadUInt32(&reliability));
     if (config.maxRetransmits > -1 || config.maxRetransmitTime > -1) {
       EXPECT_EQ(config.maxRetransmits > -1 ?
                     config.maxRetransmits : config.maxRetransmitTime,
-                reliability);
+                static_cast<int>(reliability));
     }
 
-    ASSERT_TRUE(buffer.ReadUInt16(&priority));
-
     ASSERT_TRUE(buffer.ReadUInt16(&label_length));
     ASSERT_TRUE(buffer.ReadUInt16(&protocol_length));
     EXPECT_EQ(label.size(), label_length);
@@ -86,13 +86,14 @@
   config.protocol = "y";
 
   talk_base::Buffer packet;
-  ASSERT(cricket::WriteDataChannelOpenMessage(input_label, config, &packet));
+  ASSERT_TRUE(
+      cricket::WriteDataChannelOpenMessage(input_label, config, &packet));
 
   VerifyOpenMessageFormat(packet, input_label, config);
 
   std::string output_label;
   webrtc::DataChannelInit output_config;
-  ASSERT(cricket::ParseDataChannelOpenMessage(
+  ASSERT_TRUE(cricket::ParseDataChannelOpenMessage(
       packet, &output_label, &output_config));
 
   EXPECT_EQ(input_label, output_label);
@@ -110,19 +111,21 @@
   config.protocol = "y";
 
   talk_base::Buffer packet;
-  ASSERT(cricket::WriteDataChannelOpenMessage(input_label, config, &packet));
+  ASSERT_TRUE(
+      cricket::WriteDataChannelOpenMessage(input_label, config, &packet));
 
   VerifyOpenMessageFormat(packet, input_label, config);
 
   std::string output_label;
   webrtc::DataChannelInit output_config;
-  ASSERT(cricket::ParseDataChannelOpenMessage(
+  ASSERT_TRUE(cricket::ParseDataChannelOpenMessage(
       packet, &output_label, &output_config));
 
   EXPECT_EQ(input_label, output_label);
   EXPECT_EQ(config.protocol, output_config.protocol);
   EXPECT_EQ(config.ordered, output_config.ordered);
   EXPECT_EQ(config.maxRetransmitTime, output_config.maxRetransmitTime);
+  EXPECT_EQ(-1, output_config.maxRetransmits);
 }
 
 TEST_F(SctpUtilsTest, WriteParseOpenMessageWithMaxRetransmits) {
@@ -132,17 +135,19 @@
   config.protocol = "y";
 
   talk_base::Buffer packet;
-  ASSERT(cricket::WriteDataChannelOpenMessage(input_label, config, &packet));
+  ASSERT_TRUE(
+      cricket::WriteDataChannelOpenMessage(input_label, config, &packet));
 
   VerifyOpenMessageFormat(packet, input_label, config);
 
   std::string output_label;
   webrtc::DataChannelInit output_config;
-  ASSERT(cricket::ParseDataChannelOpenMessage(
+  ASSERT_TRUE(cricket::ParseDataChannelOpenMessage(
       packet, &output_label, &output_config));
 
   EXPECT_EQ(input_label, output_label);
   EXPECT_EQ(config.protocol, output_config.protocol);
   EXPECT_EQ(config.ordered, output_config.ordered);
   EXPECT_EQ(config.maxRetransmits, output_config.maxRetransmits);
+  EXPECT_EQ(-1, output_config.maxRetransmitTime);
 }