Testing if it is safe now to enable screensharing tests for android

webrtc/video/full_stack.cc

Index: webrtc/video/full_stack.cc
diff --git a/webrtc/video/full_stack.cc b/webrtc/video/full_stack.cc
index a11b799a438294a9490872caea4e5957067edbdf..8c7c580845c171d18d505e52b044540485946ebe 100644
--- a/webrtc/video/full_stack.cc
+++ b/webrtc/video/full_stack.cc
@@ -23,129 +23,52 @@ class FullStackTest : public VideoQualityTest {
   }
 };
 
+// Testing if it is safe to enable the tests for android now.
+// https://code.google.com/p/chromium/issues/detail?id=513170
 
-TEST_F(FullStackTest, ParisQcifWithoutPacketLoss) {
-  VideoQualityTest::Params paris_qcif = {
-      {176, 144, 30, 300000, 300000, 300000, "VP8", 1},
-      {"paris_qcif"},
-      {},
-      {"net_delay_0_0_plr_0", 36.0, 0.96, kFullStackTestDurationSecs}};
-  RunTest(paris_qcif);
-}
-
-TEST_F(FullStackTest, ForemanCifWithoutPacketLoss) {
-  // TODO(pbos): Decide on psnr/ssim thresholds for foreman_cif.
-  VideoQualityTest::Params foreman_cif = {
-      {352, 288, 30, 700000, 700000, 700000, "VP8", 1},
-      {"foreman_cif"},
-      {},
-      {"foreman_cif_net_delay_0_0_plr_0", 0.0, 0.0, kFullStackTestDurationSecs}
-  };
-  RunTest(foreman_cif);
-}
-
-TEST_F(FullStackTest, ForemanCifPlr5) {
-  VideoQualityTest::Params foreman_cif = {
-      {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
-      {"foreman_cif"},
-      {},
-      {"foreman_cif_delay_50_0_plr_5", 0.0, 0.0, kFullStackTestDurationSecs}};
-  foreman_cif.pipe.loss_percent = 5;
-  foreman_cif.pipe.queue_delay_ms = 50;
-  RunTest(foreman_cif);
-}
-
-TEST_F(FullStackTest, ForemanCif500kbps) {
-  VideoQualityTest::Params foreman_cif = {
-      {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
-      {"foreman_cif"},
-      {},
-      {"foreman_cif_500kbps", 0.0, 0.0, kFullStackTestDurationSecs}};
-  foreman_cif.pipe.queue_length_packets = 0;
-  foreman_cif.pipe.queue_delay_ms = 0;
-  foreman_cif.pipe.link_capacity_kbps = 500;
-  RunTest(foreman_cif);
-}
-
-TEST_F(FullStackTest, ForemanCif500kbpsLimitedQueue) {
-  VideoQualityTest::Params foreman_cif = {
-      {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
-      {"foreman_cif"},
-      {},
-      {"foreman_cif_500kbps_32pkts_queue", 0.0, 0.0, kFullStackTestDurationSecs}
-  };
-  foreman_cif.pipe.queue_length_packets = 32;
-  foreman_cif.pipe.queue_delay_ms = 0;
-  foreman_cif.pipe.link_capacity_kbps = 500;
-  RunTest(foreman_cif);
+#define FIRST_TEST { \
+  VideoQualityTest::Params screenshare = { \
+      {1850, 1110, 5, 50000, 200000, 2000000, "VP8", 2, 400000}, \
+      {}, \
+      {true, 10}, \
+      {"screenshare_slides", 0.0, 0.0, kFullStackTestDurationSecs}}; \
+  RunTest(screenshare); \
 }
 
-TEST_F(FullStackTest, ForemanCif500kbps100ms) {
-  VideoQualityTest::Params foreman_cif = {
-      {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
-      {"foreman_cif"},
-      {},
-      {"foreman_cif_500kbps_100ms", 0.0, 0.0, kFullStackTestDurationSecs}};
-  foreman_cif.pipe.queue_length_packets = 0;
-  foreman_cif.pipe.queue_delay_ms = 100;
-  foreman_cif.pipe.link_capacity_kbps = 500;
-  RunTest(foreman_cif);
+#define SECOND_TEST { \
+  VideoQualityTest::Params config = { \
+      {1850, 1110 / 2, 5, 50000, 200000, 2000000, "VP8", 2, 400000}, \
+      {}, \
+      {true, 10, 2}, \
+      {"screenshare_slides_scrolling", 0.0, 0.0, kFullStackTestDurationSecs}}; \
+  RunTest(config); \
 }
 
-TEST_F(FullStackTest, ForemanCif500kbps100msLimitedQueue) {
-  VideoQualityTest::Params foreman_cif = {
-      {352, 288, 30, 30000, 500000, 2000000, "VP8", 1},
-      {"foreman_cif"},
-      {},
-      {"foreman_cif_500kbps_100ms_32pkts_queue", 0.0, 0.0,
-        kFullStackTestDurationSecs}};
-  foreman_cif.pipe.queue_length_packets = 32;
-  foreman_cif.pipe.queue_delay_ms = 100;
-  foreman_cif.pipe.link_capacity_kbps = 500;
-  RunTest(foreman_cif);
+#define THIRD_TEST {\
+  VideoQualityTest::Params screenshare = { \
+      {1850, 1110, 5, 50000, 200000, 2000000, "VP9", 2, 400000}, \
+      {}, \
+      {true, 10}, \
+      {"screenshare_slides_vp9_2tl", 0.0, 0.0, kFullStackTestDurationSecs}}; \
+  RunTest(screenshare); \
 }
 
-TEST_F(FullStackTest, ForemanCif1000kbps100msLimitedQueue) {
-  VideoQualityTest::Params foreman_cif = {
-      {352, 288, 30, 30000, 2000000, 2000000, "VP8", 1},
-      {"foreman_cif"},
-      {},
-      {"foreman_cif_1000kbps_100ms_32pkts_queue", 0.0, 0.0,
-        kFullStackTestDurationSecs}};
-  foreman_cif.pipe.queue_length_packets = 32;
-  foreman_cif.pipe.queue_delay_ms = 100;
-  foreman_cif.pipe.link_capacity_kbps = 1000;
-  RunTest(foreman_cif);
-}
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_0) FIRST_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_1) FIRST_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_2) FIRST_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_3) FIRST_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_4) FIRST_TEST;
 
