[Findit] Pass changed files info to Fracas, 2 face design.

appengine/findit/crash/test/findit_for_crash_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 collections import defaultdict
 
 from common.blame import Region, Blame
 from common.change_log import ChangeLog
 from common.dependency import Dependency, DependencyRoll
 from common.git_repository import GitRepository
@@ skipping 219 matching lines @@
         'src/': Dependency('src/', 'https://url_src', 'rev1', 'DEPS'),
     }
 
     expected_match_results = [{
         'url': 'https://repo.test/+/1',
         'review_url': 'https://codereview.chromium.org/3281',
         'revision': '1',
         'project_path': 'src/',
         'author': 'r@chromium.org',
         'time': 'Thu Mar 31 21:24:43 2016',
-        'reason': None,
+        'reasons': None,
         'confidence': None,
+        'changed_files': None
     }]
 
     match_results = findit_for_crash.FindMatchResults(
             dep_file_to_changelogs, dep_file_to_stack_infos, stack_deps)
     self.assertEqual([result.ToDict() for result in match_results],
                      expected_match_results)
 
   def testFindItForCrashNoRegressionRange(self):
     self.assertEqual(
         findit_for_crash.FindItForCrash(Stacktrace(), {}, {}),
         [])
 
   def testFindItForCrashNoMatchFound(self):
 
     def _MockFindMatchResults(*_):
       return []
 
     self.mock(findit_for_crash, 'FindMatchResults', _MockFindMatchResults)
 
     regression_deps_rolls = {'src/': DependencyRoll('src/', 'https://repo',
                                                     '1', '2')}
     self.assertEqual(findit_for_crash.FindItForCrash(
         Stacktrace(), regression_deps_rolls, {}), [])
 
   def testFindItForCrash(self):
 
     def _MockFindMatchResults(*_):
       match_result1 = MatchResult(DUMMY_CHANGELOG1, 'src/', '')
+      frame1 = StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [1])
+      frame2 = StackFrame(1, 'src/', 'func', 'a.cc', 'src/a.cc', [7])
       match_result1.file_to_stack_infos = {
-          'a.cc': [
-              (StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [1]), 0),
-              (StackFrame(1, 'src/', 'func', 'a.cc', 'src/a.cc', [7]), 0),
-          ]
+          'a.cc': [(frame1, 0), (frame2, 0)]
       }
-      match_result1.min_distance = 0
+      match_result1.file_to_analysis_info = {
+          'a.cc': {'min_distance': 0, 'min_distance_frame': frame1}
+      }
 
       match_result2 = MatchResult(DUMMY_CHANGELOG3, 'src/', '')
+      frame3 = StackFrame(5, 'src/', 'func', 'f.cc', 'src/f.cc', [1])
       match_result2.file_to_stack_infos = {
-          'f.cc': [
-              (StackFrame(5, 'src/', 'func', 'f.cc', 'src/f.cc', [1]), 0),
-          ]
+          'f.cc': [(frame3, 0)]
       }
-      match_result2.min_distance = 20
+      match_result2.file_to_analysis_info = {
+          'a.cc': {'min_distance': 20, 'min_distance_frame': frame3}
+      }
 
       return [match_result1, match_result2]
 
     self.mock(findit_for_crash, 'FindMatchResults', _MockFindMatchResults)
 
     expected_match_results = [
         {
-            'reason': ('(1) Modified top crashing frame is #0\n'
-                       '(2) Modification distance (LOC) is 0\n\n'
-                       'Changed file a.cc crashed in frame #0, frame #1'),
-             'time': 'Thu Mar 31 21:24:43 2016',
-             'author': 'r@chromium.org',
-             'url': 'https://repo.test/+/1',
-             'project_path': 'src/',
-             'review_url': 'https://codereview.chromium.org/3281',
-             'confidence': 1.0, 'revision': '1'
-         },
+            'reasons': [('TopFrameIndex', 1.0, 'Top frame is #0'),
+                        ('MinDistance', 1, 'Minimum distance is 0')],
+            'changed_files': [{'info': 'Minimum distance (LOC) 0, frame #0',
+                               'blame_url': None, 'file': 'a.cc'}],
+            'time': 'Thu Mar 31 21:24:43 2016',
+            'author': 'r@chromium.org',
+            'url': 'https://repo.test/+/1',
+            'project_path': 'src/',
+            'review_url': 'https://codereview.chromium.org/3281',
+            'confidence': 1.0, 'revision': '1'
+        },
     ]
 
     regression_deps_rolls = {'src/': DependencyRoll('src/', 'https://repo',
                                                     '1', '2')}
 
     results = findit_for_crash.FindItForCrash(Stacktrace(),
                                               regression_deps_rolls, {})
     self.assertEqual([result.ToDict() for result in results],
                      expected_match_results)
 
   def testFinditForCrashFilterZeroConfidentResults(self):
     def _MockFindMatchResults(*_):
       match_result1 = MatchResult(DUMMY_CHANGELOG1, 'src/', '')
+      frame1 = StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [1])
+      frame2 = StackFrame(1, 'src/', 'func', 'a.cc', 'src/a.cc', [7])
       match_result1.file_to_stack_infos = {
-          'a.cc': [
-              (StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [1]), 0),
-              (StackFrame(1, 'src/', 'func', 'a.cc', 'src/a.cc', [7]), 0),
-          ]
+          'a.cc': [(frame1, 0), (frame2, 0)]
       }
