Refactor the devserver to make it easier to control caching

chrome/common/extensions/docs/server2/template_data_source_test.py

Index: chrome/common/extensions/docs/server2/template_data_source_test.py
diff --git a/chrome/common/extensions/docs/server2/template_data_source_test.py b/chrome/common/extensions/docs/server2/template_data_source_test.py
index 0bfa526c4b2735fa2bde1b5ea53e374cfe8ecc33..554d8c55f25afb4351622bd799563fb7733384b3 100755
--- a/chrome/common/extensions/docs/server2/template_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/template_data_source_test.py
@@ -10,14 +10,13 @@ import unittest
 
 from api_data_source import APIDataSource
 from compiled_file_system import CompiledFileSystem
-from in_memory_object_store import InMemoryObjectStore
 from local_file_system import LocalFileSystem
 from reference_resolver import ReferenceResolver
 from template_data_source import TemplateDataSource
 from third_party.handlebar import Handlebar
 
 class _FakeRequest(object):
-    pass
+  pass
 
 class _FakeFactory(object):
   def __init__(self, input_dict=None):
@@ -38,8 +37,6 @@ class TemplateDataSourceTest(unittest.TestCase):
     self._fake_intro_data_source_factory = _FakeFactory()
     self._fake_samples_data_source_factory = _FakeFactory()
     self._fake_sidenav_data_source_factory = _FakeFactory()
-    self._fake_known_issues_data_source = {}
-    self._object_store = InMemoryObjectStore('fake_branch')
 
   def _ReadLocalFile(self, filename):
     with open(os.path.join(self._base_path, filename), 'r') as f:
@@ -52,23 +49,21 @@ class TemplateDataSourceTest(unittest.TestCase):
         self._ReadLocalFile(name + '_expected.html'),
         data_source.Render(template_name))
 
-  def _CreateTemplateDataSource(self, cache_factory, api_data=None):
+  def _CreateTemplateDataSource(self, compiled_fs_factory, api_data=None):
     if api_data is None:
-      api_data_factory = APIDataSource.Factory(cache_factory, 'fake_path')
+      api_data_factory = APIDataSource.Factory(compiled_fs_factory, 'fake_path')
     else:
       api_data_factory = _FakeFactory(api_data)
     reference_resolver_factory = ReferenceResolver.Factory(
         api_data_factory,
-        self._fake_api_list_data_source_factory,
-        self._object_store)
+        self._fake_api_list_data_source_factory)
     return (TemplateDataSource.Factory('fake_channel',
                                        api_data_factory,
                                        self._fake_api_list_data_source_factory,
                                        self._fake_intro_data_source_factory,
                                        self._fake_samples_data_source_factory,
-                                       self._fake_known_issues_data_source,
                                        self._fake_sidenav_data_source_factory,
-                                       cache_factory,
+                                       compiled_fs_factory,
                                        reference_resolver_factory,
                                        '.',
                                        '.')
@@ -77,8 +72,8 @@ class TemplateDataSourceTest(unittest.TestCase):
   def testSimple(self):
     self._base_path = os.path.join(self._base_path, 'simple')
     fetcher = LocalFileSystem(self._base_path)
-    cache_factory = CompiledFileSystem.Factory(fetcher, self._object_store)
-    t_data_source = self._CreateTemplateDataSource(cache_factory)
+    compiled_fs_factory = CompiledFileSystem.Factory(fetcher)
+    t_data_source = self._CreateTemplateDataSource(compiled_fs_factory)
     template_a1 = Handlebar(self._ReadLocalFile('test1.html'))
     self.assertEqual(template_a1.render({}, {'templates': {}}).text,
         t_data_source.get('test1').render({}, {'templates': {}}).text)
@@ -92,8 +87,8 @@ class TemplateDataSourceTest(unittest.TestCase):
   def testPartials(self):
     self._base_path = os.path.join(self._base_path, 'partials')
     fetcher = LocalFileSystem(self._base_path)
-    cache_factory = CompiledFileSystem.Factory(fetcher, self._object_store)
-    t_data_source = self._CreateTemplateDataSource(cache_factory)
+    compiled_fs_factory = CompiledFileSystem.Factory(fetcher)
+    t_data_source = self._CreateTemplateDataSource(compiled_fs_factory)
     self.assertEqual(
         self._ReadLocalFile('test_expected.html'),
         t_data_source.get('test_tmpl').render(
@@ -103,16 +98,16 @@ class TemplateDataSourceTest(unittest.TestCase):
     self._base_path = os.path.join(self._base_path, 'render')
     fetcher = LocalFileSystem(self._base_path)
     context = json.loads(self._ReadLocalFile('test1.json'))
-    cache_factory = CompiledFileSystem.Factory(fetcher, self._object_store)
+    compiled_fs_factory = CompiledFileSystem.Factory(fetcher)
     self._RenderTest(
         'test1',
         self._CreateTemplateDataSource(
-            cache_factory,
+            compiled_fs_factory,
             api_data=json.loads(self._ReadLocalFile('test1.json'))))
     self._RenderTest(
         'test2',
         self._CreateTemplateDataSource(
-            cache_factory,
+            compiled_fs_factory,
             api_data=json.loads(self._ReadLocalFile('test2.json'))))
 
 if __name__ == '__main__':