Extension docs server: APIDataSource

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 a96e4bd6ffcf6c84662326dfa654a13a2e35944d..c0239a14d3b651001d9af1ebf32c39a80413a95e 100755
--- a/chrome/common/extensions/docs/server2/template_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/template_data_source_test.py
@@ -7,6 +7,7 @@ import json
 import os
 import unittest
 
+from fetcher_cache import FetcherCache
 from local_fetcher import LocalFetcher
 from template_data_source import TemplateDataSource
 from third_party.handlebar import Handlebar
@@ -22,14 +23,16 @@ class TemplateDataSourceTest(unittest.TestCase):
   def _RenderTest(self, name, data_source):
     template_name = name + '_tmpl.html'
     template = Handlebar(self._ReadLocalFile(template_name))
-    self.assertEquals(self._ReadLocalFile(name + '_expected.html'),
-                      data_source.Render(template_name,
-                                         self._ReadLocalFile(name + '.json')))
+    context = json.loads(self._ReadLocalFile(name + '.json'))
+    self.assertEquals(
+        self._ReadLocalFile(name + '_expected.html'),
+        data_source.Render(template_name, context))
 
   def testSimple(self):
     self._base_path = os.path.join(self._base_path, 'simple')
     fetcher = LocalFetcher(self._base_path)
-    t_data_source = TemplateDataSource(fetcher, ['./'], 0)
+    cache_builder = FetcherCache.Builder(fetcher, 0)
+    t_data_source = TemplateDataSource(cache_builder, ['./'])
 
     template_a1 = Handlebar(self._ReadLocalFile('test1.html'))
     self.assertEqual(template_a1.render({}, {'templates': {}}).text,
@@ -44,7 +47,8 @@ class TemplateDataSourceTest(unittest.TestCase):
   def testPartials(self):
     self._base_path = os.path.join(self._base_path, 'partials')
     fetcher = LocalFetcher(self._base_path)
-    t_data_source = TemplateDataSource(fetcher, ['./'], 0)
+    cache_builder = FetcherCache.Builder(fetcher, 0)
+    t_data_source = TemplateDataSource(cache_builder, ['./'])
 
     self.assertEqual(self._ReadLocalFile('test.html'),
         t_data_source['test_tmpl'].render(
@@ -53,7 +57,8 @@ class TemplateDataSourceTest(unittest.TestCase):
   def testRender(self):
     self._base_path = os.path.join(self._base_path, 'render')
     fetcher = LocalFetcher(self._base_path)
-    t_data_source = TemplateDataSource(fetcher, ['./'], 0)
+    cache_builder = FetcherCache.Builder(fetcher, 0)
+    t_data_source = TemplateDataSource(cache_builder, ['./'])
     self._RenderTest('test1', t_data_source)
     self._RenderTest('test2', t_data_source)