GRIT: Enable variable expansion in filenames during HTML inlining.

grit/node/structure_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 <structure> nodes.
 '''
 
 import os
 import os.path
@@ skipping 31 matching lines @@
     self.failUnless(node.RunCommandOnCurrentPlatform())
     node.attrs['run_command_on_platforms'] = 'Nosuch'
     self.failIf(node.RunCommandOnCurrentPlatform())
     node.attrs['run_command_on_platforms'] = (
         'Nosuch,%s,Othernot' % platform.system())
     self.failUnless(node.RunCommandOnCurrentPlatform())
 
   def testVariables(self):
     grd = util.ParseGrdForUnittest('''
         <structures>
-          <structure type="chrome_html" name="hello_tmpl" file="structure_variables.html" expand_variables="true" variables="GREETING=Hello,THINGS=foo,, bar,, baz,EQUATION=2+2==4"></structure>
+          <structure type="chrome_html" name="hello_tmpl" file="structure_variables.html" expand_variables="true" variables="GREETING=Hello,THINGS=foo,, bar,, baz,EQUATION=2+2==4,filename=simple" flattenhtml="true"></structure>
         </structures>''', base_dir=util.PathFromRoot('grit/testdata'))
     grd.SetOutputLanguage('en')
     grd.RunGatherers()
     node, = grd.GetChildrenOfType(structure.StructureNode)
     filename = node.Process(tempfile.gettempdir())
     with open(os.path.join(tempfile.gettempdir(), filename)) as f:
       result = f.read()
-      self.failUnless(result == ('<h1>Hello!</h1>\n'
-                                 'Some cool things are foo, bar, baz.\n'
-                                 'Did you know that 2+2==4?\n'))
+      self.failUnlessEqual(('<h1>Hello!</h1>\n'
+                            'Some cool things are foo, bar, baz.\n'
+                            'Did you know that 2+2==4?\n'
+                            '<p>\n'
+                            '  Hello!\n'
+                            '</p>\n'), result)
 
 
 if __name__ == '__main__':
   unittest.main()