| Index: appengine/findit/crash/scorers/test/min_distance_test.py
|
| diff --git a/appengine/findit/crash/scorers/test/min_distance_test.py b/appengine/findit/crash/scorers/test/min_distance_test.py
|
| index cb3b28c12f9431ecb5c1f87d179b01c461dfc5a1..69ac53daab509a20de69aaf3aec40b72842507f9 100644
|
| --- a/appengine/findit/crash/scorers/test/min_distance_test.py
|
| +++ b/appengine/findit/crash/scorers/test/min_distance_test.py
|
| @@ -1,10 +1,10 @@
|
| # 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.stacktrace import StackFrame
|
| -from crash.results import AnalysisInfo
|
| -from crash.results import Result
|
| -from crash.results import MatchResult
|
| +from crash.suspect import AnalysisInfo
|
| +from crash.suspect import Suspect
|
| from crash.scorers.min_distance import MinDistance
|
| from crash.scorers.test.scorer_test_suite import ScorerTestSuite
|
|
|
| @@ -13,15 +13,15 @@ class MinDistanceTest(ScorerTestSuite):
|
|
|
| def testGetMetric(self):
|
| dummy_changelog = self._GetDummyChangeLog()
|
| - match_result = MatchResult(dummy_changelog, 'src/')
|
| - match_result.file_to_analysis_info = {
|
| + suspect = Suspect(dummy_changelog, 'src/')
|
| + suspect.file_to_analysis_info = {
|
| 'file': AnalysisInfo(min_distance=0, min_distance_frame=None)
|
| }
|
|
|
| - self.assertEqual(MinDistance().GetMetric(match_result), 0)
|
| + self.assertEqual(MinDistance().GetMetric(suspect), 0)
|
|
|
| - result = Result(dummy_changelog, 'src/')
|
| - self.assertEqual(MinDistance().GetMetric(result), float('inf'))
|
| + suspect = Suspect(dummy_changelog, 'src/')
|
| + self.assertEqual(MinDistance().GetMetric(suspect), float('inf'))
|
|
|
| def testScore(self):
|
| self.assertEqual(MinDistance().Score(0), 1)
|
| @@ -36,17 +36,17 @@ class MinDistanceTest(ScorerTestSuite):
|
|
|
| def testChangedFiles(self):
|
| dummy_changelog = self._GetDummyChangeLog()
|
| - result = MatchResult(dummy_changelog, 'src/')
|
| + suspect = Suspect(dummy_changelog, 'src/')
|
| frame = StackFrame(0, 'src/', 'func', 'f.cc', 'a/b/src/f.cc', [2],
|
| repo_url='https://repo_url')
|
| - result.file_to_stack_infos = {
|
| + suspect.file_to_stack_infos = {
|
| 'src/f.cc': [(frame, 0)]
|
| }
|
| - result.file_to_analysis_info = {
|
| + suspect.file_to_analysis_info = {
|
| 'src/f.cc': AnalysisInfo(min_distance=0, min_distance_frame=frame)
|
| }
|
|
|
| - self.assertEqual(MinDistance().ChangedFiles(result, 1),
|
| + self.assertEqual(MinDistance().ChangedFiles(suspect, 1),
|
| [{'file': 'f.cc',
|
| 'blame_url': ('https://repo_url/+blame/%s/f.cc#2' %
|
| dummy_changelog.revision),
|
| @@ -54,38 +54,38 @@ class MinDistanceTest(ScorerTestSuite):
|
|
|
| def testChangedFilesInfMinDistance(self):
|
| dummy_changelog = self._GetDummyChangeLog()
|
| - result = MatchResult(dummy_changelog, 'src/')
|
| + suspect = Suspect(dummy_changelog, 'src/')
|
| frame = StackFrame(0, 'src/', 'func', 'f.cc', 'a/b/src/f.cc', [2],
|
| repo_url='https://repo_url')
|
| - result.file_to_stack_infos = {
|
| + suspect.file_to_stack_infos = {
|
| 'src/f.cc': [(frame, 0)]
|
| }
|
| - result.file_to_analysis_info = {
|
| + suspect.file_to_analysis_info = {
|
| 'src/f.cc': AnalysisInfo(min_distance=float('inf'),
|
| min_distance_frame=frame)
|
| }
|
|
|
| - self.assertIsNone(MinDistance().ChangedFiles(result, 0))
|
| + self.assertIsNone(MinDistance().ChangedFiles(suspect, 0))
|
|
|
| def testChangedFilesSkipFileInfMinDistance(self):
|
| dummy_changelog = self._GetDummyChangeLog()
|
| - result = MatchResult(dummy_changelog, 'src/')
|
| + suspect = Suspect(dummy_changelog, 'src/')
|
| frame0 = StackFrame(0, 'src/', 'func0', 'f0.cc', 'a/b/src/f0.cc', [2],
|
| repo_url='https://repo_url')
|
| frame1 = StackFrame(1, 'src/', 'func1', 'f1.cc', 'a/b/src/f1.cc', [5],
|
| repo_url='https://repo_url')
|
| - result.file_to_stack_infos = {
|
| + suspect.file_to_stack_infos = {
|
| 'src/f0.cc': [(frame0, 0)],
|
| 'src/f1.cc': [(frame1, 0)]
|
| }
|
| - result.file_to_analysis_info = {
|
| + suspect.file_to_analysis_info = {
|
| 'src/f0.cc': AnalysisInfo(min_distance=0,
|
| min_distance_frame=frame0),
|
| 'src/f1.cc': AnalysisInfo(min_distance=float('inf'),
|
| min_distance_frame=frame1),
|
| }
|
|
|
| - self.assertEqual(MinDistance().ChangedFiles(result, 1),
|
| + self.assertEqual(MinDistance().ChangedFiles(suspect, 1),
|
| [{'file': 'f0.cc',
|
| 'blame_url': ('https://repo_url/+blame/%s/f0.cc#2' %
|
| dummy_changelog.revision),
|
|
|