[Findit] Reorganizing findit_for_*.py

appengine/findit/crash/test/project_classifier_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.stacktrace import StackFrame
 from crash.stacktrace import CallStack
 from crash.project_classifier import ProjectClassifier
 from crash.results import Result
 from crash.test.crash_testcase import CrashTestCase
 from crash.type_enums import CallStackLanguageType
@@ skipping 58 matching lines @@
         StackFrame(1, 'src/', 'ff', 'comp1.cc', 'src/comp1.cc', [21]),
         StackFrame(2, 'src/', 'func2', 'comp2.cc', 'src/comp2.cc', [8])
     ])
 
     self.assertEqual(classifier.Classify([], crash_stack), 'chromium')
 
   def testClassifyResultsEmpty(self):
     classifier = ProjectClassifier()
 
     result = Result(self.GetDummyChangeLog(), '')
-    self.assertEqual(classifier.Classify([result], CallStack(0)),
-                     '')
+    project_name, project_path = classifier.Classify([result], CallStack(0))
+    self.assertEqual(project_name, '')
 
   def testClassifyRankFunction(self):
     classifier = ProjectClassifier()
 
     result1 = Result(self.GetDummyChangeLog(), 'src/')
     result1.file_to_stack_infos = {
         'comp1.cc': [
             (StackFrame(0, 'src/', 'func', 'comp1.cc', 'src/comp1.cc', [2]), 0)
         ]
     }
@@ skipping 22 matching lines @@
     crash_stack.extend([
         StackFrame(0, '', 'android.a.f', 'android/a/cc',
                    'android/a.java', [2]),
         StackFrame(1, '', 'org.chromium.c', 'org/chromium/c.java',
                    'org/chromium/c.java', [8])
     ])
 
     self.assertEqual(classifier.Classify([], crash_stack),
                      'chromium')
 
+  # TODO(wrengr): what's the point of this? we're just testing that
+  # mocking does in fact mock.
   def testClassifyReturnsNone(self):
-    def _MockClassify(*_, **args):
-      self.assertIsNotNone(args)
-      return None
-
-    self.mock(ProjectClassifier, '_Classify', _MockClassify)
-
-    classifier = ProjectClassifier()
-    self.assertEqual(classifier.Classify([], CallStack(0)),
-                     '')
+    self.mock(ProjectClassifier, 'Classify', lambda *_: None)
+    self.assertIsNone(ProjectClassifier().Classify([], CallStack(0)))
 
   def testProjectClassifierDoNotHaveConfig(self):
     crash_config = CrashConfig.Get()
     crash_config.project_classifier = {}
     crash_config.put()
 
     crash_stack = CallStack(0)
     crash_stack.extend([
         StackFrame(0, 'src/', 'func', 'comp1.cc', 'src/comp1.cc', [2]),
         StackFrame(1, 'src/', 'ff', 'comp1.cc', 'src/comp1.cc', [21]),
         StackFrame(2, 'src/', 'func2', 'comp2.cc', 'src/comp2.cc', [8])
     ])
 
     result1 = Result(self.GetDummyChangeLog(), 'src/')
     result1.file_to_stack_infos = {
         'comp1.cc': [
             (StackFrame(0, 'src/', 'func', 'comp1.cc', 'src/comp1.cc', [2]), 0)
         ]
     }
 
-    self.assertEqual(ProjectClassifier().Classify([result1], crash_stack), '')
+    self.assertIsNone(ProjectClassifier().Classify([result1], crash_stack))
 
   def testSortHosts(self):
     host_list = [
         'src/',
         'src/chrome/browser/resources/',
         'src/media/',
         'src/sdch/',
         'src/testing/',
         'src/third_party/WebKit/',
         'src/third_party/',
@@ skipping 12 matching lines @@
         'src/sdch/',
         'src/testing/',
         'src/third_party/',
         'src/tools/',
         'src/'
     ]
 
     self.assertEqual(
         ProjectClassifier().project_classifier_config['host_directories'],
         expected_sorted_host_list)