More Simulation Framework features

webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc

Index: webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
index 967c2b2b5e47c3cda41a935e3a2b13ba44f07af7..4afcccedd477b5ddc5dc0769123b97b457e7e00f 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
@@ -313,7 +313,7 @@ TEST_F(NadaSenderSideTest, VeryHighBandwith) {
 }
 
 TEST_F(NadaReceiverSideTest, ReceivingRateNoPackets) {
-  EXPECT_EQ(nada_receiver_.RecentReceivingRate(), static_cast<size_t>(0));
+  EXPECT_EQ(nada_receiver_.RecentKbps(), static_cast<size_t>(0));
 }
 
 TEST_F(NadaReceiverSideTest, ReceivingRateSinglePacket) {
@@ -329,25 +329,7 @@ TEST_F(NadaReceiverSideTest, ReceivingRateSinglePacket) {
 
   const size_t kReceivingRateKbps = 8 * kPayloadSizeBytes / kTimeWindowMs;
 
-  EXPECT_EQ(nada_receiver_.RecentReceivingRate(), kReceivingRateKbps);
-}
-
-TEST_F(NadaReceiverSideTest, ReceivingRateLargePackets) {
-  const size_t kPayloadSizeBytes = 3000 * 1000;
-  const int64_t kTimeGapMs = 3000;  // Between each packet.
-  const int64_t kOneWayDelayMs = 1000;
-
-  for (int i = 1; i < 5; ++i) {
-    int64_t send_time_us = i * kTimeGapMs * 1000;
-    int64_t arrival_time_ms = send_time_us / 1000 + kOneWayDelayMs;
-    uint16_t sequence_number = i;
-    const MediaPacket media_packet(kFlowId, send_time_us, kPayloadSizeBytes,
-                                   sequence_number);
-    nada_receiver_.ReceivePacket(arrival_time_ms, media_packet);
-  }
-
-  const size_t kReceivingRateKbps = 8 * kPayloadSizeBytes / kTimeGapMs;
-  EXPECT_EQ(nada_receiver_.RecentReceivingRate(), kReceivingRateKbps);
+  EXPECT_EQ(nada_receiver_.RecentKbps(), kReceivingRateKbps);
 }
 
 TEST_F(NadaReceiverSideTest, ReceivingRateSmallPackets) {
@@ -365,63 +347,20 @@ TEST_F(NadaReceiverSideTest, ReceivingRateSmallPackets) {
   }
 
   const size_t kReceivingRateKbps = 8 * kPayloadSizeBytes / kTimeGapMs;
-  EXPECT_EQ(nada_receiver_.RecentReceivingRate(), kReceivingRateKbps);
+  EXPECT_EQ(nada_receiver_.RecentKbps(), kReceivingRateKbps);
 }
 
-TEST_F(NadaReceiverSideTest, ReceivingRateIntermittentPackets) {
-  const size_t kPayloadSizeBytes = 100 * 1000;
-  const int64_t kTimeGapMs = 50;  // Between each packet.
-  const int64_t kFirstSendTimeMs = 0;
-  const int64_t kOneWayDelayMs = 50;
+// RecentKbps and RecentReceivingRate are calculated differently.
 
-  // Gap between first and other packets
-  const MediaPacket media_packet(kFlowId, kFirstSendTimeMs, kPayloadSizeBytes,
-                                 1);
-  nada_receiver_.ReceivePacket(kFirstSendTimeMs + kOneWayDelayMs, media_packet);
-
-  const int64_t kDelayAfterFirstPacketMs = 1000;
-  const int kNumPackets = 5;  // Small enough so that all packets are covered.
-  EXPECT_LT((kNumPackets - 2) * kTimeGapMs,
-            NadaBweReceiver::kReceivingRateTimeWindowMs);
-  const int64_t kTimeWindowMs =
-      kDelayAfterFirstPacketMs + (kNumPackets - 2) * kTimeGapMs;
-
-  for (int i = 2; i <= kNumPackets; ++i) {
-    int64_t send_time_us =
-        ((i - 2) * kTimeGapMs + kFirstSendTimeMs + kDelayAfterFirstPacketMs) *
-        1000;
-    int64_t arrival_time_ms = send_time_us / 1000 + kOneWayDelayMs;
-    uint16_t sequence_number = i;
-    const MediaPacket media_packet(kFlowId, send_time_us, kPayloadSizeBytes,
-                                   sequence_number);
-    nada_receiver_.ReceivePacket(arrival_time_ms, media_packet);
-  }
-
-  const size_t kTotalReceivedKb = 8 * kNumPackets * kPayloadSizeBytes;
-  const int64_t kCorrectedTimeWindowMs =
-      (kTimeWindowMs * kNumPackets) / (kNumPackets - 1);
-  EXPECT_EQ(nada_receiver_.RecentReceivingRate(),
-            kTotalReceivedKb / kCorrectedTimeWindowMs);
-}
-
-TEST_F(NadaReceiverSideTest, ReceivingRateDuplicatedPackets) {
-  const size_t kPayloadSizeBytes = 500 * 1000;
-  const int64_t kSendTimeUs = 300 * 1000;
-  const int64_t kArrivalTimeMs = kSendTimeUs / 1000 + 100;
-  const uint16_t kSequenceNumber = 1;
-  const int64_t kTimeWindowMs = NadaBweReceiver::kReceivingRateTimeWindowMs;
+// In this scenario, RecentKbps will be zero during most of the time
+// and reach high peaks once a packet arrives.
+// TEST_F(NadaReceiverSideTest, ReceivingRateLargePackets) {}
 
-  // Insert the same packet twice.
-  for (int i = 0; i < 2; ++i) {
-    const MediaPacket media_packet(kFlowId, kSendTimeUs + 50 * i,
-                                   kPayloadSizeBytes, kSequenceNumber);
-    nada_receiver_.ReceivePacket(kArrivalTimeMs + 50 * i, media_packet);
-  }
-  // Should be counted only once.
-  const size_t kReceivingRateKbps = 8 * kPayloadSizeBytes / kTimeWindowMs;
+// The first isolated packet would not be considered here by RateCounter.
+// TEST_F(NadaReceiverSideTest, ReceivingRateIntermittentPackets) {}
 
-  EXPECT_EQ(nada_receiver_.RecentReceivingRate(), kReceivingRateKbps);
-}
+// DuplicatedPackets will be counted twice by RateCounter.
+// TEST_F(NadaReceiverSideTest, ReceivingRateDuplicatedPackets) {}

[stefan-webrtc, 2015/07/06 08:24:51]

Please remove these as discussed.

[magalhaesc, 2015/07/06 09:28:06]

Done.

 
 TEST_F(NadaReceiverSideTest, PacketLossNoPackets) {
   EXPECT_EQ(nada_receiver_.RecentPacketLossRatio(), 0.0f);