Reorganizing detect_regression_range.py

appengine/findit/crash/test/detect_regression_range_test.py

 # Copyright 2016 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.
 
 from testing_utils import testing
 
-from crash.detect_regression_range import GetAttributesListFromHistoricData
-from crash.detect_regression_range import GetSpikeIndexes
-from crash.detect_regression_range import GetRegressionRangeFromSpike
+from crash.detect_regression_range import GetSpikes
 from crash.detect_regression_range import DetectRegressionRange
 
 
 class DetectRegressionRangeTest(testing.AppengineTestCase):
 
   def _VerifyCasesForDetectRegressonRange(self, cases):
     for case, expected_result in cases:
       result = DetectRegressionRange(case)
 
       self.assertEqual(result, expected_result, 'Detected spikes of %s should '
                        'be %s, instead of %s' % (repr(case),
                                                  expected_result,
                                                  result))
 
 
-  def testGetSpikeIndexes(self):
-    self.assertEqual(GetSpikeIndexes([]),
+  # TODO(wrengr): make this test more comprehensive.
+  def testGetSpikes(self):
+    get_value = lambda x: x[1]
+    e0 = ('1', 0.5)
+    e1 = ('1', 0)
+    e2 = ('2', 0.5)
+    self.assertEqual(GetSpikes([], get_value),
                      [])
-    self.assertEqual(GetSpikeIndexes([('1', 0.5)]),
+    self.assertEqual(GetSpikes([e0], get_value),
                      [])
-    self.assertEqual(GetSpikeIndexes([('1', 0), ('2', 0.5)]),
-                     [1])
+    self.assertEqual(GetSpikes([e1, e2], get_value),
+                     [(e1, e2)])
 
-  def testGetRegressionRangeFromSpike(self):
-    self.assertEqual(GetRegressionRangeFromSpike(0, ['1', '2']),
-                     None)
-    self.assertEqual(GetRegressionRangeFromSpike(3, ['1', '2']),
-                     None)
-    self.assertEqual(GetRegressionRangeFromSpike(1, ['1', '2']),
-                     ('1', '2'))
 
   def testReturnNoneForEmptyCrashData(self):
     self.assertEqual(DetectRegressionRange([]), None)
 
   def testReturnNoneWhenSpikeDetectionFailed(self):
     historic_metadata = [{'chrome_version': '1', 'cpm': 0},
                          {'chrome_version': '2', 'cpm': 0}]
     self.assertEqual(DetectRegressionRange(historic_metadata), None)
 
   def testDetectRegressionRangeForNewCrash(self):
@@ skipping 23 matching lines @@
           ('4', '5')),
         ([{'chrome_version': '1', 'cpm': 0.06},
           {'chrome_version': '2', 'cpm': 0.0003},
           {'chrome_version': '3', 'cpm': 0.0007},
           {'chrome_version': '4', 'cpm': 0.6},
           {'chrome_version': '5', 'cpm': 0.002}],
          ('3', '4'))]
 
     self._VerifyCasesForDetectRegressonRange(cases)
 
-  def testGetAttributesListFromHistoricData(self):
-    historic_metadata = [{'chrome_version': '1', 'cpm': 0},
-                         {'chrome_version': '2', 'cpm': 0}]
-
-    attribute_list = GetAttributesListFromHistoricData(historic_metadata,
-                                                       ['chrome_version'])
-    expected_list = ['1', '2']
-    self.assertEqual(attribute_list, expected_list)
-
-    attribute_list = GetAttributesListFromHistoricData(historic_metadata, [])
-    self.assertEqual(attribute_list, [])