Docserver: Factor SamplesModel out of SamplesDataSource

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

Index: chrome/common/extensions/docs/server2/samples_model_test.py
diff --git a/chrome/common/extensions/docs/server2/samples_data_source_test.py b/chrome/common/extensions/docs/server2/samples_model_test.py
similarity index 28%
rename from chrome/common/extensions/docs/server2/samples_data_source_test.py
rename to chrome/common/extensions/docs/server2/samples_model_test.py
index b798469da38e35d3f4403c41cb38195f7afd668e..7dc6134167c1e14ee5e062e4da72e3903173f4f8 100755
--- a/chrome/common/extensions/docs/server2/samples_data_source_test.py
+++ b/chrome/common/extensions/docs/server2/samples_model_test.py
@@ -5,30 +5,40 @@
 
 import json
 import os
-import sys
 import unittest
 
-from samples_data_source import SamplesDataSource
-from servlet import Request
+from server_instance import ServerInstance
+from test_file_system import TestFileSystem
 from test_util import Server2Path
 
 
-class SamplesDataSourceTest(unittest.TestCase):
-  def setUp(self):
-    self._base_path = Server2Path('test_data', 'samples_data_source')
+def _ReadLocalFile(filename):
+  base_path = Server2Path('test_data', 'samples_data_source')
+  with open(os.path.join(base_path, filename), 'r') as f:
+    return f.read()
+
+
+class _FakeCache(object):
+  def __init__(self, obj):
+    self._cache = obj
 
-  def _ReadLocalFile(self, filename):
-    with open(os.path.join(self._base_path, filename), 'r') as f:
-      return f.read()
+  def GetFromFileListing(self, _):
+    getter = lambda: 0
+    getter.Get = lambda: self._cache
+    return getter
 
-  def _FakeGet(self, key):
-    return json.loads(self._ReadLocalFile(key))
+
+class SamplesModelSourceTest(unittest.TestCase):
+  def setUp(self):
+    server_instance = ServerInstance.ForTest(file_system=TestFileSystem({}))
+    self._samples_model = server_instance.platform_bundle.GetSamplesModel(
+        'apps')
+    self._samples_model._samples_cache = _FakeCache(json.loads(_ReadLocalFile(
+        'samples.json')))
 
   def testFilterSamples(self):
-    sds = SamplesDataSource({}, {}, '.', Request.ForTest('/'))
-    sds.get = self._FakeGet
-    self.assertEquals(json.loads(self._ReadLocalFile('expected.json')),
-                      sds.FilterSamples('samples.json', 'bobaloo'))
+    self.assertEquals(json.loads(_ReadLocalFile('expected.json')),
+                      self._samples_model.FilterSamples('bobaloo'))
 
 if __name__ == '__main__':
   unittest.main()