Revert 91161 - Change grit to depend on test data in the main repository.

tools/grit/grit/gather/rc_unittest.py

 #!/usr/bin/python2.4
-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
+# Copyright (c) 2006-2008 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 grit.gather.rc'''
 
 
 import os
 import sys
 if __name__ == '__main__':
   sys.path.append(os.path.join(os.path.dirname(sys.argv[0]), '../..'))
 
 import unittest
 import StringIO
 
 from grit.gather import rc
 from grit import util
 
 
 class RcUnittest(unittest.TestCase):
 
-  part_we_want = '''IDC_KLONKACC ACCELERATORS
+  part_we_want = '''IDC_KLONKACC ACCELERATORS 
 BEGIN
     "?",            IDM_ABOUT,              ASCII,  ALT
     "/",            IDM_ABOUT,              ASCII,  ALT
 END'''
 
   def testSectionFromFile(self):
     buf = '''IDC_SOMETHINGELSE BINGO
 BEGIN
     BLA BLA
     BLA BLA
 END
 %s
 
 IDC_KLONK BINGOBONGO
 BEGIN
   HONGO KONGO
 END
 ''' % self.part_we_want
 
     f = StringIO.StringIO(buf)
 
     out = rc.Section.FromFile(f, 'IDC_KLONKACC')
     self.failUnless(out.GetText() == self.part_we_want)
 
-    out = rc.Section.FromFile(util.PathFromRoot(r'grit/testdata/klonk.rc'),
+    out = rc.Section.FromFile(util.PathFromRoot(r'grit/test/data/klonk.rc'),
                               'IDC_KLONKACC',
                               encoding='utf-16')
-    out_text = out.GetText().replace('\t', '')
-    out_text = out_text.replace(' ', '')
-    self.part_we_want = self.part_we_want.replace(' ', '')
-    self.failUnless(out_text.strip() == self.part_we_want.strip())
+    self.failUnless(out.GetText() == self.part_we_want)
 
 
   def testDialog(self):
     dlg = rc.Dialog('''IDD_ABOUTBOX DIALOGEX 22, 17, 230, 75
 STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
 CAPTION "About"
 FONT 8, "System", 0, 0, 0x0
 BEGIN
     ICON            IDI_KLONK,IDC_MYICON,14,9,20,20
     LTEXT           "klonk Version ""yibbee"" 1.0",IDC_STATIC,49,10,119,8,
@@ skipping 294 matching lines @@
     transl = dlg.Translate('en', pseudo_if_not_available=False,
                            fallback_to_english=True)
     Check()
     transl = dlg.Translate('en', pseudo_if_not_available=False,
                            fallback_to_english=False)
     Check()
 
 
 if __name__ == '__main__':
   unittest.main()
+