[Predator] Switch from anonymous dict to CrashData.

appengine/findit/crash/test/predator_testcase.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.
 
 import copy
 import re
 
 import gae_ts_mon
 from google.appengine.api import users
 
 from crash.crash_data import CrashData
 from crash.findit import Findit
+from crash.type_enums import CrashClient
 from gae_libs.testcase import TestCase
 from libs.gitiles.change_log import ChangeLog
 from libs.gitiles.gitiles_repository import GitilesRepository
 from libs.http import retry_http_client
 from model.crash.crash_config import CrashConfig
 from model.crash.crash_analysis import CrashAnalysis
 
 
 DEFAULT_CONFIG_DATA = {
     'fracas': {
@@ skipping 79 matching lines @@
     super(PredatorTestCase, self).setUp()
     CrashConfig.Get().Update(
         users.User(email='admin@chromium.org'), True, **DEFAULT_CONFIG_DATA)
     gae_ts_mon.reset_for_unittest(disable=True)
 
   def GetDummyChangeLog(self):
     return DUMMY_CHANGELOG
 
   def GetMockFindit(self, get_repository=None, config=None,
                     client_id='mock_client'):
-    """Gets Mocked ``Findit`` object."""
     get_repository = (get_repository or
                       GitilesRepository.Factory(self.GetMockHttpClient()))
     config = config or CrashConfig.Get()
 
     class MockFindit(Findit):  # pylint: disable=W0223
       """Overwrite abstract method of Findit for testing."""
       def __init__(self):
         super(MockFindit, self).__init__(get_repository, config)
 
       @classmethod
       def _ClientID(cls):
         return client_id
 
       def ProcessResultForPublishing(self, result, key):
         return result
 
+      def GetCrashData(self, crash_data):
+
+        class MockCrashData(CrashData):
+          @property
+          def regression_range(self):
+            return crash_data.get('regression_range')
+
+          @property
+          def stacktrace(self):
+            return None
+
+          @property
+          def dependencies(self):
+            return {}
+
+          @property
+          def dependency_rolls(self):
+            return {}
+
+        return MockCrashData(crash_data)
+
       def GetAnalysis(self, crash_identifiers):
         return CrashAnalysis.Get(crash_identifiers)
 
       def CreateAnalysis(self, crash_identifiers):
         return CrashAnalysis.Create(crash_identifiers)
 
     return MockFindit()
 
-  def GetDummyCrashData(self, client_id='mock_client', version='1',
-                        signature='signature', platform='win',
-                        stack_trace=None, regression_range=None,
-                        channel='canary', historical_metadata=None,
-                        crash_identifiers=True, process_type='browser'):
-    """Gets Mocked crashed_data sent by clients."""
-    if crash_identifiers is True: # pragma: no cover
-      crash_identifiers = {
-          'chrome_version': version,
-          'signature': signature,
-          'channel': channel,
-          'platform': platform,
-          'process_type': process_type,
-      }
+  def GetDummyChromeCrashData(
+      self, client_id='mock_client', version='1', signature='signature',
+      platform='win', stack_trace=None, regression_range=None, channel='canary',
+      historical_metadata=None, process_type='browser'):
+    crash_identifiers = {
+        'chrome_version': version,
+        'signature': signature,
+        'channel': channel,
+        'platform': platform,
+        'process_type': process_type,
+    }
+    customized_data = {
+        'historical_metadata': historical_metadata,
+        'channel': channel,
+    }
+
     crash_data = {
         'chrome_version': version,
         'signature': signature,
         'platform': platform,
         'stack_trace': stack_trace,
         'regression_range': regression_range,
         'crash_identifiers': crash_identifiers,
-        'customized_data': {
-            'historical_metadata': historical_metadata,
-            'channel': channel,
-        },
+        'customized_data': customized_data
     }
     # This insertion of client_id is used for debugging ScheduleNewAnalysis.
     if client_id is not None: # pragma: no cover
       crash_data['client_id'] = client_id
     return crash_data