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

chrome/common/extensions/docs/server2/content_provider_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.
 
 from cStringIO import StringIO
 import json
 import unittest
 from zipfile import ZipFile
 
 from compiled_file_system import CompiledFileSystem
 from content_provider import ContentProvider
 from file_system import FileNotFoundError
 from object_store_creator import ObjectStoreCreator
+from path_canonicalizer import PathCanonicalizer
 from test_file_system import TestFileSystem
 from third_party.handlebar import Handlebar
 
 _REDIRECTS_JSON = json.dumps({
   'oldfile.html': 'storage.html',
   'index.html': 'https://developers.google.com/chrome',
 })
 
 
 _MARKDOWN_CONTENT = (
@@ skipping 15 matching lines @@
   },
   'dir2': {
     'dir3': {
       'a.txt': 'a.txt content',
       'b.txt': 'b.txt content',
       'c': {
         'd.txt': 'd.txt content',
       },
     },
   },
+  'dir.txt': 'dir.txt content',
   'img.png': 'img.png content',
   'read.txt': 'read.txt content',
   'redirects.json': _REDIRECTS_JSON,
   'run.js': 'run.js content',
   'site.css': 'site.css content',
   'storage.html': 'storage.html content',
   'markdown.md': '\n'.join(text[0] for text in _MARKDOWN_CONTENT)
 }
 
 
 class ContentProviderUnittest(unittest.TestCase):
   def setUp(self):
     self._content_provider = self._CreateContentProvider()
 
   def _CreateContentProvider(self, supports_zip=False):
+    object_store_creator = ObjectStoreCreator.ForTest()
     test_file_system = TestFileSystem(_TEST_DATA)
     return ContentProvider(
         'foo',
-        CompiledFileSystem.Factory(ObjectStoreCreator.ForTest()),
+        CompiledFileSystem.Factory(object_store_creator),
         test_file_system,
+        object_store_creator,
+        default_extensions=('.html', '.md'),
         # TODO(kalman): Test supports_templates=False.
         supports_templates=True,
         supports_zip=supports_zip)
 
   def _assertContent(self, content, content_type, content_and_type):
     # Assert type so that str is differentiated from unicode.
     self.assertEqual(type(content), type(content_and_type.content))
     self.assertEqual(content, content_and_type.content)
     self.assertEqual(content_type, content_and_type.content_type)
 
@@ skipping 41 matching lines @@
   def testZip2ndLevel(self):
     zip_content_provider = self._CreateContentProvider(supports_zip=True)
     content_and_type = zip_content_provider.GetContentAndType(
         'dir2/dir3.zip').Get()
     zipfile = ZipFile(StringIO(content_and_type.content))
     content_and_type.content = zipfile.namelist()
     self._assertContent(
         ['dir3/a.txt', 'dir3/b.txt', 'dir3/c/d.txt'], 'application/zip',
         content_and_type)
 
+  def testCanonicalZipPaths(self):
+    # Without supports_zip the path is canonicalized as a file.
+    self.assertEqual(
+        'dir.txt',
+        self._content_provider.GetCanonicalPath('dir.zip'))
+    self.assertEqual(
+        'dir.txt',
+        self._content_provider.GetCanonicalPath('diR.zip'))
+    # With supports_zip the path is canonicalized as the zip file which
+    # corresponds to the canonical directory.
+    zip_content_provider = self._CreateContentProvider(supports_zip=True)
+    self.assertEqual(
+        'dir.zip',
+        zip_content_provider.GetCanonicalPath('dir.zip'))
+    self.assertEqual(
+        'dir.zip',
+        zip_content_provider.GetCanonicalPath('diR.zip'))
+
   def testMarkdown(self):
     content_and_type = self._content_provider.GetContentAndType(
-        'markdown.html').Get()
+        'markdown').Get()
     content_and_type.content = content_and_type.content.source
     self._assertContent('\n'.join(text[1] for text in _MARKDOWN_CONTENT),
         'text/html', content_and_type)
 
   def testNotFound(self):
     self.assertRaises(
         FileNotFoundError,
         self._content_provider.GetContentAndType('oops').Get)
 
 
 if __name__ == '__main__':
   unittest.main()