Converting various classes to namedtuples

appengine/findit/crash/test/results_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 crash.results import AnalysisInfo
 from crash.results import MatchResult
 from crash.results import MatchResults
 from crash.results import Result
+from crash.results import StackInfo
 from crash.stacktrace import StackFrame
 from crash.test.crash_test_suite import CrashTestSuite
 from lib.gitiles.blame import Blame
 from lib.gitiles.blame import Region
 from lib.gitiles.change_log import ChangeLog
 
 DUMMY_CHANGELOG1 = ChangeLog.FromDict({
     'author_name': 'r@chromium.org',
     'message': 'dummy',
     'committer_email': 'r@chromium.org',
@@ skipping 84 matching lines @@
     self.assertEqual(result.ToDict(), expected_result_json)
 
   def testResultToString(self):
 
     result = Result(DUMMY_CHANGELOG1, 'src/', confidence=1)
 
     expected_result_str = ''
     self.assertEqual(result.ToString(), expected_result_str)
 
     result.file_to_stack_infos = {
-        'a.cc': [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', []), 0)]
+        'a.cc': [StackInfo(
+            frame = StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', []),
+            priority = 0)]
     }
     expected_result_str = 'Changed file a.cc crashed in frame #0'
 
     self.assertEqual(str(result), expected_result_str)
 
   def testMatchResultUpdate(self):
     # Touched lines have intersection with crashed lines.
     result = MatchResult(DUMMY_CHANGELOG1, 'src/', confidence=1)
-    stack_infos = [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [7]), 0)]
+    stack_infos = [StackInfo(
+        frame = StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [7]),
+        priority = 0)]
 
     result.Update('a.cc', stack_infos, DUMMY_BLAME)
     self.assertEqual(result.file_to_analysis_info['a.cc'].min_distance, 0)
 
     # Touched lines are before crashed lines.
     result = MatchResult(DUMMY_CHANGELOG1, 'src/', confidence=1)
 
-    stack_infos = [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [3]), 0)]
+    stack_infos = [StackInfo(
+        frame = StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [3]),
+        priority = 0)]
 
     result.Update('a.cc', stack_infos, DUMMY_BLAME)
     self.assertEqual(result.file_to_analysis_info['a.cc'].min_distance, 3)
 
     # Touched lines are after crashed lines.
     result = MatchResult(DUMMY_CHANGELOG1, 'src/', confidence=1)
 
-    stack_infos = [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [10]), 0)]
+    stack_infos = [StackInfo(
+        frame = StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [10]),
+        priority = 0)]
 
     result.Update('a.cc', stack_infos, DUMMY_BLAME)
     self.assertEqual(result.file_to_analysis_info['a.cc'].min_distance, 2)
 
   def testMatchResultUpdateWithEmptyBlame(self):
     result = MatchResult(DUMMY_CHANGELOG1, 'src/', confidence=1)
-    stack_infos = [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [7]), 0)]
+    stack_infos = [StackInfo(
+        frame = StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [7]),
+        priority = 0)]
 
     result.Update('a.cc', stack_infos, None)
     self.assertEqual(result.file_to_stack_infos['a.cc'], stack_infos)
     self.assertEqual(result.file_to_analysis_info, {})
 
   def testMatchResultUpdateMinimumDistance(self):
     result = MatchResult(DUMMY_CHANGELOG1, 'src/', confidence=1)
     frame1 = StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [7])
     frame2 = StackFrame(2, 'src/', 'func', 'a.cc', 'src/a.cc', [20])
-    stack_infos = [(frame1, 0), (frame2, 0)]
+    stack_infos = [StackInfo(frame1, 0), StackInfo(frame2, 0)]
 
     result.Update('a.cc', stack_infos, DUMMY_BLAME)
     self.assertEqual(result.file_to_stack_infos['a.cc'], stack_infos)
     self.assertEqual(result.file_to_analysis_info,
         {'a.cc': AnalysisInfo(min_distance = 0, min_distance_frame = frame1)})
 
   def testMatchResultsGenerateMatchResults(self):
     match_results = MatchResults(ignore_cls=set(['2']))
     frame1 = StackFrame(0, 'src/',  'func', 'a.cc', 'src/a.cc', [7])
     frame2 = StackFrame(1, 'src/',  'func', 'b.cc', 'src/b.cc', [11])
-    stack_infos1 = [(frame1, 0)]
-    stack_infos2 = [(frame2, 0)]
+    stack_infos1 = [StackInfo(frame1, 0)]
+    stack_infos2 = [StackInfo(frame2, 0)]
     match_results.GenerateMatchResults('a.cc', 'src/', stack_infos1,
                                        [DUMMY_CHANGELOG1, DUMMY_CHANGELOG2],
                                        DUMMY_BLAME)
 
     match_results.GenerateMatchResults('b.cc', 'src/', stack_infos2,
                                        [DUMMY_CHANGELOG1, DUMMY_CHANGELOG2],
                                        DUMMY_BLAME2)
 
     expected_match_result = MatchResult(DUMMY_CHANGELOG1, 'src/')
     expected_match_result.file_to_stack_infos = {
         'a.cc': stack_infos1,
         'b.cc': stack_infos2,
     }
     expected_match_result.file_to_analysis_info = {
         'a.cc': AnalysisInfo(min_distance = 0, min_distance_frame = frame1),
         'b.cc': AnalysisInfo(min_distance = 3, min_distance_frame = frame2),
     }
 
     expected_match_results = MatchResults(ignore_cls=set(['2']))
     expected_match_results['1'] = expected_match_result
 
     self._VerifyTwoMatchResultsEqual(match_results, expected_match_results)