Docserver: Serve docs out of src/ not src/chrome/common/extensions. This allows

chrome/common/extensions/docs/server2/content_providers_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 json
 import unittest
 
 from compiled_file_system import CompiledFileSystem
 from content_providers import ContentProviders
+from extensions_paths import EXTENSIONS
 from object_store_creator import ObjectStoreCreator
 from test_file_system import TestFileSystem
 from test_util import DisableLogging
 
 
 _HOST = 'https://developer.chrome.com'
 
 
 _CONTENT_PROVIDERS = {
   'apples': {
     'chromium': {
-      'dir': 'apples'
+      'dir': 'chrome/common/extensions/apples'
     },
     'serveFrom': 'apples-dir',
   },
   'bananas': {
     'serveFrom': '',
     'chromium': {
-      'dir': ''
+      'dir': 'chrome/common/extensions'
     },
   },
   'github-provider': {
     'serveFrom': 'gh',
     'github': {
+      'dir': 'chrome/common/extensions',
       'owner': 'GoogleChrome',
       'repo': 'hello-world',
     },
   },
   'github-provider-with-dir': {
     'serveFrom': 'gh2',
     'github': {
-      'dir': 'tomatoes/are/a',
+      'dir': 'chrome/common/extensions/tomatoes/are/a',
       'owner': 'SomeOwner',
       'repo': 'some-repo',
     },
   },
   'tomatoes': {
     'serveFrom': 'tomatoes-dir/are/a',
     'chromium': {
-      'dir': 'tomatoes/are/a'
+      'dir': 'chrome/common/extensions/tomatoes/are/a'
     },
   },
 }
 
 
 _FILE_SYSTEM_DATA = {
   'docs': {
     'templates': {
       'json': {
         'content_providers.json': json.dumps(_CONTENT_PROVIDERS),
@@ skipping 33 matching lines @@
     return self._file_system
 
   def GetAndReset(self):
     calls = self._calls
     self._calls = []
     return calls
 
 
 class ContentProvidersTest(unittest.TestCase):
   def setUp(self):
-    test_file_system = TestFileSystem(_FILE_SYSTEM_DATA)
+    test_file_system = TestFileSystem(_FILE_SYSTEM_DATA, relative_to=EXTENSIONS)
     self._github_fs_provider = _MockGithubFileSystemProvider(test_file_system)
     self._content_providers = ContentProviders(
         CompiledFileSystem.Factory(ObjectStoreCreator.ForTest()),
         test_file_system,
         self._github_fs_provider)
 
   def testSimpleRootPath(self):
     provider = self._content_providers.GetByName('apples')
     self.assertEqual(
         'gala apples',
         provider.GetContentAndType(_HOST, 'gala.txt').Get().content)
     self.assertEqual(
         'granny smith apples',
         provider.GetContentAndType(_HOST, 'green/granny smith.txt').Get()
             .content)
 
   def testComplexRootPath(self):
     provider = self._content_providers.GetByName('tomatoes')
     self.assertEqual(
         'no they aren\'t',
         provider.GetContentAndType(_HOST, 'vegetable.txt').Get().content)
     self.assertEqual(
         'cherry tomatoes',
         provider.GetContentAndType(_HOST, 'fruit/cherry.txt').Get().content)
 
-  def testEmptyRootPath(self):
+  def testParentRootPath(self):
     provider = self._content_providers.GetByName('bananas')
     self.assertEqual(
         'gala apples',
         provider.GetContentAndType(_HOST, 'apples/gala.txt').Get().content)
 
   def testSimpleServlet(self):
     provider, path = self._content_providers.GetByServeFrom('apples-dir')
     self.assertEqual('apples', provider.name)
     self.assertEqual('', path)
     provider, path = self._content_providers.GetByServeFrom(
@@ skipping 40 matching lines @@
     self.assertEqual('github-provider-with-dir', provider.name)
     self.assertEqual('fruit/cherry.txt', path)
     self.assertEqual([('SomeOwner', 'some-repo')],
                      self._github_fs_provider.GetAndReset())
     self.assertEqual(
         'cherry tomatoes',
         provider.GetContentAndType(_HOST, path).Get().content)
 
 if __name__ == '__main__':
   unittest.main()