Docserver: Make the .html extension unnecessary for content pages, for example,

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
@@ skipping 82 matching lines @@
     return self._file_system
 
   def GetAndReset(self):
     calls = self._calls
     self._calls = []
     return calls
 
 
 class ContentProvidersTest(unittest.TestCase):
   def setUp(self):
+    object_store_creator = ObjectStoreCreator.ForTest()
     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()),
+        object_store_creator,
+        CompiledFileSystem.Factory(object_store_creator),
         test_file_system,
         self._github_fs_provider)
 
   def testSimpleRootPath(self):
     provider = self._content_providers.GetByName('apples')
     self.assertEqual(
         'gala apples',
         provider.GetContentAndType('gala.txt').Get().content)
     self.assertEqual(
         'granny smith apples',
         provider.GetContentAndType('green/granny smith.txt').Get().content)
 
   def testComplexRootPath(self):
     provider = self._content_providers.GetByName('tomatoes')
     self.assertEqual(
         'no they aren\'t',
         provider.GetContentAndType('vegetable.txt').Get().content)
     self.assertEqual(
         'cherry tomatoes',
         provider.GetContentAndType('fruit/cherry.txt').Get().content)
 
   def testParentRootPath(self):
     provider = self._content_providers.GetByName('bananas')
     self.assertEqual(
         'gala apples',
         provider.GetContentAndType('apples/gala.txt').Get().content)
 
   def testSimpleServlet(self):
-    provider, path = self._content_providers.GetByServeFrom('apples-dir')
+    provider, serve_from, path = self._content_providers.GetByServeFrom(
+        'apples-dir')
     self.assertEqual('apples', provider.name)
+    self.assertEqual('apples-dir', serve_from)
     self.assertEqual('', path)
-    provider, path = self._content_providers.GetByServeFrom(
+    provider, serve_from, path = self._content_providers.GetByServeFrom(
         'apples-dir/are/forever')
     self.assertEqual('apples', provider.name)
+    self.assertEqual('apples-dir', serve_from)
     self.assertEqual('are/forever', path)
 
   def testComplexServlet(self):
-    provider, path = self._content_providers.GetByServeFrom(
+    provider, serve_from, path = self._content_providers.GetByServeFrom(
         'tomatoes-dir/are/a')
     self.assertEqual('tomatoes', provider.name)
+    self.assertEqual('tomatoes-dir/are/a', serve_from)
     self.assertEqual('', path)
-    provider, path = self._content_providers.GetByServeFrom(
+    provider, serve_from, path = self._content_providers.GetByServeFrom(
         'tomatoes-dir/are/a/fruit/they/are')
     self.assertEqual('tomatoes', provider.name)
+    self.assertEqual('tomatoes-dir/are/a', serve_from)
     self.assertEqual('fruit/they/are', path)
 
   def testEmptyStringServlet(self):
-    provider, path = self._content_providers.GetByServeFrom('tomatoes-dir/are')
+    provider, serve_from, path = self._content_providers.GetByServeFrom(
+        'tomatoes-dir/are')
     self.assertEqual('bananas', provider.name)
+    self.assertEqual('', serve_from)
     self.assertEqual('tomatoes-dir/are', path)
-    provider, path = self._content_providers.GetByServeFrom('')
+    provider, serve_from, path = self._content_providers.GetByServeFrom('')
     self.assertEqual('bananas', provider.name)
+    self.assertEqual('', serve_from)
     self.assertEqual('', path)
 
   @DisableLogging('error')
   def testProviderNotFound(self):
     self.assertEqual(None, self._content_providers.GetByName('cabbages'))
 
   def testGithubContentProvider(self):
-    provider, path = self._content_providers.GetByServeFrom(
+    provider, serve_from, path = self._content_providers.GetByServeFrom(
         'gh/apples/green/granny smith.txt')
     self.assertEqual('github-provider', provider.name)
+    self.assertEqual('gh', serve_from)
     self.assertEqual('apples/green/granny smith.txt', path)
     self.assertEqual([('GoogleChrome', 'hello-world')],
                      self._github_fs_provider.GetAndReset())
     self.assertEqual(
         'granny smith apples',
         provider.GetContentAndType(path).Get().content)
 
   def testGithubContentProviderWithDir(self):
-    provider, path = self._content_providers.GetByServeFrom(
+    provider, serve_from, path = self._content_providers.GetByServeFrom(
         'gh2/fruit/cherry.txt')
     self.assertEqual('github-provider-with-dir', provider.name)
+    self.assertEqual('gh2', serve_from)
     self.assertEqual('fruit/cherry.txt', path)
     self.assertEqual([('SomeOwner', 'some-repo')],
                      self._github_fs_provider.GetAndReset())
     self.assertEqual(
         'cherry tomatoes',
         provider.GetContentAndType(path).Get().content)
 
 if __name__ == '__main__':
   unittest.main()