sync: remove use of protobuf extensions in protocol to reduce static init overhead.

net/tools/testserver/chromiumsync_test.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Tests exercising chromiumsync and SyncDataModel."""
 
 import pickle
 import unittest
 
 import autofill_specifics_pb2
 import bookmark_specifics_pb2
 import chromiumsync
 import sync_pb2
 import theme_specifics_pb2
 
+from google.protobuf import text_format

[ncarter (slow), 2012/03/01 22:13:05]

Debugging cruft; remove these lines.

[akalin, 2012/03/02 23:56:49]

not removed yet?

+
 class SyncDataModelTest(unittest.TestCase):
   def setUp(self):
     self.model = chromiumsync.SyncDataModel()
 
   def AddToModel(self, proto):
     self.model._entries[proto.id_string] = proto
 
   def GetChangesFromTimestamp(self, requested_types, timestamp):
     message = sync_pb2.GetUpdatesMessage()
     message.from_timestamp = timestamp
     for data_type in requested_types:
-      message.requested_types.Extensions[
-        chromiumsync.SYNC_TYPE_TO_EXTENSION[data_type]].SetInParent()
+      getattr(message.requested_types,
+              chromiumsync.SYNC_TYPE_TO_DESCRIPTOR[
+                  data_type].name).SetInParent()
     return self.model.GetChanges(
         chromiumsync.UpdateSieve(message, self.model.migration_history))
 
   def FindMarkerByNumber(self, markers, datatype):
     """Search a list of progress markers and find the one for a datatype."""
     for marker in markers:
       if marker.data_type_id == datatype.number:
         return marker
     self.fail('Required marker not found: %s' % datatype.name)
 
@@ skipping 251 matching lines @@
       self.assertTrue(result4.parent_id_string ==
                       result1b.parent_id_string ==
                       result5.parent_id_string ==
                       result2b.id_string)
       self.assertTrue(result4.position_in_parent <
                       result1b.position_in_parent <
                       result5.position_in_parent)
 
   def testUpdateSieve(self):
     # from_timestamp, legacy mode
-    autofill = autofill_specifics_pb2.autofill
-    theme = theme_specifics_pb2.theme
+    autofill = chromiumsync.SYNC_TYPE_FIELDS['autofill']
+    theme = chromiumsync.SYNC_TYPE_FIELDS['theme']
     msg = sync_pb2.GetUpdatesMessage()
     msg.from_timestamp = 15412
-    msg.requested_types.Extensions[autofill].SetInParent()
-    msg.requested_types.Extensions[theme].SetInParent()
+    msg.requested_types.autofill.SetInParent()
+    msg.requested_types.theme.SetInParent()
 
     sieve = chromiumsync.UpdateSieve(msg)
     self.assertEqual(sieve._state,
         {chromiumsync.TOP_LEVEL: 15412,
          chromiumsync.AUTOFILL: 15412,
          chromiumsync.THEME: 15412})
 
     response = sync_pb2.GetUpdatesResponse()
     sieve.SaveProgress(15412, response)
     self.assertEqual(0, len(response.new_progress_marker))
@@ skipping 124 matching lines @@
     testserver = chromiumsync.TestServer()
     http_code, raw_respon = testserver.HandleSetTransientError()
     self.assertEqual(http_code, 200)
     try:
       testserver.CheckTransientError()
       self.fail('Should have raised transient error exception')
     except chromiumsync.TransientError:
       self.assertTrue(testserver.transient_error)
 
   def testUpdateSieveStoreMigration(self):
-    autofill = autofill_specifics_pb2.autofill
-    theme = theme_specifics_pb2.theme
+    autofill = chromiumsync.SYNC_TYPE_FIELDS['autofill']
+    theme = chromiumsync.SYNC_TYPE_FIELDS['theme']
     migrator = chromiumsync.MigrationHistory()
     msg = sync_pb2.GetUpdatesMessage()
     marker = msg.from_progress_marker.add()
     marker.data_type_id = autofill.number
     marker.token = pickle.dumps((15412, 1))
     marker = msg.from_progress_marker.add()
     marker.data_type_id = theme.number
     marker.token = pickle.dumps((15413, 1))
     sieve = chromiumsync.UpdateSieve(msg, migrator)
     sieve.CheckMigrationState()
@@ skipping 93 matching lines @@
     marker.token = pickle.dumps((15412, 5))
     marker = msg.from_progress_marker.add()
     marker.data_type_id = theme.number
     marker.token = pickle.dumps((15413, 4))
     sieve = chromiumsync.UpdateSieve(msg, migrator)
     sieve.CheckMigrationState()
 
 
 if __name__ == '__main__':
   unittest.main()