[Findit] Reorganizing findit_for_*.py

appengine/findit/crash/test/project_classifier_test.py

Index: appengine/findit/crash/test/project_classifier_test.py
diff --git a/appengine/findit/crash/test/project_classifier_test.py b/appengine/findit/crash/test/project_classifier_test.py
index 03202e5dc2dad3763d93c88c3c79ac300e18c522..4404d024077ae3299b8c9575a0b9f77304eb59c3 100644
--- a/appengine/findit/crash/test/project_classifier_test.py
+++ b/appengine/findit/crash/test/project_classifier_test.py
@@ -76,8 +76,8 @@ class ProjectClassifierTest(CrashTestCase):
     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()
@@ -120,16 +120,11 @@ class ProjectClassifierTest(CrashTestCase):
     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()
@@ -150,7 +145,7 @@ class ProjectClassifierTest(CrashTestCase):
         ]
     }
 
-    self.assertEqual(ProjectClassifier().Classify([result1], crash_stack), '')
+    self.assertIsNone(ProjectClassifier().Classify([result1], crash_stack))
 
   def testSortHosts(self):
     host_list = [