Docserver: Pull knowledge of host file systems into a single

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

Index: chrome/common/extensions/docs/server2/host_file_system_provider_test.py
diff --git a/chrome/common/extensions/docs/server2/host_file_system_creator_test.py b/chrome/common/extensions/docs/server2/host_file_system_provider_test.py
similarity index 48%
rename from chrome/common/extensions/docs/server2/host_file_system_creator_test.py
rename to chrome/common/extensions/docs/server2/host_file_system_provider_test.py
index 19093942a898792732475dfb108a6dcc09489796..9c99644b455302bbf67904442620ae62811710ec 100755
--- a/chrome/common/extensions/docs/server2/host_file_system_creator_test.py
+++ b/chrome/common/extensions/docs/server2/host_file_system_provider_test.py
@@ -3,40 +3,44 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from copy import deepcopy
 import unittest
 
 from caching_file_system import CachingFileSystem
 from file_system import FileNotFoundError
-from host_file_system_creator import HostFileSystemCreator
+from host_file_system_provider import HostFileSystemProvider
 from object_store_creator import ObjectStoreCreator
 from offline_file_system import OfflineFileSystem
 from test_data.canned_data import CANNED_API_FILE_SYSTEM_DATA
 from test_file_system import TestFileSystem
 
-def ConstructorForTest(branch, revision=None):
-  return TestFileSystem(CANNED_API_FILE_SYSTEM_DATA[str(branch)])
-
-class HostFileSystemCreatorTest(unittest.TestCase):
+class HostFileSystemProviderTest(unittest.TestCase):
   def setUp(self):
     self._idle_path = 'api/idle.json'
+    self._canned_data = deepcopy(CANNED_API_FILE_SYSTEM_DATA)
+
+  def _constructor_for_test(self, branch, **optargs):
+    return TestFileSystem(self._canned_data[branch])
 
   def testWithCaching(self):
-    creator = HostFileSystemCreator(ObjectStoreCreator.ForTest(),
-                                    constructor_for_test=ConstructorForTest)
+    creator = HostFileSystemProvider(
+        ObjectStoreCreator.ForTest(),
+        constructor_for_test=self._constructor_for_test)
 
-    fs = creator.Create('trunk')
-    firstRead = fs.ReadSingle(self._idle_path)
-    CANNED_API_FILE_SYSTEM_DATA['trunk']['api']['idle.json'] = 'blah blah blah'
-    secondRead = fs.ReadSingle(self._idle_path)
+    fs = creator.GetBranch('1500')
+    first_read = fs.ReadSingle(self._idle_path)
+    self._canned_data['1500']['api']['idle.json'] = 'blah blah blah'
+    second_read = fs.ReadSingle(self._idle_path)
 
-    self.assertEqual(firstRead, secondRead)
+    self.assertEqual(first_read, second_read)
 
   def testWithOffline(self):
-    creator = HostFileSystemCreator(ObjectStoreCreator.ForTest(),
-                                    offline=True,
-                                    constructor_for_test=ConstructorForTest)
+    creator = HostFileSystemProvider(
+        ObjectStoreCreator.ForTest(),
+        offline=True,
+        constructor_for_test=self._constructor_for_test)
 
-    fs = creator.Create('trunk')
+    fs = creator.GetBranch('1500')
     # Offline file system should raise a FileNotFoundError if read is attempted.
     self.assertRaises(FileNotFoundError, fs.ReadSingle, self._idle_path)