CrOS FilesApp move test/main.html to test.html

Change to use test.html rather than test/main.html.  Having the
file in the regular dir makes it much better for many files
that load other resources assuming that relative paths of
'foreground/foo/bar' will be valid.  This has simplified the
create_test_main.py script.

Bug: 813477
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I388b3a914fde3cc99b76503251cbf6ffdd659e81
Reviewed-on: https://chromium-review.googlesource.com/972222Reviewed-by: Naoki Fukino <fukino@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/master@{#545029}

chrome/browser/chromeos/file_manager/file_manager_uitest.cc

@@ -25,9 +25,9 @@ class FileManagerUITest : public InProcessBrowserTest {
     base::FilePath root_path;
     ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &root_path));
 
-    // Load test/main.html.
+    // Load test.html.
     const GURL url = net::FilePathToFileURL(root_path.Append(
-        FILE_PATH_LITERAL("ui/file_manager/file_manager/test/main.html")));
+        FILE_PATH_LITERAL("ui/file_manager/file_manager/test.html")));
     content::WebContents* const web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents);

ui/file_manager/file_manager/.gitignore

+test.html
+test/gen

ui/file_manager/file_manager/test/.gitignore

-css/
-js/elements_importer.js
-js/ui/
-main.html

ui/file_manager/file_manager/test/js/test_util.js

@@ -27,8 +27,7 @@ function loadData() {
         resolve();
       };
       req.open(
-          'GET',
-          '../../../../chrome/test/data/chromeos/file_manager/' + filename);
+          'GET', '../../../chrome/test/data/chromeos/file_manager/' + filename);
       req.send();
     });
   }));

ui/file_manager/file_manager/test/scripts/create_test_main.py

@@ -4,10 +4,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Copies file_manager/main.html to file_manager/test/main.html.
+"""Copies file_manager/main.html to file_manager/test.html.
 
 Modifies it to be able to run the CrOS FileManager app
-as a regular webapp.
+as a regular web page in a single renderer.
 """
 
 
@@ -27,7 +27,8 @@ if args.output:
     output.write('')
 
 
-root = os.path.abspath(os.path.join(sys.path[0], '../..'))
+# ROOT=//ui/file_manager/file_manager
+ROOT = os.path.abspath(os.path.join(sys.path[0], '../..'))
 scripts = []
 GENERATED_HTML = ('<!-- Generated by:\n  -- ui/file_manager/file_manager/'
                   'tests/scripts/create_test_main.py\n  -->\n\n')
@@ -36,26 +37,18 @@ GENERATED_JS = ('// Generated by:\n// ui/file_manager/file_manager/'
 
 
 def read(path):
-  with open(os.path.join(root, path)) as f:
+  with open(os.path.join(ROOT, path)) as f:
     return f.read()
 
 
 def write(path, content):
-  fullpath = os.path.join(root, path)
+  fullpath = os.path.join(ROOT, path)
   if not os.path.exists(os.path.dirname(fullpath)):
     os.makedirs(os.path.dirname(fullpath))
   with open(fullpath, 'w') as f:
     f.write(content)
 
 
-def insertbeforeline(f, match, lines):
-  """Insert lines into file before matching line."""
-  for i in range(len(f)):
-    if match in f[i]:
-      return f[:i] + lines + f[i:]
-  return f
-
-
 def replaceline(f, match, lines):
   """Replace matching line in file with lines."""
   for i in range(len(f)):
@@ -64,13 +57,16 @@ def replaceline(f, match, lines):
   return f
 
 
-def includes2scripts(f, prefix):
+def includes2scripts(include_filename):
   """Convert <include src='foo'> to <script src='<prefix>foo'></script>."""
+  scripts.append('<!-- %s -->' % include_filename)
+  prefix = include_filename[:include_filename.rindex('/')+1]
+  f = read(include_filename).split('\n')
   for i in range(len(f)):
     l = f[i]
     # Join back any include with a line-break.
-    if l == '// <include' and main_scripts[i+1].startswith('// src='):
-      main_scripts[i+1] = l + main_scripts[i+1][2:]
+    if l == '// <include' and f[i+1].startswith('// src='):
+      f[i+1] = l + f[i+1][2:]
       continue
     if l.startswith('// <include '):
       l = l.replace('// <include ', '<script ')
@@ -81,95 +77,74 @@ def includes2scripts(f, prefix):
       # main.js should be defer.
       if 'src="main.js"' in l:
         l = l.replace('src="main.js"', 'src="main.js" defer')
-      # Fix the path for scripts to be relative to file_manager/test/main.html.
+      # Fix the path for scripts to be relative to ROOT.
       if 'src="../../' in l:
-        l = l.replace('src="../../', 'src="../')
+        l = l.replace('src="../../', 'src="')
       else:
-        l = l.replace('src="', 'src="../' + prefix)
+        l = l.replace('src="', 'src="' + prefix)
       tag = l + '</script>'
       if tag not in scripts:
         scripts.append(tag)
 
-# Add / fix js libs in main.html.
-# Change src="foreground/..." to src="../foreground/...".
 # Fix link to action_link.css and text_defaults.css.
 main_html = (read('main.html')
-             .replace('="foreground/', '="../foreground/')
              .replace('chrome://resources/css/action_link.css',
-                      '../../../webui/resources/css/action_link.css')
+                      '../../webui/resources/css/action_link.css')
              .replace('chrome://resources/css/text_defaults.css',
-                      'css/text_defaults.css')
+                      'test/gen/css/text_defaults.css')
              .split('\n'))
 
