Allow GRD reader to process a custom GRDP file stored in a folder different from its parent GRD fil…

tools/grit/grit/grd_reader_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 grd_reader package'''
 
 import os
 import sys
 if __name__ == '__main__':
@@ skipping 193 matching lines @@
 </grit>'''
     pseudo_file = StringIO.StringIO(input)
     root = grd_reader.Parse(pseudo_file, '.', defines={'hello': '1'})
 
     # Check if the ID is set to the name. In the past, there was a bug
     # that caused the ID to be a generated number.
     hello = root.GetNodeById('IDS_HELLO')
     self.failUnless(hello.GetCliques()[0].GetId() == 'IDS_HELLO')
 
   def testPartInclusion(self):
+    arbitrary_path_grd = u'''\
+        <grit-part>
+          <message name="IDS_TEST5" desc="test5">test5</message>
+        </grit-part>'''
+    arbitrary_path_grd_file = os.path.join(
+      util.TempDir({'arbitrary_path.grp': arbitrary_path_grd}).GetPath(),
+      'arbitrary_path.grp')
     top_grd = u'''\
         <grit latest_public_release="2" current_release="3">
           <release seq="3">
             <messages>
               <message name="IDS_TEST" desc="test">
                 test
               </message>
               <part file="sub.grp" />
+              <part file="%s" />
             </messages>
           </release>
-        </grit>'''
+        </grit>''' % arbitrary_path_grd_file
     sub_grd = u'''\
         <grit-part>
           <message name="IDS_TEST2" desc="test2">test2</message>
           <part file="subsub.grp" />
           <message name="IDS_TEST3" desc="test3">test3</message>
         </grit-part>'''
     subsub_grd = u'''\
         <grit-part>
           <message name="IDS_TEST4" desc="test4">test4</message>
         </grit-part>'''
@@ skipping 10 matching lines @@
                 </message>
                 <part file="subsub.grp">
                   <message desc="test4" name="IDS_TEST4">
                     test4
                   </message>
                 </part>
                 <message desc="test3" name="IDS_TEST3">
                   test3
                 </message>
               </part>
+              <part file="%s">
+                <message desc="test5" name="IDS_TEST5">
+                  test5
+                </message>
+              </part>
             </messages>
           </release>
-        </grit>'''
+        </grit>''' % arbitrary_path_grd_file
     with util.TempDir({'sub.grp': sub_grd,
                        'subsub.grp': subsub_grd}) as temp_dir:
       output = grd_reader.Parse(StringIO.StringIO(top_grd), temp_dir.GetPath())
     self.assertEqual(expected_output.split(), output.FormatXml().split())
 
   def testPartInclusionFailure(self):
     template = u'''
       <grit latest_public_release="2" current_release="3">
         <outputs>
           %s
         </outputs>
       </grit>'''
 
     part_failures = [
         (exception.UnexpectedContent, u'<part file="x">fnord</part>'),
         (exception.UnexpectedChild,
          u'<part file="x"><output filename="x" type="y" /></part>'),
+        (exception.FileNotFound, u'<part file="yet_created_x" />'),
     ]
     for raises, data in part_failures:
       data = StringIO.StringIO(template % data)
       self.assertRaises(raises, grd_reader.Parse, data, '.')
 
     gritpart_failures = [
         (exception.UnexpectedAttribute, u'<grit-part file="xyz"></grit-part>'),
         (exception.MissingElement, u'<output filename="x" type="y" />'),
     ]
     for raises, data in gritpart_failures:
@@ skipping 20 matching lines @@
           </messages>
         </release>
       </grit>''' % sys.platform
     with util.TempDir({}) as temp_dir:
       grd_reader.Parse(StringIO.StringIO(grd_text), temp_dir.GetPath(),
                        target_platform='android')
 
 
 if __name__ == '__main__':
   unittest.main()