Add encoding time and and fps to webrtc.stress case.

tools/perf/metrics/webrtc_stats_unittest.py

 # Copyright 2013 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.
 
 import unittest
 
 from telemetry.testing import simple_mock
 
 from metrics import webrtc_stats
 
@@ skipping 89 matching lines @@
   @property
   def current_page(self):
     return self._current_page
 
   def AddValue(self, value):
     self._received_values.append(value)
 
 
 class WebRtcStatsUnittest(unittest.TestCase):
 
-  def _RunMetricOnJson(self, json_to_return):
-    stats_metric = webrtc_stats.WebRtcStatisticsMetric()
-
+  def _RunMetricOnJson(self, json_to_return, stats_metric):
     tab = simple_mock.MockObject()
     page = simple_mock.MockObject()
 
     stats_metric.Start(page, tab)
 
     tab.ExpectCall('EvaluateJavaScript',
                    simple_mock.DONT_CARE).WillReturn(json_to_return)
     stats_metric.Stop(page, tab)
 
     page.url = simple_mock.MockObject()
     results = FakeResults(page)
     stats_metric.AddResults(tab, results)
     return results
 
   def testExtractsValuesAsTimeSeries(self):
-    results = self._RunMetricOnJson(SAMPLE_JSON)
+    stats_metric = webrtc_stats.WebRtcStatisticsMetric()
+    results = self._RunMetricOnJson(SAMPLE_JSON, stats_metric)
 
     self.assertTrue(results.received_values,
                     'Expected values for googDecodeMs and others, got none.')
     self.assertEqual(results.received_values[1].name,
                      'peer_connection_0_audio_goog_rtt')
     self.assertEqual(results.received_values[1].values,
                      [20.0, 17.0])
     self.assertEqual(results.received_values[7].name,
                      'peer_connection_1_video_goog_rtt')
     self.assertEqual(results.received_values[7].values,
                      [100.0, 101.0])
 
   def testExtractsInterestingMetricsOnly(self):
-    results = self._RunMetricOnJson(SAMPLE_JSON)
+    stats_metric = webrtc_stats.WebRtcStatisticsMetric()
+    results = self._RunMetricOnJson(SAMPLE_JSON, stats_metric)
 
     self.assertTrue(len(results.received_values) > 0)
     self.assertIn('peer_connection_0', results.received_values[0].name,
                   'The result should be a ListOfScalarValues instance with '
                   'a name <peer connection id>_<statistic>.')
     all_names = [value.name for value in results.received_values]
     self.assertIn('peer_connection_0_audio_goog_rtt', all_names)
     self.assertNotIn('peer_connection_1_audio_goog_rtt', all_names,
                      'Peer connection 1 does not have a goog-rtt in '
                      'the JSON above, unlike peer connection 0 which does.')
     self.assertIn('peer_connection_0_video_goog_rtt', all_names)
     self.assertIn('peer_connection_1_video_goog_rtt', all_names)
     # The audio_audio is intentional since the code distinguishes audio reports
     # from video reports (even though audio_input_level is quite obvious).
     self.assertNotIn('peer_connection_0_audio_audio_input_level', all_names,
                      'Input level is in the JSON for both connections but '
                      'should not be reported since it is not interesting.')
     self.assertNotIn('peer_connection_1_audio_audio_input_level', all_names)
 
+  def testExtractsParticularMetricsOnlyIfSpecified(self):
+    only_goog_rtt_and_max_decode = ['googRtt', 'googMaxDecodeMs']
+    stats_metric = webrtc_stats.WebRtcStatisticsMetric(
+        particular_metrics=only_goog_rtt_and_max_decode)
+    results = self._RunMetricOnJson(SAMPLE_JSON, stats_metric)
+
+    received_names = [value.name for value in results.received_values]
+    expected_names = ['peer_connection_0_audio_goog_rtt',
+                      'peer_connection_0_video_goog_rtt',
+                      'peer_connection_1_video_goog_max_decode_ms',
+                      'peer_connection_1_video_goog_rtt']
+    self.assertEqual(expected_names, received_names)
+
   def testReturnsIfJsonIsEmpty(self):
-    results = self._RunMetricOnJson('[]')
+    stats_metric = webrtc_stats.WebRtcStatisticsMetric()
+    results = self._RunMetricOnJson('[]', stats_metric)
     self.assertFalse(results.received_values)