Docserver: Pull knowledge of host file systems into a single

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

 #!/usr/bin/env python
 # Copyright 2013 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.
 
 import unittest
 
 from app_yaml_helper import AppYamlHelper
 from file_system import FileNotFoundError
-from host_file_system_creator import HostFileSystemCreator
+from host_file_system_provider import HostFileSystemProvider
 from mock_file_system import MockFileSystem
 from object_store_creator import ObjectStoreCreator
 from test_file_system import TestFileSystem
 from test_util import DisableLogging
 
 _ExtractVersion, _IsGreater, _GenerateAppYaml = (
     AppYamlHelper.ExtractVersion,
     AppYamlHelper.IsGreater,
     AppYamlHelper.GenerateAppYaml)
 
@@ skipping 51 matching lines @@
   @DisableLogging('warning')
   def testInstanceMethods(self):
     test_data = {
       'server2': {
         'app.yaml': _GenerateAppYaml('1-0'),
         'app_yaml_helper.py': 'Copyright notice etc'
       }
     }
 
     updates = []
-
+    # Pass a specific file system at head to the HostFileSystemProvider so that
+    # we know it's always going to be backed by a MockFileSystem. The Provider
+    # may decide to wrap it in caching etc.
     file_system_at_head = MockFileSystem(TestFileSystem(test_data))
 
     def apply_update(update):
       file_system_at_head.Update(update)
       updates.append(update)
 
-    def constructor(branch, revision=None):
+    def host_file_system_constructor(branch, revision=None):
+      self.assertEqual('trunk', branch)
+      self.assertTrue(revision is not None)
       return MockFileSystem.Create(TestFileSystem(test_data),
                                    updates[:revision])
-    host_file_system_creator = HostFileSystemCreator(
-        ObjectStoreCreator.ForTest(),
-        constructor_for_test=constructor)
+
+    object_store_creator = ObjectStoreCreator.ForTest()
+    host_file_system_provider = HostFileSystemProvider(
+        object_store_creator,
+        default_trunk_instance=file_system_at_head,
+        constructor_for_test=host_file_system_constructor)
     helper = AppYamlHelper('server2/app.yaml',
-                           file_system_at_head,
-                           ObjectStoreCreator.ForTest(disable_wrappers=False),
-                           host_file_system_creator)
+                           object_store_creator,
+                           host_file_system_provider)
 
     def assert_is_up_to_date(version):
       self.assertTrue(helper.IsUpToDate(version),
                       '%s is not up to date' % version)
       self.assertRaises(ValueError,
                         helper.GetFirstRevisionGreaterThan, version)
 
     self.assertEqual(0, helper.GetFirstRevisionGreaterThan('0-5-0'))
     assert_is_up_to_date('1-0-0')
     assert_is_up_to_date('1-5-0')
@@ skipping 57 matching lines @@
     self.assertEqual(6, helper.GetFirstRevisionGreaterThan('2-1-0'))
     self.assertEqual(7, helper.GetFirstRevisionGreaterThan('2-2-0'))
     self.assertEqual(7, helper.GetFirstRevisionGreaterThan('2-3-0'))
     self.assertEqual(8, helper.GetFirstRevisionGreaterThan('2-4-0'))
     self.assertEqual(8, helper.GetFirstRevisionGreaterThan('2-5-0'))
     assert_is_up_to_date('2-6-0')
     assert_is_up_to_date('2-7-0')
 
 if __name__ == '__main__':
   unittest.main()