[Findit] Enable project classifier and component classifier

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 common.blame import Region, Blame
 from common.change_log import ChangeLog
 from crash.callstack import StackFrame
 from crash.results import Result, MatchResult, MatchResults
 from crash.test.crash_test_suite import CrashTestSuite
 
@@ skipping 60 matching lines @@
 DUMMY_BLAME.AddRegion(
     Region(1, 5, '2', 'r', 'r@chromium.org', 'Thu Mar 25 21:24:43 2016'))
 DUMMY_BLAME.AddRegion(
     Region(6, 3, '1', 'e', 'e@chromium.org', 'Thu Mar 31 21:24:43 2016'))
 
 
 class ResultsTest(CrashTestSuite):
 
   def testResultToDict(self):
 
-    result = Result(DUMMY_CHANGELOG1, 'src/', '',
+    result = Result(DUMMY_CHANGELOG1, 'src/',
                     confidence=1, reason='some reason')
 
     expected_result_json = {
         'url': DUMMY_CHANGELOG1.commit_url,
         'revision': DUMMY_CHANGELOG1.revision,
         'dep_path': 'src/',
-        'component': '',
         'author': DUMMY_CHANGELOG1.author_email,
         'time': str(DUMMY_CHANGELOG1.author_time),
         'reason': 'some reason',
         'confidence': 1,
     }
 
     self.assertEqual(result.ToDict(), expected_result_json)
 
   def testResultToString(self):
 
-    result = Result(DUMMY_CHANGELOG1, 'src/', '',
+    result = Result(DUMMY_CHANGELOG1, 'src/',
                     confidence=1, reason='some reason')
 
     expected_result_str = ''
     self.assertEqual(result.ToString(), expected_result_str)
 
     result.file_to_stack_infos = {
-        'a.cc': [(StackFrame(0, 'src/', '', 'func', 'a.cc', []), 0)]
+        'a.cc': [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', []), 0)]
     }
     expected_result_str = 'Changed file a.cc crashed in func (#0)'
 
     self.assertEqual(str(result), expected_result_str)
 
   def testMatchResultUpdate(self):
     # Touched lines have intersection with crashed lines.
-    result = MatchResult(DUMMY_CHANGELOG1, 'src/', '',
+    result = MatchResult(DUMMY_CHANGELOG1, 'src/',
                          confidence=1, reason='some reason')
-    stack_infos = [(StackFrame(0, 'src/', '', 'func', 'a.cc', [7]), 0)]
+    stack_infos = [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [7]), 0)]
 
     result.Update('a.cc', stack_infos, DUMMY_BLAME)
     self.assertEqual(result.min_distance, 0)
 
     # Touched lines are before crashed lines.
-    result = MatchResult(DUMMY_CHANGELOG1, 'src/', '',
+    result = MatchResult(DUMMY_CHANGELOG1, 'src/',
                          confidence=1, reason='some reason')
 
-    stack_infos = [(StackFrame(0, 'src/', '', 'func', 'a.cc', [3]), 0)]
+    stack_infos = [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [3]), 0)]
 
     result.Update('a.cc', stack_infos, DUMMY_BLAME)
     self.assertEqual(result.min_distance, 3)
 
     # Touched lines are after crashed lines.
-    result = MatchResult(DUMMY_CHANGELOG1, 'src/', '',
+    result = MatchResult(DUMMY_CHANGELOG1, 'src/',
                          confidence=1, reason='some reason')
 
-    stack_infos = [(StackFrame(0, 'src/', '', 'func', 'a.cc', [10]), 0)]
+    stack_infos = [(StackFrame(0, 'src/', 'func', 'a.cc', 'src/a.cc', [10]), 0)]
 
     result.Update('a.cc', stack_infos, DUMMY_BLAME)
     self.assertEqual(result.min_distance, 2)
 
   def testMatchResultsGenerateMatchResults(self):
     match_results = MatchResults(ignore_cls=set(['2']))
-    stack_infos1 = [(StackFrame(0, 'src/', '', 'func', 'a.cc', [7]), 0)]
-    stack_infos2 = [(StackFrame(1, 'src/', '', 'func', 'b.cc', [11]), 0)]
+    stack_infos1 = [(StackFrame(
+        0, 'src/',  'func', 'a.cc', 'src/a.cc', [7]), 0)]
+    stack_infos2 = [(StackFrame(
+        1, 'src/',  'func', 'b.cc', 'src/b.cc', [11]), 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 = MatchResult(DUMMY_CHANGELOG1, 'src/')
     expected_match_result.file_to_stack_infos = {
         'a.cc': stack_infos1,
         'b.cc': stack_infos2
     }
     expected_match_result.min_distance = 0
 
     expected_match_results = MatchResults(ignore_cls=set(['2']))
     expected_match_results['1'] = expected_match_result
 
     self._VerifyTwoMatchResultsEqual(match_results, expected_match_results)