-// Temporarily disabled on Android due to low test timeouts.
-// https://code.google.com/p/chromium/issues/detail?id=513170
-#include "webrtc/test/testsupport/gtest_disable.h"
-TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP8_2TL)) {
-  VideoQualityTest::Params screenshare = {
-      {1850, 1110, 5, 50000, 200000, 2000000, "VP8", 2, 400000},
-      {},          // Video-specific.
-      {true, 10},  // Screenshare-specific.
-      {"screenshare_slides", 0.0, 0.0, kFullStackTestDurationSecs}};
-  RunTest(screenshare);
-}
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll_0) SECOND_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll_1) SECOND_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll_2) SECOND_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll_3) SECOND_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP8_2TL_Scroll_4) SECOND_TEST;
 
-TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP8_2TL_Scroll)) {
-  VideoQualityTest::Params config = {
-      {1850, 1110 / 2, 5, 50000, 200000, 2000000, "VP8", 2, 400000},
-      {},
-      {true, 10, 2},
-      {"screenshare_slides_scrolling", 0.0, 0.0, kFullStackTestDurationSecs}};
-  RunTest(config);
-}
+TEST_F(FullStackTest, ScreenshareSlidesVP9_2TL_0) THIRD_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP9_2TL_1) THIRD_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP9_2TL_2) THIRD_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP9_2TL_3) THIRD_TEST;
+TEST_F(FullStackTest, ScreenshareSlidesVP9_2TL_4) THIRD_TEST;
 
-// Disabled on Android along with VP8 screenshare above.
-TEST_F(FullStackTest, DISABLED_ON_ANDROID(ScreenshareSlidesVP9_2TL)) {
-  VideoQualityTest::Params screenshare = {
-      {1850, 1110, 5, 50000, 200000, 2000000, "VP9", 2, 400000},
-      {},
-      {true, 10},
-      {"screenshare_slides_vp9_2tl", 0.0, 0.0, kFullStackTestDurationSecs}};
-  RunTest(screenshare);
-}
 }  // namespace webrtc