-      match_result1.min_distance = 1
+      match_result1.file_to_analysis_info = {
+          'a.cc': {'min_distance': 1, 'min_distance_frame': frame1}
+      }
 
       match_result2 = MatchResult(DUMMY_CHANGELOG3, 'src/', '')
+      frame3 = StackFrame(15, 'src/', 'func', 'f.cc', 'src/f.cc', [1])
       match_result2.file_to_stack_infos = {
-          'f.cc': [
-              (StackFrame(15, 'src/', 'func', 'f.cc', 'src/f.cc', [1]), 0),
-          ]
+          'f.cc': [(frame3, 0)]
       }
-      match_result2.min_distance = 20
+      match_result2.file_to_analysis_info = {
+          'f.cc': {'min_distance': 20, 'min_distance_frame': frame3}
+      }
 
       match_result3 = MatchResult(DUMMY_CHANGELOG3, 'src/', '')
+      frame4 = StackFrame(3, 'src/', 'func', 'ff.cc', 'src/ff.cc', [1])
       match_result3.file_to_stack_infos = {
-          'f.cc': [
-              (StackFrame(3, 'src/', 'func', 'ff.cc', 'src/ff.cc', [1]), 0),
-          ]
+          'f.cc': [(frame4, 0)]
       }
-      match_result3.min_distance = 60
+      match_result3.file_to_analysis_info = {
+          'f.cc': {'min_distance': 60, 'min_distance_frame': frame4}
+      }
 
       return [match_result1, match_result2, match_result3]
 
     self.mock(findit_for_crash, 'FindMatchResults', _MockFindMatchResults)
 
     expected_match_results = [
         {
-            'reason': ('(1) Modified top crashing frame is #0\n'
-                       '(2) Modification distance (LOC) is 1\n\n'
-                       'Changed file a.cc crashed in frame #0, frame #1'),
+            'author': 'r@chromium.org',
+            'changed_files': [
+                {
+                    'blame_url': None,
+                    'file': 'a.cc',
+                    'info': 'Minimum distance (LOC) 1, frame #0'
+                }
+            ],
+            'confidence': 0.8,
+            'project_path': 'src/',
+            'reasons': [
+                ('TopFrameIndex', 1.0, 'Top frame is #0'),
+                ('MinDistance', 0.8, 'Minimum distance is 1')
+            ],
+            'review_url': 'https://codereview.chromium.org/3281',
+            'revision': '1',
             'time': 'Thu Mar 31 21:24:43 2016',
-            'author': 'r@chromium.org',
-            'url': 'https://repo.test/+/1',
-            'project_path': 'src/',
-            'review_url': 'https://codereview.chromium.org/3281',
-            'confidence': 0.8, 'revision': '1'
-        },
+            'url': 'https://repo.test/+/1'
+        }
     ]
 
     regression_deps_rolls = {'src/': DependencyRoll('src/', 'https://repo',
                                                     '1', '2')}
 
     results = findit_for_crash.FindItForCrash(Stacktrace(),
                                               regression_deps_rolls, {})
+
     self.assertEqual([result.ToDict() for result in results],
                      expected_match_results)
 
   def testFinditForCrashAllMatchResultsWithZeroConfidences(self):
     def _MockFindMatchResults(*_):
       match_result1 = MatchResult(DUMMY_CHANGELOG1, 'src/', '')
+      frame1 = StackFrame(20, 'src/', '', 'func', 'a.cc', [1])
+      frame2 = StackFrame(21, 'src/', '', 'func', 'a.cc', [7])
       match_result1.file_to_stack_infos = {
-          'a.cc': [
-              (StackFrame(20, 'src/', '', 'func', 'a.cc', [1]), 0),
-              (StackFrame(21, 'src/', '', 'func', 'a.cc', [7]), 0),
-          ]
+          'a.cc': [(frame1, 0), (frame2, 0)]
       }
-      match_result1.min_distance = 1
+      match_result1.file_to_analysis_info = {
+          'a.cc': {'min_distance': 1, 'min_distance_frame': frame1}
+      }
 
       match_result2 = MatchResult(DUMMY_CHANGELOG3, 'src/', '')
+      frame3 = StackFrame(15, 'src/', '', 'func', 'f.cc', [1])
       match_result2.file_to_stack_infos = {
-          'f.cc': [
-              (StackFrame(15, 'src/', '', 'func', 'f.cc', [1]), 0),
-          ]
+          'f.cc': [(frame3, 0)]
       }
       match_result2.min_distance = 20
+      match_result2.file_to_analysis_info = {
+          'f.cc': {'min_distance': 20, 'min_distance_frame': frame3}
+      }
 
       return [match_result1, match_result2]
 
     self.mock(findit_for_crash, 'FindMatchResults', _MockFindMatchResults)
 
     regression_deps_rolls = {'src/': DependencyRoll('src/', 'https://repo',
                                                     '1', '2')}
 
     self.assertEqual(findit_for_crash.FindItForCrash(
         Stacktrace(), regression_deps_rolls, {}), [])