-
 # Fix text_defaults.css.  Copy and replace placeholders.
 text_defaults = (read('../../webui/resources/css/text_defaults.css')
                  .replace('$i18n{textDirection}', 'ltr')
                  .replace('$i18nRaw{fontFamily}', 'Roboto, sans-serif')
                  .replace('$i18nRaw{fontSize}', '75%'))
-write('test/css/text_defaults.css', GENERATED_HTML + text_defaults)
+write('test/gen/css/text_defaults.css', GENERATED_HTML + text_defaults)
 
 # Fix stylesheet from extension.
 main_html = replaceline(
     main_html,
     ('chrome-extension://fbjakikfhfdajcamjleinfciajelkpek/'
      'cws_widget/cws_widget_container.css'),
-    [('<link rel="stylesheet" href="../../../../components/chrome_apps/'
+    [('<link rel="stylesheet" href="../../../components/chrome_apps/'
       'webstore_widget/cws_widget/cws_widget_container.css">')])
 
-# Replace elements_importer.js to use updated path, add polymer js.
-elements_importer = read('foreground/js/elements_importer.js').replace(
-    "'foreground/", "'../foreground/")
-write('test/js/elements_importer.js', GENERATED_JS + elements_importer)
-main_html = replaceline(
-    main_html,
-    'foreground/js/elements_importer.js',
-    [
-        '<script src="js/elements_importer.js"></script>',
-        ('<link rel="import" href="../../../../third_party/polymer/v1_0/'
-         'components-chromium/polymer/polymer.html">'),
-    ])
-
-# Add scripts for testing.
-scripts += ['<script src="%s"></script>' % s for s in (
-    'js/chrome_api_test_impl.js',
-    '../../../webui/resources/js/assert.js',
-    '../../../webui/resources/js/cr.js',
-    '../../../webui/resources/js/cr/event_target.js',
-    '../../../webui/resources/js/cr/ui/array_data_model.js">',
-    '../../../webui/resources/js/load_time_data.js',
-    '../../../webui/resources/js/webui_resource_test.js">',
-    'js/strings.js',
-    '../common/js/util.js',
-    '../common/js/mock_entry.js',
-    '../common/js/volume_manager_common.js',
-    '../background/js/volume_info_impl.js',
-    '../background/js/volume_info_list_impl.js',
-    '../background/js/volume_manager_impl.js',
-    '../background/js/mock_volume_manager.js',
-    'js/chrome_file_manager.js',
-    'js/test_util.js',
-    'delete.js',
-)]
+# Add scripts required for testing, and the test files (test/*.js).
+scripts.append('<!-- required for testing -->')
+scripts += ['<script src="%s"></script>' % s for s in [
+    'test/js/chrome_api_test_impl.js',
+    '../../webui/resources/js/assert.js',
+    '../../webui/resources/js/cr.js',
+    '../../webui/resources/js/cr/event_target.js',
+    '../../webui/resources/js/cr/ui/array_data_model.js">',
+    '../../webui/resources/js/load_time_data.js',
+    '../../webui/resources/js/webui_resource_test.js">',
+    'test/js/strings.js',
+    'common/js/util.js',
+    'common/js/mock_entry.js',
+    'common/js/volume_manager_common.js',
+    'background/js/volume_info_impl.js',
+    'background/js/volume_info_list_impl.js',
+    'background/js/volume_manager_impl.js',
+    'background/js/mock_volume_manager.js',
+    'foreground/js/constants.js',
+    'test/js/chrome_file_manager.js',
+    'test/js/test_util.js',
+] + ['test/' + s for s in os.listdir(os.path.join(ROOT, 'test'))
+     if s.endswith('.js')]]
 
 # Convert all includes from:
 #  * foreground/js/main_scripts.js
 #  * background/js/background_common_scripts.js
 #  * background/js/background_scripts.js
 # into <script> tags in main.html.
-main_scripts = read('foreground/js/main_scripts.js').split('\n')
-bg_common_scripts = read(
-    'background/js/background_common_scripts.js').split('\n')
+# Add polymer lib at start.
 bg_scripts = read('background/js/background_scripts.js').split('\n')
-includes2scripts(main_scripts, 'foreground/js/')
-includes2scripts(bg_common_scripts + bg_scripts, 'background/js/')
-main_html = replaceline(main_html, 'foreground/js/main_scripts.js', scripts)
-
-# Replace banners.js to use updated path.
-banners = (read('foreground/js/ui/banners.js')
-           .replace("'foreground/", "'../foreground/"))
-write('test/js/ui/banners.js', GENERATED_JS + banners)
-main_html = replaceline(main_html, 'foreground/js/ui/banners.js',
-                        ['<script src="js/ui/banners.js"></script>'])
-
-write('test/main.html', GENERATED_HTML + '\n'.join(main_html))
+includes2scripts('foreground/js/main_scripts.js')
+includes2scripts('background/js/background_common_scripts.js')
+includes2scripts('background/js/background_scripts.js')
+main_html = replaceline(main_html, 'foreground/js/main_scripts.js', [
+    ('<link rel="import" href="../../../third_party/polymer/v1_0/'
+     'components-chromium/polymer/polymer.html">')] + scripts)
+
+write('test.html', GENERATED_HTML + '\n'.join(main_html))