grit: Ignore empty file paths when generating input file list

grit/node/misc_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 '''Unit tests for misc.GritNode'''
 
 
 import os
 import sys
@@ skipping 35 matching lines @@
     self.assertEqual({},
         id_dict.get('out/Release/obj/gen/devtools/devtools.grd', None))
 
     src_dir, id_dict = misc._ReadFirstIdsFromFile(
         test_resource_ids,
         {
           'SHARED_INTERMEDIATE_DIR': '/outside/src_dir',
         })
     self.assertEqual({}, id_dict.get('devtools.grd', None))
 
+  # Verifies that GetInputFiles() returns the correct list of files
+  # corresponding to ChromeScaledImage nodes when assets are missing.
+  def testGetInputFilesChromeScaledImage(self):
+    xml = '''<?xml version="1.0" encoding="utf-8"?>
+      <grit latest_public_release="0" current_release="1">
+        <outputs>
+          <output filename="default.pak" type="data_package" context="default_100_percent" />
+          <output filename="special.pak" type="data_package" context="special_100_percent" fallback_to_default_layout="false" />
+        </outputs>
+        <release seq="1">
+          <structures fallback_to_low_resolution="true">
+            <structure type="chrome_scaled_image" name="IDR_A" file="a.png" />
+            <structure type="chrome_scaled_image" name="IDR_B" file="b.png" />
+          </structures>
+        </release>
+      </grit>'''
+
+    grd = grd_reader.Parse(StringIO.StringIO(xml), util.PathFromRoot('grit/testdata'))
+    input_files = grd.GetInputFiles()
+    expected = ['default_100_percent/a.png', 'default_100_percent/b.png', 'special_100_percent/a.png']
+    actual = []
+    for file in input_files:
+      split = file.split('/')
+      actual.append(split[-2] + '/' + split[-1])

[flackr, 2015/06/26 19:45:21]

Is this to convert a full path to the last 2 components or relative path? If so
you can use os.relpath relative to where the test files are.

Also, this can be done using a for in python array construction, e.g.
actual = [os.relpath(path, testdir) for path in grd.GetInputFiles()]

+
+    self.assertEquals(expected, actual)
+
+
 class IfNodeUnittest(unittest.TestCase):
   def testIffyness(self):
     grd = grd_reader.Parse(StringIO.StringIO('''
       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
         <release seq="3">
           <messages>
             <if expr="'bingo' in defs">
               <message name="IDS_BINGO">
                 Bingo!
               </message>
@@ skipping 350 matching lines @@
     # a pseudo language should fail, but they do not fail and the test was
     # broken and failed to catch it. Fix this.
 
     # Should not raise an exception since pseudo is allowed
     rc.FormatMessage(bingo, 'xyz-pseudo')
     rc.FormatStructure(menu, 'xyz-pseudo', '.')
 
 
 if __name__ == '__main__':
   unittest.main()