[Findit] Enable project classifier and component classifier

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 77 matching lines @@
     'revision': '3',
     'reverted_revision': None
 })
 
 
 class FinditForCrashTest(CrashTestSuite):
 
   def testGetDepsInCrashStack(self):
     crash_stack = CallStack(0)
     crash_stack.extend([
-        StackFrame(0, 'src/', '', 'func0', 'f0.cc', [1]),
-        StackFrame(1, 'src/', '', 'func1', 'f1.cc', [2, 3]),
+        StackFrame(0, 'src/', 'func0', 'f0.cc', 'src/f0.cc', [1]),
+        StackFrame(1, 'src/', 'func1', 'f1.cc', 'src/f1.cc', [2, 3]),
     ])
     crash_deps = {'src/': Dependency('src/', 'https://chromium_repo', '1'),
                   'src/v8/': Dependency('src/v8/', 'https://v8_repo', '2')}
 
     expected_stack_deps = {'src/': crash_deps['src/']}
 
     self.assertEqual(
         findit_for_crash.GetDepsInCrashStack(crash_stack, crash_deps),
         expected_stack_deps)
 
@@ skipping 45 matching lines @@
         }
     }
     self.assertEqual(dep_file_to_changelogs_json,
                      expected_dep_file_to_changelogs_json)
     self.assertEqual(ignore_cls, set(['1']))
 
   def testGetStackInfosForFilesGroupedByDeps(self):
 
     main_stack = CallStack(0)
     main_stack.extend(
-        [StackFrame(0, 'src/', '', 'c(p* &d)', 'a.cc', [177]),
-         StackFrame(1, 'src/', '', 'd(a* c)', 'a.cc', [227, 228, 229]),
-         StackFrame(2, 'src/v8/', '', 'e(int)', 'b.cc', [87, 88, 89, 90])])
+        [StackFrame(0, 'src/', 'c(p* &d)', 'a.cc', 'src/a.cc', [177]),
+         StackFrame(1, 'src/', 'd(a* c)', 'a.cc', 'src/a.cc', [227, 228, 229]),
+         StackFrame(2, 'src/v8/', 'e(int)', 'b.cc', 'src/v8/b.cc', [89, 90])])
 
     low_priority_stack = CallStack(1)
     low_priority_stack.append(
-        StackFrame(0, 'src/dummy/', '', 'c(p* &d)', 'd.cc', [17]))
+        StackFrame(0, 'src/dummy/', 'c(p* &d)', 'd.cc', 'src/dummy/d.cc', [17]))
 
     stacktrace = Stacktrace()
     stacktrace.extend([main_stack, low_priority_stack])
 
     crashed_deps = {'src/': Dependency('src/', 'https//repo', '2'),
                     'src/v8/': Dependency('src/v8', 'https//repo', '1')}
 
     expected_dep_file_to_stack_infos = {
         'src/': {
             'a.cc': [
@@ skipping 33 matching lines @@
     dummy_blame.AddRegion(
         Region(6, 10, '1', 'b', 'b@email.com', 'Thu Mar 31 21:24:43 2016'))
 
     def _MockGetBlame(*_):
       return dummy_blame
 
     self.mock(GitRepository, 'GetBlame', _MockGetBlame)
 
     main_stack = CallStack(0)
     main_stack.extend(
-        [StackFrame(0, 'src/', '', 'c(p* &d)', 'a.cc', [177]),
-         StackFrame(1, 'src/', '', 'd(a* c)', 'a.cc', [227, 228, 229])])
+        [StackFrame(0, 'src/', 'c(p* &d)', 'a.cc', 'src/a.cc', [177]),
+         StackFrame(1, 'src/', 'd(a* c)', 'a.cc', 'src/a.cc', [227, 228, 229])])
 
     low_priority_stack = CallStack(1)
     low_priority_stack.append(
-        StackFrame(0, 'dummy_dep/', '', 'k(p* &d)', 'h.cc', [17]))
+        StackFrame(0, 'dummy_dep/', 'k(p* &d)', 'h.cc', 'dummy_dep/h.cc', [17]))
 
     stacktrace = Stacktrace()
     stacktrace.extend([main_stack, low_priority_stack])
 
     crash_deps = {'src/': Dependency('src/', 'https://chromium_repo', '1')}
 
     dep_file_to_blame = findit_for_crash.GetBlameForFilesGroupedByDeps(
         stacktrace,
         findit_for_crash.GetDepsInCrashStack(main_stack, crash_deps))
 
@@ skipping 19 matching lines @@
         'src/': {
             'a.cc': [
                 DUMMY_CHANGELOG1,
             ]
         }
     }
 
     dep_file_to_stack_infos = {
         'src/': {
             'a.cc': [
-                (StackFrame(0, 'src/', '', 'func', 'a.cc', [1]), 0),
-                (StackFrame(1, 'src/', '', 'func', 'a.cc', [7]), 0),
+                (StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [1]), 0),
+                (StackFrame(1, 'src/', 'func', 'a.cc', 'src/a.cc', [7]), 0),
             ],
             'b.cc': [
-                (StackFrame(2, 'src/', '', 'func', 'b.cc', [36]), 0),
+                (StackFrame(2, 'src/', 'func', 'b.cc', 'src/b.cc', [36]), 0),
             ]
         }
     }
 
     dummy_blame = Blame('9', 'a.cc')
     dummy_blame.AddRegion(
         Region(1, 5, '6', 'a', 'a@chromium.org', 'Thu Mar 31 21:24:43 2016'))
     dummy_blame.AddRegion(
         Region(6, 10, '1', 'b', 'b@chromium.org', 'Thu Jun 19 12:11:40 2015'))
 
     dep_file_to_blame = {
         'src/': {
             'a.cc': dummy_blame
         }
     }
 
     expected_match_results = [{
         'url': 'https://repo.test/+/1',
         'revision': '1',
         'dep_path': 'src/',
-        'component': '',
         'author': 'r@chromium.org',
         'time': 'Thu Mar 31 21:24:43 2016',
         'reason': None,
         'confidence': None,
     }]
 
     match_results = findit_for_crash.FindMatchResults(dep_file_to_changelogs,
                                                       dep_file_to_stack_infos,
                                                       dep_file_to_blame)
     self.assertEqual([result.ToDict() for result in match_results],
@@ skipping 15 matching lines @@
                                                     '1', '2')}
     self.assertEqual(findit_for_crash.FindItForCrash(
         Stacktrace(), regression_deps_rolls, {}), [])
 
   def testFindItForCrash(self):
 
     def _MockFindMatchResults(*_):
       match_result1 = MatchResult(DUMMY_CHANGELOG1, 'src/', '')
       match_result1.file_to_stack_infos = {
           'a.cc': [
-              (StackFrame(0, 'src/', '', 'func', 'a.cc', [1]), 0),
-              (StackFrame(1, 'src/', '', 'func', 'a.cc', [7]), 0),
+              (StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [1]), 0),
+              (StackFrame(1, 'src/', 'func', 'a.cc', 'src/a.cc', [7]), 0),
           ]
       }
       match_result1.min_distance = 0
 
       match_result2 = MatchResult(DUMMY_CHANGELOG3, 'src/', '')
       match_result2.file_to_stack_infos = {
           'f.cc': [
-              (StackFrame(5, 'src/', '', 'func', 'f.cc', [1]), 0),
+              (StackFrame(5, 'src/', 'func', 'f.cc', 'src/f.cc', [1]), 0),
           ]
       }
       match_result2.min_distance = 20
 
       return [match_result1, match_result2]
 
     self.mock(findit_for_crash, 'FindMatchResults', _MockFindMatchResults)
 
     expected_match_results = [
         {
             'url': 'https://repo.test/+/1',
             'revision': '1',
             'dep_path': 'src/',
-            'component': '',
             'author': 'r@chromium.org',
             'time': 'Thu Mar 31 21:24:43 2016',
             'reason': ('1. Top frame changed is frame #0 (score: 1)\n'
                        '2. Minimum distance to crashed line is 0 (score: 1)\n'
                        '\nChanged file a.cc crashed in func (#0)'
                        ', func (#1)'),
             'confidence': 1,
         },
         {
             'url': 'https://repo.test/+/3',
             'revision': '3',
             'dep_path': 'src/',
-            'component': '',
             'author': 'e@chromium.org',
             'time': 'Thu Apr 1 21:24:43 2016',
             'reason': ('1. Top frame changed is frame #5 (score: 0)\n'
                        '2. Minimum distance to crashed line is 20 (score: 0)\n'
                        '\nChanged file f.cc crashed in func (#5)'),
             'confidence': 0.22857142857142856,
         },
     ]
 
     regression_deps_rolls = {'src/': DependencyRoll('src/', 'https://repo',
                                                     '1', '2')}
 
     self.assertEqual(findit_for_crash.FindItForCrash(
         Stacktrace(), regression_deps_rolls, {}), expected_match_results)